X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=sql-edition%2Fservers%2FVendServer.py;h=8017d3a133466948e1b4f813af8a8baf60b4a5d9;hb=7b35ffb56a0b07005e1e6a1642c9104f42059f39;hp=ff17122a2ba365f41d01f723ae34542db166c528;hpb=38263c3d95b992be7e9fd6a266b0fd69aead7002;p=zanchey%2Fdispense2.git

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index ff17122..8017d3a 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -8,10 +8,12 @@ if USE_DB: import pg
 from time import time, sleep
 from popen2 import popen2
 from LATClient import LATClient
-from VendingMachine import VendingMachine
+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
@@ -362,10 +364,10 @@ def run_forever(rfh, wfh):
 					time_to_autologout = time() + 8
 
 # FIXME: a less ugly way of passing all these options would be nice
-def connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword):
+def connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword, ServerName, ConnectPassword, PrivPassword):
 	# Open vending machine via LAT
 	if options.use_lat:
-		latclient = LATClient(service = ServiceName, password = ServicePassword)
+		latclient = LATClient(service = ServiceName, password = ServicePassword, server_name = ServerName, connect_password = ConnectPassword, priv_password = PrivPassword)
 		rfh, wfh = latclient.get_fh()
 	else:
 		#(rfh, wfh) = popen2('../../virtualvend/vvend.py')
@@ -401,8 +403,21 @@ if __name__ == '__main__':
 	ServiceName = cp.get('VendingMachine', 'ServiceName')
 	ServicePassword = cp.get('VendingMachine', 'Password')
 
+	ServerName = cp.get('DecServer', 'Name')
+	ConnectPassword = cp.get('DecServer', 'ConnectPassword')
+	PrivPassword = cp.get('DecServer', 'PrivPassword')
+
 	while True:
-		rfh, wfh = connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword)
+		try:
+		rfh, wfh = connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword, ServerName, ConnectPassword, PrivPassword)
+		except Exception:
+			(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: