X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=ad972ca76d4e03026aee1024ed280bad0b422628;hp=cea3cfa48a94b3fc327277d8f826611269edf2ac;hb=1768a767d068674f66a3d542fa95308c2c623f30;hpb=a69762a12a7825f31c92c15431b72b5f1e997a79

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index cea3cfa..ad972ca 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -7,11 +7,13 @@ import sys, os, string, re, pwd
 if USE_DB: import pg
 from time import time, sleep
 from popen2 import popen2
-from LATClient import LATClient
-from VendingMachine import VendingMachine
+from LATClient import LATClient, LATClientException
+from VendingMachine import VendingMachine, VendingException
 from HorizScroll import HorizScroll
 from random import random, seed
 from Idler import TrainIdler,GrayIdler
+import socket
+from traceback import print_tb
 
 GREETING = 'UCC SNACKS'
 PIN_LENGTH = 4
@@ -109,7 +111,7 @@ def verify_user_pin(uid, pin):
 	else:
 		return None
 
-def door_open_mode(vending_machine):
+def door_open_mode(v):
 	print "Entering open door mode"
 	v.display("-FEED  ME-")
 	while True:
@@ -406,7 +408,16 @@ if __name__ == '__main__':
 	PrivPassword = cp.get('DecServer', 'PrivPassword')
 
 	while True:
-		rfh, wfh = connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword, ServerName, ConnectPassword, PrivPassword)
+		try:
+			rfh, wfh = connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword, ServerName, ConnectPassword, PrivPassword)
+		except (LATClientException, socket.error):
+			(exc_type, exc_value, exc_traceback) = sys.exc_info()
+			print "Connection error ("+str(exc_type)+"):"
+			print_tb(exc_traceback)
+			del exc_traceback
+			print "Trying again in 5 seconds."
+			sleep(5)
+			continue
 		try:
 			run_forever(rfh, wfh)
 		except VendingException: