From: Bernard Blackham <dagobah@ucc.gu.uwa.edu.au>
Date: Thu, 12 Aug 2004 09:44:57 +0000 (+0000)
Subject: Random idler fixes.
X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=commitdiff_plain;h=ecfe7381977787a6bfa09c6c96d99c315265e284;hp=cfeb950d84e7ae33007df9185348d0569361086c;ds=sidebyside

Random idler fixes.
---

diff --git a/sql-edition/servers/Idler.py b/sql-edition/servers/Idler.py
index 555630f..5ffea0b 100755
--- a/sql-edition/servers/Idler.py
+++ b/sql-edition/servers/Idler.py
@@ -178,4 +178,4 @@ class GrayIdler(Idler):
 		self.i = 0
 		self.grayCode = 0
 		if self.reorder:
-			self.reorder = int(random()*40320)
+			self.reorder = int(random()*40319)+1
diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 992a65d..45288f1 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -278,11 +278,11 @@ def run_forever(rfh, wfh, options, cf):
 			time_to_autologout = time() + 15
 
 		if time_to_idle == None and cur_user == '':
-			time_to_idle = time() + 30
+			time_to_idle = time() + 5
 			choose_idler()
-		if time_to_idle != None and cur_user != '': time_to_idle = None
+		if time_to_idle is not None and cur_user != '': time_to_idle = None
 		if time_to_idle is not None and time() > time_to_idle: idle_step()
-		if time() > time_to_idle + 300:
+		if time_to_idle is not None and time() > time_to_idle + 300:
 			time_to_idle = time()
 			choose_idler()