X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=8d1f4328014d3d6cf3154ce914a6be0ab29c6d14;hp=d912256f5474c5d2712de3f3ab1b5d31faf4f60b;hb=af695fbe4e5a26687122cc706ee7ebfadf95a792;hpb=b06b246d76f9f24a7735e542417e8a7cc85e9ff9 diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py index d912256..8d1f432 100755 --- a/sql-edition/servers/VendServer.py +++ b/sql-edition/servers/VendServer.py @@ -4,7 +4,8 @@ USE_DB = 0 import ConfigParser -import sys, os, string, re, pwd +import sys, os, string, re, pwd, signal +from traceback import print_tb if USE_DB: import pg from time import time, sleep from popen2 import popen2 @@ -447,13 +448,17 @@ def do_vend_server(): print 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) while True: try: do_vend_server() except KeyboardInterrupt: - print "Killed by SIGINT." + print "Killed by signal." break except: (exc_type, exc_value, exc_traceback) = sys.exc_info()