misc cleanups

[zanchey/dispense2.git] / sql-edition / servers / VendServer.py

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 8d1f432..974e0b4 100755 (executable)
--- 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:
@@ -460,6 +463,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 +476,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...)"