X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=3c3aee69f6c4d33fd0e16fea43d83441fed89923;hp=dd9739d7014919a0076854be6be3fdd40f605046;hb=c43149e967896d18caaaf373ed7f75b4e98fed35;hpb=48db22f8d2af1191fb7f3b51bfc5e5cb0993f33e diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py index dd9739d..3c3aee6 100755 --- a/sql-edition/servers/VendServer.py +++ b/sql-edition/servers/VendServer.py @@ -3,7 +3,9 @@ USE_DB = 0 -import sys, os, string, re, pwd +import ConfigParser +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 @@ -13,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 @@ -197,11 +199,11 @@ class MessageKeeper: def done(self): return len(self.scrolling_message) == 0 -def run_forever(rfh, wfh): +def run_forever(rfh, wfh, options, cf): v = VendingMachine(rfh, wfh) print 'PING is', v.ping() - if USE_DB: db = DispenseDatabase(v, DBServer, DBName, DBUser, DBPassword) + if USE_DB: db = DispenseDatabase(v, cf.DBServer, cf.DBName, cf.DBUser, cf.DBPassword) cur_user = '' cur_pin = '' cur_selection = '' @@ -339,7 +341,10 @@ def run_forever(rfh, wfh): # 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: @@ -363,11 +368,10 @@ def run_forever(rfh, wfh): cur_selection = '' time_to_autologout = time() + 8 -# FIXME: a less ugly way of passing all these options would be nice -def connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword, ServerName, ConnectPassword, PrivPassword): - # Open vending machine via LAT +def connect_to_vend(options, cf): + # Open vending machine via LAT? if options.use_lat: - latclient = LATClient(service = ServiceName, password = ServicePassword, server_name = ServerName, connect_password = ConnectPassword, priv_password = PrivPassword) + latclient = LATClient(service = cf.ServiceName, password = cf.ServicePassword, server_name = cf.ServerName, connect_password = cf.ConnectPassword, priv_password = cf.PrivPassword) rfh, wfh = latclient.get_fh() else: #(rfh, wfh) = popen2('../../virtualvend/vvend.py') @@ -379,8 +383,7 @@ def connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, return rfh, wfh -if __name__ == '__main__': - import ConfigParser +def parse_args(): from optparse import OptionParser op = OptionParser(usage="%prog [OPTION]...") @@ -388,44 +391,101 @@ if __name__ == '__main__': op.add_option('-v', '--virtualvend', action='store_false', default=True, dest='use_lat', help='use the virtual vending server instead of LAT') op.add_option('-n', '--hostname', dest='host', default='localhost', help='the hostname to connect to for virtual vending machine mode (default: localhost)') op.add_option('-p', '--port', dest='port', default=5150, type='int', help='the port number to connect to (default: 5150)') + op.add_option('-l', '--log-file', metavar='FILE', dest='log_file', default='', help='log output to the specified file') + op.add_option('-s', '--syslog', dest='syslog', action='store_true', default=False, help='log output to syslog') + op.add_option('-d', '--daemon', dest='daemon', action='store_true', default=False, help='run as a daemon') options, args = op.parse_args() if len(args) != 0: op.error('extra command line arguments: ' + ' '.join(args)) - try: - cp = ConfigParser.ConfigParser() - cp.read(options.config_file) - DBServer = cp.get('Database', 'Server') - DBName = cp.get('Database', 'Name') - DBUser = cp.get('VendingMachine', 'DBUser') - DBPassword = cp.get('VendingMachine', 'DBPassword') - - ServiceName = cp.get('VendingMachine', 'ServiceName') - ServicePassword = cp.get('VendingMachine', 'Password') + return options + +config_options = { + 'DBServer': ('Database', 'Server'), + 'DBName': ('Database', 'Name'), + 'DBUser': ('VendingMachine', 'DBUser'), + 'DBPassword': ('VendingMachine', 'DBPassword'), + + 'ServiceName': ('VendingMachine', 'ServiceName'), + 'ServicePassword': ('VendingMachine', 'Password'), + + 'ServerName': ('DecServer', 'Name'), + 'ConnectPassword': ('DecServer', 'ConnectPassword'), + 'PrivPassword': ('DecServer', 'PrivPassword'), + } + +class VendConfigFile: + def __init__(self, config_file, options): + try: + cp = ConfigParser.ConfigParser() + cp.read(config_file) + + for option in options: + section, name = options[option] + value = cp.get(section, name) + self.__dict__[option] = value - ServerName = cp.get('DecServer', 'Name') - ConnectPassword = cp.get('DecServer', 'ConnectPassword') - PrivPassword = cp.get('DecServer', 'PrivPassword') - except ConfigParser.Error, e: - print "Error reading config file: " + str(e) - sys.exit(1) + except ConfigParser.Error, e: + print "Error reading config file "+config_file+": " + str(e) + sys.exit(1) + +def do_vend_server(): + options = parse_args() + config_opts = VendConfigFile(options.config_file, config_options) + + if options.daemon: + dev_null = file('/dev/null') + fd = dev_null.fileno() + os.dup2(fd, 0) + os.dup2(fd, 1) + os.dup2(fd, 2) + if os.fork() != 0: + sys.exit(0) while True: try: - rfh, wfh = connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword, ServerName, ConnectPassword, PrivPassword) + rfh, wfh = connect_to_vend(options, config_opts) except (LATClientException, socket.error), e: (exc_type, exc_value, exc_traceback) = sys.exc_info() + del exc_traceback print print "Connection error: "+str(exc_type)+" "+str(e) - print_tb(exc_traceback) - del exc_traceback print "Trying again in 5 seconds." sleep(5) continue try: - run_forever(rfh, wfh) + run_forever(rfh, wfh, options, config_opts) except VendingException: 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 signal." + break + except SystemExit, e: + raise e + 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." + sleep(10) + print + print "Trying again anyway (might not help, but hey...)" +