X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=bed53663ee93e618cfc4ce30ef353d9e7a89ed93;hp=b272ebaed8daf7fc3cc54784693cc8d23a19825d;hb=c945258a9f4c89bf8f19108ed0ee2f477d5a9493;hpb=d715598199720bbe016561366fd7e933449a1348

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index b272eba..bed5366 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -209,6 +209,28 @@ 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"),
+		]
+	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 +243,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 +274,17 @@ 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() + 2
+			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()
 
 		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
@@ -451,9 +473,7 @@ class VendConfigFile:
 				self.__dict__[option] = value
 		
 		except ConfigParser.Error, e:
-			logging.critical("Error reading config file "+config_file+": " + str(e))
-			logging.critical("Bailing out")
-			sys.exit(1)
+			raise SystemExit("Error reading config file "+config_file+": " + str(e))
 
 def create_pid_file(name):
 	try:
@@ -472,9 +492,9 @@ def set_stuff_up():
 	signal.signal(signal.SIGINT, stop_server)
 
 	options = parse_args()
-	set_up_logging(options)
 	config_opts = VendConfigFile(options.config_file, config_options)
 	if options.daemon: become_daemon()
+	set_up_logging(options)
 	if options.pid_file != '': create_pid_file(options.pid_file)
 
 	return options, config_opts
@@ -489,9 +509,10 @@ def clean_up_nicely(options, config_opts):
 def set_up_logging(options):
 	logger = logging.getLogger()
 	
-	stderr_logger = logging.StreamHandler(sys.stderr)
-	stderr_logger.setFormatter(logging.Formatter('%(levelname)s: %(message)s'))
-	logger.addHandler(stderr_logger)
+	if not options.daemon:
+		stderr_logger = logging.StreamHandler(sys.stderr)
+		stderr_logger.setFormatter(logging.Formatter('%(levelname)s: %(message)s'))
+		logger.addHandler(stderr_logger)
 	
 	if options.log_file != '':
 		try:
@@ -519,8 +540,12 @@ def become_daemon():
 	os.dup2(fd, 0)
 	os.dup2(fd, 1)
 	os.dup2(fd, 2)
-	if os.fork() != 0:
-		sys.exit(0)
+	try:
+		if os.fork() != 0:
+			sys.exit(0)
+		os.setsid()
+	except OSError, e:
+		raise SystemExit('failed to fork: '+str(e))
 
 def do_vend_server(options, config_opts):
 	while True:
@@ -553,6 +578,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)