# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1340505487 -28800
# Node ID 3deaa7ed8b8cac0b93035bad6246eb5b8b9d96be
# Parent  815d78062ba60c8dd1e0bf166c6ccdccf4b25174# Parent  cfcd2891b63488afda326e804a5bee2023a66eaa
merge

diff -r cfcd2891b634 -r 3deaa7ed8b8c server/ts.py
--- a/server/ts.py	Sun Jun 24 10:37:56 2012 +0800
+++ b/server/ts.py	Sun Jun 24 10:38:07 2012 +0800
@@ -98,6 +98,7 @@
 def turn_off(sock):
     if TESTING:
         return 99
+    print>>sys.stderr, "sending btoff"
     sock.send("btoff\n");
     # read newline
     l = readline(sock)
diff -r cfcd2891b634 -r 3deaa7ed8b8c server/utils.py
--- a/server/utils.py	Sun Jun 24 10:37:56 2012 +0800
+++ b/server/utils.py	Sun Jun 24 10:38:07 2012 +0800
@@ -11,7 +11,7 @@
     pass
 
 DEFAULT_TRIES = 3
-READLINE_SELECT_TIMEOUT = 20
+READLINE_SELECT_TIMEOUT = 4
 
 __all__ = ('monotonic_time', 'retry')