X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=b272ebaed8daf7fc3cc54784693cc8d23a19825d;hp=30fac43b4f601476c788d191ffb699f2dc01279d;hb=f144c99a948b26b150b620b0a0802ba6b3e43b98;hpb=d30a477226e69f846edd28754ac41747b4bed9ff

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 30fac43..b272eba 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -413,7 +413,7 @@ 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')
@@ -501,8 +501,8 @@ def set_up_logging(options):
 		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)