X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=8d1f4328014d3d6cf3154ce914a6be0ab29c6d14;hp=4e0b16c98ae119262bf03d4aacfcdf8a494ddbaa;hb=d7de0a2c7420f5a22bc1c7959393ab22ffeb9d4d;hpb=eb939cac2cad4939bc75dbaad0a39c2b3b499c49

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 4e0b16c..8d1f432 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -4,7 +4,8 @@
 USE_DB = 0
 
 import ConfigParser
-import sys, os, string, re, pwd
+import sys, os, string, re, pwd, signal
+from traceback import print_tb
 if USE_DB: import pg
 from time import time, sleep
 from popen2 import popen2
@@ -14,7 +15,7 @@ from HorizScroll import HorizScroll
 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:
@@ -444,13 +448,17 @@ def do_vend_server():
 			print
 			print "Connection died, trying again..."
 
-
 if __name__ == '__main__':
+	def do_nothing(signum, stack): pass
+	def stop_server(signum, stack): raise KeyboardInterrupt
+	signal.signal(signal.SIGHUP, do_nothing)
+	signal.signal(signal.SIGTERM, stop_server)
+	signal.signal(signal.SIGINT, stop_server)
 	while True:
 		try:
 			do_vend_server()
 		except KeyboardInterrupt:
-			print "Killed by SIGINT."
+			print "Killed by signal."
 			break
 		except:
 			(exc_type, exc_value, exc_traceback) = sys.exc_info()