X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=4e0b16c98ae119262bf03d4aacfcdf8a494ddbaa;hp=198b1090c331bc694775af84f6f4bd4dc5a9a52d;hb=5c59b46c75aa434dfa13e4a4ce8a56da34816278;hpb=396922e58b32d889d4762bb0bcdce21ec8838999

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 198b109..4e0b16c 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -423,9 +423,7 @@ class VendConfigFile:
 			print "Error reading config file "+config_file+": " + str(e)
 			sys.exit(1)
 
-
-if __name__ == '__main__':
-
+def do_vend_server():
 	options = parse_args()
 	config_opts = VendConfigFile(options.config_file, config_options)
 
@@ -446,3 +444,25 @@ if __name__ == '__main__':
 			print
 			print "Connection died, trying again..."
 
+
+if __name__ == '__main__':
+	while True:
+		try:
+			do_vend_server()
+		except KeyboardInterrupt:
+			print "Killed by SIGINT."
+			break
+		except:
+			(exc_type, exc_value, exc_traceback) = sys.exc_info()
+			print
+			print "Uh-oh, unhandled " + str(exc_type) + " exception"
+			print "Message: ", str(exc_value)
+			print
+			print_tb(exc_traceback)
+			del exc_traceback
+			print
+			print "This message should be considered a bug in the Vend Server."
+			print "Please report this to someone who can fix it."
+			print
+			print "Trying again anyway (might not help, but hey...)"
+