Reducing log wait timeout in binlog-server.

From 30s to 10s. Also simplifying the timeout code
in binlog_reader.