changeset 51:3deaa7ed8b8c

merge
author Matt Johnston <matt@ucc.asn.au>
date Sun, 24 Jun 2012 10:38:07 +0800
parents 815d78062ba6 (diff) cfcd2891b634 (current diff)
children c3f5e02c1c42
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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')