X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=b272ebaed8daf7fc3cc54784693cc8d23a19825d;hp=9e1ba7a5a214d616569c3861c73e28205e9dcd4d;hb=f144c99a948b26b150b620b0a0802ba6b3e43b98;hpb=a8bc2549f5017803184dd008b11dd3f9b1c4d2be diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py index 9e1ba7a..b272eba 100755 --- a/sql-edition/servers/VendServer.py +++ b/sql-edition/servers/VendServer.py @@ -5,7 +5,7 @@ USE_DB = 0 import ConfigParser import sys, os, string, re, pwd, signal -import logging +import logging, logging.handlers from traceback import format_tb if USE_DB: import pg from time import time, sleep @@ -25,6 +25,8 @@ DOOR = 1 SWITCH = 2 KEY = 3 +class DispenseDatabaseException(Exception): pass + class DispenseDatabase: def __init__(self, vending_machine, host, name, user, password): self.vending_machine = vending_machine @@ -32,16 +34,15 @@ class DispenseDatabase: self.db.query('LISTEN vend_requests') def process_requests(self): - print 'processing' + logging.debug('database processing') query = 'SELECT request_id, request_slot FROM vend_requests WHERE request_handled = false' try: outstanding = self.db.query(query).getresult() except (pg.error,), db_err: - sys.stderr.write('Failed to query database: %s\n'%(db_err.strip())) - return + raise DispenseDatabaseException('Failed to query database: %s\n'%(db_err.strip())) for (id, slot) in outstanding: (worked, code, string) = self.vending_machine.vend(slot) - print (worked, code, string) + logging.debug (str((worked, code, string))) if worked: query = 'SELECT vend_success(%s)'%id self.db.query(query).getresult() @@ -85,22 +86,27 @@ def get_pin(uid): try: info = pwd.getpwuid(uid) except KeyError: + logging.info('getting pin for uid %d: user not in password file'%uid) return None if info.pw_dir == None: return False pinfile = os.path.join(info.pw_dir, '.pin') try: s = os.stat(pinfile) except OSError: + logging.info('getting pin for uid %d: .pin not found in home directory'%uid) return None if s.st_mode & 077: + logging.info('getting pin for uid %d: .pin has wrong permissions'%uid) return None try: f = file(pinfile) except IOError: + logging.info('getting pin for uid %d: I cannot read pin file'%uid) return None pinstr = f.readline() f.close() if not re.search('^'+'[0-9]'*PIN_LENGTH+'$', pinstr): + logging.info('getting pin for uid %d: %s not a good pin'%(uid,repr(pinstr))) return None return int(pinstr) @@ -110,12 +116,14 @@ def has_good_pin(uid): def verify_user_pin(uid, pin): if get_pin(uid) == pin: info = pwd.getpwuid(uid) + logging.info('accepted pin for uid %d (%s)'%(uid,info.pw_name)) return info.pw_name else: + logging.info('refused pin for uid %d'%(uid)) return None def door_open_mode(v): - print "Entering open door mode" + logging.warning("Entering open door mode") v.display("-FEED ME-") while True: e = v.next_event() @@ -123,6 +131,7 @@ def door_open_mode(v): (event, params) = e if event == DOOR: if params == 1: # door closed + logging.warning('Leaving open door mode') v.display("-YUM YUM!-") sleep(1) return @@ -202,7 +211,7 @@ class MessageKeeper: def run_forever(rfh, wfh, options, cf): v = VendingMachine(rfh, wfh) - print 'PING is', v.ping() + logging.debug('PING is ' + str(v.ping())) if USE_DB: db = DispenseDatabase(v, cf.DBServer, cf.DBName, cf.DBUser, cf.DBPassword) cur_user = '' @@ -219,7 +228,11 @@ def run_forever(rfh, wfh, options, cf): last_timeout_refresh = None while True: - if USE_DB: db.handle_events() + if USE_DB: + try: + db.handle_events() + except DispenseDatabaseException, e: + logging.error('Database error: '+str(e)) if time_to_autologout != None: time_left = time_to_autologout - time() @@ -254,7 +267,7 @@ def run_forever(rfh, wfh, options, cf): continue time_to_idle = None (event, params) = e - print e + logging.debug('Got event: ' + repr(e)) if event == DOOR: if params == 0: door_open_mode(v); @@ -277,6 +290,7 @@ def run_forever(rfh, wfh, options, cf): if len(cur_user) == 5: uid = int(cur_user) if not has_good_pin(uid): + logging.info('user '+cur_user+' has a bad PIN') #mk.set_messages( #[(center('INVALID'), False, 0.7), #(center('PIN'), False, 0.7), @@ -290,6 +304,7 @@ def run_forever(rfh, wfh, options, cf): continue cur_pin = '' mk.set_message('PIN: ') + logging.info('need pin for user %s'%cur_user) continue elif len(cur_pin) < PIN_LENGTH: if key == 11: @@ -342,13 +357,16 @@ def run_forever(rfh, wfh, options, cf): # XXX this should move somewhere else: if cur_selection == '55': mk.set_message('OPENSESAME') + logging.info('dispensing a door for %s'%username) if geteuid() == 0: ret = os.system('su - "%s" -c "dispense door"'%username) else: ret = os.system('dispense door') if ret == 0: + logging.info('door opened') mk.set_message(center('DOOR OPEN')) else: + logging.warning('user %s tried to dispense a bad door'%username) mk.set_message(center('BAD DOOR')) sleep(1) elif cur_selection == '91': @@ -372,10 +390,12 @@ def run_forever(rfh, wfh, options, cf): def connect_to_vend(options, cf): # Open vending machine via LAT? if options.use_lat: + logging.info('Connecting to vending machine using LAT') 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') + logging.info('Connecting to virtual vending machine on %s:%d'%(options.host,options.port)) import socket sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0) sock.connect((options.host, options.port)) @@ -393,9 +413,10 @@ def parse_args(): 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('-s', '--syslog', dest='syslog', metavar='FACILITY', default=None, help='log output to given syslog facility') op.add_option('-d', '--daemon', dest='daemon', action='store_true', default=False, help='run as a daemon') op.add_option('-v', '--verbose', dest='verbose', action='store_true', default=False, help='spit out lots of debug output') + op.add_option('-q', '--quiet', dest='quiet', action='store_true', default=False, help='only report errors') op.add_option('--pid-file', dest='pid_file', metavar='FILE', default='', help='store daemon\'s pid in the given file') options, args = op.parse_args() @@ -430,7 +451,8 @@ class VendConfigFile: self.__dict__[option] = value except ConfigParser.Error, e: - print "Error reading config file "+config_file+": " + str(e) + logging.critical("Error reading config file "+config_file+": " + str(e)) + logging.critical("Bailing out") sys.exit(1) def create_pid_file(name): @@ -442,15 +464,16 @@ def create_pid_file(name): logging.warning('unable to write to pid file '+name+': '+str(e)) def set_stuff_up(): - def do_nothing(signum, stack): pass + def do_nothing(signum, stack): + signal.signal(signum, do_nothing) 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) options = parse_args() - config_opts = VendConfigFile(options.config_file, config_options) set_up_logging(options) + config_opts = VendConfigFile(options.config_file, config_options) if options.daemon: become_daemon() if options.pid_file != '': create_pid_file(options.pid_file) @@ -477,12 +500,18 @@ def set_up_logging(options): logger.addHandler(file_logger) except IOError, e: logger.warning('unable to write to log file '+options.log_file+': '+str(e)) - - if options.verbose: + + if options.syslog != None: + sys_logger = logging.handlers.SysLogHandler('/dev/log', options.syslog) + sys_logger.setFormatter(logging.Formatter('vendserver[%d]'%(os.getpid()) + ' %(levelname)s: %(message)s')) + logger.addHandler(sys_logger) + + if options.quiet: + logger.setLevel(logging.WARNING) + elif options.verbose: logger.setLevel(logging.DEBUG) else: logger.setLevel(logging.INFO) - def become_daemon(): dev_null = file('/dev/null') @@ -500,28 +529,29 @@ def do_vend_server(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 "Trying again in 5 seconds." + logging.error("Connection error: "+str(exc_type)+" "+str(e)) + logging.info("Trying again in 5 seconds.") sleep(5) continue + try: run_forever(rfh, wfh, options, config_opts) except VendingException: - print - print "Connection died, trying again..." + logging.error("Connection died, trying again...") + logging.info("Trying again in 5 seconds.") + sleep(5) if __name__ == '__main__': options, config_opts = set_stuff_up() while True: try: - logging.info('Starting Vend Server') + logging.warning('Starting Vend Server') do_vend_server(options, config_opts) - logging.warning('Vend Server finished unexpectedly, restarting') + logging.error('Vend Server finished unexpectedly, restarting') except KeyboardInterrupt: logging.info("Killed by signal, cleaning up") clean_up_nicely(options, config_opts) - logging.info("Vend Server stopped") + logging.warning("Vend Server stopped") break except: (exc_type, exc_value, exc_traceback) = sys.exc_info()