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

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index ff17122..cea3cfa 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -362,10 +362,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 +401,12 @@ 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)
+		rfh, wfh = connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword, ServerName, ConnectPassword, PrivPassword)
 		try:
 			run_forever(rfh, wfh)
 		except VendingException: