summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuo Jinghua <sunmoon1997@gmail.com>2011-11-27 14:41:23 +0800
committerLuo Jinghua <sunmoon1997@gmail.com>2011-11-27 14:41:23 +0800
commit3c8be48c88d925899083ac4530f32a5d6007325f (patch)
tree06851fb23f359dcedb58252058303210f162093a
parent7d2799eec7c400332f54e2f4445b9c824b32d05e (diff)
tools/tcplogviewer: Set connect timeout to 3s
-rwxr-xr-xosframework/source/tools/tcplogviewer.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/osframework/source/tools/tcplogviewer.py b/osframework/source/tools/tcplogviewer.py
index 57066a9..66cca86 100755
--- a/osframework/source/tools/tcplogviewer.py
+++ b/osframework/source/tools/tcplogviewer.py
@@ -201,12 +201,12 @@ class ServiceProvider(object):
self.timestamp = timestamp
def isExpired(self, timestamp):
- if timestamp - self.timestamp > 5000:
+ if abs(timestamp - self.timestamp) > 5000:
return True
return False
def update(self, current):
- if current - self.updateTS > 10000:
+ if abs(current - self.updateTS) > 10000:
self.sm.sendQuery(self.addr)
self.sm.sendQueryInfo(self.addr)
self.updateTS = current
@@ -391,7 +391,7 @@ class ServiceManager(object):
if not self.sock:
return
current = currentTimeMillis()
- if current - self.timestamp > 2000:
+ if abs(current - self.timestamp) > 2000:
self.broadcastEcho()
self.timestamp = current
self.processPackets()
@@ -598,7 +598,9 @@ class Application(Frame):
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
#self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
try:
+ self.sock.settimeout(3)
self.sock.connect((host, port))
+ self.sock.settimeout(None)
except:
traceback.print_exc()
self.sock.close()