X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=45288f1fcac99333f8b6b2756b77655e2df9d73b;hp=02d5f9b1af93aac68362f9410c4aebbe406da76d;hb=ecfe7381977787a6bfa09c6c96d99c315265e284;hpb=93208364b5d5567e2a898d5e29ff84acbeedf32d

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 02d5f9b..45288f1 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -209,6 +209,31 @@ class MessageKeeper:
 	def done(self):
 		return len(self.scrolling_message) == 0
 
+idlers = []
+idler = None
+def setup_idlers(v):
+	global idlers, idler
+	idlers = [
+		TrainIdler(v),
+		GrayIdler(v),
+		GrayIdler(v,one="*",zero="-"),
+		GrayIdler(v,one="/",zero="\\"),
+		GrayIdler(v,one="X",zero="O"),
+		GrayIdler(v,one="*",zero="-",reorder=1),
+		GrayIdler(v,one="/",zero="\\",reorder=1),
+		GrayIdler(v,one="X",zero="O",reorder=1),
+		]
+	idler = choose_idler()
+
+def choose_idler():
+	global idler
+	idler = idlers[int(random()*len(idlers))]
+	idler.reset()
+
+def idle_step():
+	global idler
+	idler.next()
+
 def run_forever(rfh, wfh, options, cf):
 	v = VendingMachine(rfh, wfh)
 	logging.debug('PING is ' + str(v.ping()))
@@ -221,9 +246,7 @@ def run_forever(rfh, wfh, options, cf):
 	mk = MessageKeeper(v)
 	mk.set_message(GREETING)
 	time_to_autologout = None
-	#idler = TrainIdler(v)
-	#idler = GrayIdler(v)
-	idler = GrayIdler(v,one="*",zero="-")
+	setup_idlers(v)
 	time_to_idle = None
 	last_timeout_refresh = None
 
@@ -254,15 +277,20 @@ def run_forever(rfh, wfh, options, cf):
 			# start autologout
 			time_to_autologout = time() + 15
 
-		if time_to_idle == None and cur_user == '': time_to_idle = time() + 60
-		if time_to_idle != None and cur_user != '': time_to_idle = None
-		if time_to_idle is not None and time() > time_to_idle: idler.next()
+		if time_to_idle == None and cur_user == '':
+			time_to_idle = time() + 5
+			choose_idler()
+		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_to_idle is not None and time() > time_to_idle + 300:
+			time_to_idle = time()
+			choose_idler()
 
 		mk.update_display()
 
 		e = v.next_event(0)
 		if e == None:
-			e = v.next_event(0.1)
+			e = v.next_event(0.05)
 			if e == None:
 				continue
 		time_to_idle = None
@@ -518,15 +546,12 @@ def become_daemon():
 	os.dup2(fd, 0)
 	os.dup2(fd, 1)
 	os.dup2(fd, 2)
-	logging.debug('about to fork')
 	try:
 		if os.fork() != 0:
-			logging.debug('in parent process: dying')
 			sys.exit(0)
-		logging.debug('back from fork')
 		os.setsid()
 	except OSError, e:
-		logging.critical('failed to fork: '+e)
+		raise SystemExit('failed to fork: '+str(e))
 
 def do_vend_server(options, config_opts):
 	while True:
@@ -559,6 +584,8 @@ if __name__ == '__main__':
 			clean_up_nicely(options, config_opts)
 			logging.warning("Vend Server stopped")
 			break
+		except SystemExit:
+			break
 		except:
 			(exc_type, exc_value, exc_traceback) = sys.exc_info()
 			tb = format_tb(exc_traceback, 20)