X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=992a65d34da88719dfb2ed55a47c772c21a92594;hp=f7bd1cdf642f2bc713998b291fcf80a25a312bd0;hb=fe057d5b30168e9918d17a239c8bfdd5bffcd46d;hpb=28e0903fea49a38a15d0b1d390c92d2879990238

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index f7bd1cd..992a65d 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 = time() + 30
+			choose_idler()
 		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 is not None and time() > time_to_idle: idle_step()
+		if 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
@@ -556,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)