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')
self.__dict__[option] = value
except ConfigParser.Error, e:
- logging.critical("Error reading config file "+config_file+": " + str(e))
- logging.critical("Bailing out")
- sys.exit(1)
+ raise SystemExit("Error reading config file "+config_file+": " + str(e))
def create_pid_file(name):
try:
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
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 not options.daemon:
+ stderr_logger = logging.StreamHandler(sys.stderr)
+ stderr_logger.setFormatter(logging.Formatter('%(levelname)s: %(message)s'))
+ logger.addHandler(stderr_logger)
if options.log_file != '':
try:
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')
+ 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)
os.dup2(fd, 0)
os.dup2(fd, 1)
os.dup2(fd, 2)
- if os.fork() != 0:
- sys.exit(0)
+ try:
+ if os.fork() != 0:
+ sys.exit(0)
+ os.setsid()
+ except OSError, e:
+ raise SystemExit('failed to fork: '+str(e))
def do_vend_server(options, config_opts):
while True: