X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=4a601b759a967a06edfbd01cc05ba7c63b351a46;hp=a2cdfbad56497ffd291d2105494e2a621e5278ce;hb=ab13f294b1ca0956f3793fe475d3793ed0e7a9fa;hpb=10727aa0542f3218814b551a5c44c1e18ef2df55

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index a2cdfba..4a601b7 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
@@ -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:
@@ -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')
@@ -400,6 +402,24 @@ if __name__ == '__main__':
 
 	ServiceName = cp.get('VendingMachine', 'ServiceName')
 	ServicePassword = cp.get('VendingMachine', 'Password')
-	
-	rfh, wfh = connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword)
-	run_forever(rfh, wfh)
+
+	ServerName = cp.get('DecServer', 'Name')
+	ConnectPassword = cp.get('DecServer', 'ConnectPassword')
+	PrivPassword = cp.get('DecServer', 'PrivPassword')
+
+	while True:
+		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:
+			print "Connection died, trying again..."
+