From: Cameron Patrick <cameron@ucc.gu.uwa.edu.au>
Date: Sun, 1 Aug 2004 04:28:33 +0000 (+0000)
Subject: read a bunch of extra options from the config file for dec server rebooting
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=47de514e1d8a4ac9085dc426f4efa9b810c12ac0;p=zanchey%2Fdispense2.git

read a bunch of extra options from the config file for dec server rebooting
---

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: