X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=3c3aee69f6c4d33fd0e16fea43d83441fed89923;hp=8d1f4328014d3d6cf3154ce914a6be0ab29c6d14;hb=482573e7c8afad56f1c8ca0464a6cf9ac3e267f4;hpb=b04879b3392af38421b5199dd690282c85cabbc4;ds=sidebyside

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 8d1f432..3c3aee6 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -391,6 +391,9 @@ def parse_args():
 	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('-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')
 	options, args = op.parse_args()
 
 	if len(args) != 0:
@@ -431,6 +434,15 @@ def do_vend_server():
 	options = parse_args()
 	config_opts = VendConfigFile(options.config_file, config_options)
 
+	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)
+
 	while True:
 		try:
 			rfh, wfh = connect_to_vend(options, config_opts)
@@ -460,6 +472,8 @@ if __name__ == '__main__':
 		except KeyboardInterrupt:
 			print "Killed by signal."
 			break
+		except SystemExit, e:
+			raise e
 		except:
 			(exc_type, exc_value, exc_traceback) = sys.exc_info()
 			print
@@ -471,6 +485,7 @@ if __name__ == '__main__':
 			print
 			print "This message should be considered a bug in the Vend Server."
 			print "Please report this to someone who can fix it."
+			sleep(10)
 			print
 			print "Trying again anyway (might not help, but hey...)"