X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=0f1daec433b6d28c2cb41a1429dd866e5a0a46cc;hp=6e870ff7d84727f0e6a885a4c0499b10de4bbdbf;hb=7c61f2e7d593f845697c84ba52f7dc58045c78c6;hpb=66518c6317986e5f0d41559c75e4038faee5f411 diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py index 6e870ff..0f1daec 100755 --- a/sql-edition/servers/VendServer.py +++ b/sql-edition/servers/VendServer.py @@ -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() @@ -115,7 +116,7 @@ def verify_user_pin(uid, pin): 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 +124,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 +204,7 @@ class MessageKeeper: def run_forever(rfh, wfh, options, cf): v = VendingMachine(rfh, wfh) - print 'PING is', v.ping() + logging.debug('PING is', v.ping()) if USE_DB: db = DispenseDatabase(v, cf.DBServer, cf.DBName, cf.DBUser, cf.DBPassword) cur_user = '' @@ -219,7 +221,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 +260,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); @@ -396,6 +402,7 @@ def parse_args(): 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') 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 +437,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): @@ -450,9 +458,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 @@ -483,8 +491,10 @@ def set_up_logging(options): sys_logger = logging.handlers.SysLogHandler('/dev/log', 'daemon') sys_logger.setFormatter(logging.Formatter('vendserver[%d]'%(os.getpid()) + ' %(levelname)s: %(message)s')) logger.addHandler(sys_logger) - - if options.verbose: + + if options.quiet: + logger.setLevel(logging.WARNING) + elif options.verbose: logger.setLevel(logging.DEBUG) else: logger.setLevel(logging.INFO) @@ -505,28 +515,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()