X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=cad1c39fed7db0e0dab6e5ed024e723348392eac;hp=198b1090c331bc694775af84f6f4bd4dc5a9a52d;hb=1c0bfa3fd5d75950d78f0146ce99d51b5efb6377;hpb=396922e58b32d889d4762bb0bcdce21ec8838999

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 198b109..cad1c39 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -15,6 +15,7 @@ from random import random, seed
 from Idler import TrainIdler,GrayIdler
 import socket
 from traceback import print_tb
+from posix import geteuid
 
 GREETING = 'UCC SNACKS'
 PIN_LENGTH = 4
@@ -340,7 +341,10 @@ def run_forever(rfh, wfh, options, cf):
 					# XXX this should move somewhere else:
 					if cur_selection == '55':
 						mk.set_message('OPENSESAME')
-						ret = os.system('su - "%s" -c "dispense door"'%username)
+						if geteuid() == 0:
+							ret = os.system('su - "%s" -c "dispense door"'%username)
+						else:
+							ret = os.system('dispense door')
 						if ret == 0:
 							mk.set_message(center('DOOR OPEN'))
 						else:
@@ -423,9 +427,7 @@ class VendConfigFile:
 			print "Error reading config file "+config_file+": " + str(e)
 			sys.exit(1)
 
-
-if __name__ == '__main__':
-
+def do_vend_server():
 	options = parse_args()
 	config_opts = VendConfigFile(options.config_file, config_options)
 
@@ -446,3 +448,25 @@ if __name__ == '__main__':
 			print
 			print "Connection died, trying again..."
 
+
+if __name__ == '__main__':
+	while True:
+		try:
+			do_vend_server()
+		except KeyboardInterrupt:
+			print "Killed by SIGINT."
+			break
+		except:
+			(exc_type, exc_value, exc_traceback) = sys.exc_info()
+			print
+			print "Uh-oh, unhandled " + str(exc_type) + " exception"
+			print "Message: ", str(exc_value)
+			print
+			print_tb(exc_traceback)
+			del exc_traceback
+			print
+			print "This message should be considered a bug in the Vend Server."
+			print "Please report this to someone who can fix it."
+			print
+			print "Trying again anyway (might not help, but hey...)"
+