X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=6e870ff7d84727f0e6a885a4c0499b10de4bbdbf;hp=3c3aee69f6c4d33fd0e16fea43d83441fed89923;hb=5c3f21f481e7472d2b8a6834c47d8894e7251736;hpb=482573e7c8afad56f1c8ca0464a6cf9ac3e267f4 diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py index 3c3aee6..6e870ff 100755 --- a/sql-edition/servers/VendServer.py +++ b/sql-edition/servers/VendServer.py @@ -5,7 +5,8 @@ USE_DB = 0 import ConfigParser import sys, os, string, re, pwd, signal -from traceback import print_tb +import logging, logging.handlers +from traceback import format_tb if USE_DB: import pg from time import time, sleep from popen2 import popen2 @@ -388,12 +389,14 @@ def parse_args(): op = OptionParser(usage="%prog [OPTION]...") op.add_option('-f', '--config-file', default='/etc/dispense/servers.conf', metavar='FILE', dest='config_file', help='use the specified config file instead of /etc/dispense/servers.conf') - 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('--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') + op.add_option('-v', '--verbose', dest='verbose', action='store_true', default=False, help='spit out lots of debug output') + 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() if len(args) != 0: @@ -430,19 +433,72 @@ class VendConfigFile: print "Error reading config file "+config_file+": " + str(e) sys.exit(1) -def do_vend_server(): +def create_pid_file(name): + try: + pid_file = file(name, 'w') + pid_file.write('%d\n'%os.getpid()) + pid_file.close() + except IOError, e: + logging.warning('unable to write to pid file '+name+': '+str(e)) + +def set_stuff_up(): + 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) + if options.daemon: become_daemon() + set_up_logging(options) + if options.pid_file != '': create_pid_file(options.pid_file) - 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) + return options, config_opts +def clean_up_nicely(options, config_opts): + if options.pid_file != '': + try: + os.unlink(options.pid_file) + logging.debug('Removed pid file '+options.pid_file) + except OSError: pass # if we can't delete it, meh + +def set_up_logging(options): + logger = logging.getLogger() + + stderr_logger = logging.StreamHandler(sys.stderr) + stderr_logger.setFormatter(logging.Formatter('%(levelname)s: %(message)s')) + logger.addHandler(stderr_logger) + + if options.log_file != '': + try: + file_logger = logging.FileHandler(options.log_file) + file_logger.setFormatter(logging.Formatter('%(asctime)s %(levelname)s: %(message)s')) + logger.addHandler(file_logger) + except IOError, e: + logger.warning('unable to write to log file '+options.log_file+': '+str(e)) + + if options.syslog: + 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: + logger.setLevel(logging.DEBUG) + else: + logger.setLevel(logging.INFO) + +def become_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) + +def do_vend_server(options, config_opts): while True: try: rfh, wfh = connect_to_vend(options, config_opts) @@ -461,31 +517,30 @@ def do_vend_server(): 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) + options, config_opts = set_stuff_up() while True: try: - do_vend_server() + logging.info('Starting Vend Server') + do_vend_server(options, config_opts) + logging.warning('Vend Server finished unexpectedly, restarting') except KeyboardInterrupt: - print "Killed by signal." + logging.info("Killed by signal, cleaning up") + clean_up_nicely(options, config_opts) + logging.info("Vend Server stopped") 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) + tb = format_tb(exc_traceback, 20) 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." + + logging.critical("Uh-oh, unhandled " + str(exc_type) + " exception") + logging.critical("Message: " + str(exc_value)) + logging.critical("Traceback:") + for event in tb: + for line in event.split('\n'): + logging.critical(' '+line) + logging.critical("This message should be considered a bug in the Vend Server.") + logging.critical("Please report this to someone who can fix it.") sleep(10) - print - print "Trying again anyway (might not help, but hey...)" + logging.warning("Trying again anyway (might not help, but hey...)")