# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1340505487 -28800
# Node ID 00e213d1f0678a50962596d68277255b12bf8344
# Parent  00d8ea7361974659522ac553c3a6f4024d91ee50# Parent  0c181d77c85ab44534651beff36c0df3822da713
merge

diff -r 0c181d77c85a -r 00e213d1f067 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 0c181d77c85a -r 00e213d1f067 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')