X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=de763f267c04d96266590fb6149fb1c0c0a57a31;hp=6d79b512e4dd11752afc15e05d241339cda2a27b;hb=b7790bb34c56554b35a68d2d657642e81d1af6e7;hpb=cf6d55616fccbdf13d29440d504f6252dd0e4be4

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 6d79b51..de763f2 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -7,12 +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 ConfigParser import ConfigParser
+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
@@ -110,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:
@@ -196,27 +197,7 @@ class MessageKeeper:
 	def done(self):
 		return len(self.scrolling_message) == 0
 
-if __name__ == '__main__':
-	cp = ConfigParser()
-	cp.read('/etc/dispense/servers.conf')
-	DBServer = cp.get('Database', 'Server')
-	DBName = cp.get('Database', 'Name')
-	DBUser = cp.get('VendingMachine', 'DBUser')
-	DBPassword = cp.get('VendingMachine', 'DBPassword')
-
-	ServiceName = cp.get('VendingMachine', 'ServiceName')
-	ServicePassword = cp.get('VendingMachine', 'Password')
-	# Open vending machine via LAT
-	if 0:
-		latclient = LATClient(service = ServiceName, password = ServicePassword)
-		(rfh, wfh) = latclient.get_fh()
-	else:
-		#(rfh, wfh) = popen2('../../virtualvend/vvend.py')
-		import socket
-		sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0)
-		sock.connect(('localhost', 5150))
-		rfh = sock.makefile('r')
-		wfh = sock.makefile('w')
+def run_forever(rfh, wfh):
 	v = VendingMachine(rfh, wfh)
 	print 'PING is', v.ping()
 
@@ -381,3 +362,76 @@ if __name__ == '__main__':
 					sleep(0.5)
 					cur_selection = ''
 					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, ServerName, ConnectPassword, PrivPassword):
+	# Open vending machine via LAT
+	if options.use_lat:
+		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')
+		import socket
+		sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0)
+		sock.connect((options.host, options.port))
+		rfh = sock.makefile('r')
+		wfh = sock.makefile('w')
+		
+	return rfh, wfh
+
+def parse_args():
+	from optparse import OptionParser
+
+	op = OptionParser(usage="%prog [OPTION]...")
+	op.add_option('-f', '--config-file', default='/etc/dispense/servers.conf', metavar='FILE', dest='config_file', help='use the specified config file instead of /etc/dispense/servers.conf')
+	op.add_option('-v', '--virtualvend', action='store_false', default=True, dest='use_lat', help='use the virtual vending server instead of LAT')
+	op.add_option('-n', '--hostname', dest='host', default='localhost', help='the hostname to connect to for virtual vending machine mode (default: localhost)')
+	op.add_option('-p', '--port', dest='port', default=5150, type='int', help='the port number to connect to (default: 5150)')
+	options, args = op.parse_args()
+
+	if len(args) != 0:
+		op.error('extra command line arguments: ' + ' '.join(args))
+
+	return options
+
+if __name__ == '__main__':
+	import ConfigParser
+
+	options = parse_args()
+
+	try:
+		cp = ConfigParser.ConfigParser()
+		cp.read(options.config_file)
+		DBServer = cp.get('Database', 'Server')
+		DBName = cp.get('Database', 'Name')
+		DBUser = cp.get('VendingMachine', 'DBUser')
+		DBPassword = cp.get('VendingMachine', 'DBPassword')
+		
+		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')
+	except ConfigParser.Error, e:
+		print "Error reading config file: " + str(e)
+		sys.exit(1)
+
+	while True:
+		try:
+			rfh, wfh = connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword, ServerName, ConnectPassword, PrivPassword)
+		except (LATClientException, socket.error), e:
+			(exc_type, exc_value, exc_traceback) = sys.exc_info()
+			print
+			print "Connection error: "+str(exc_type)+" "+str(e)
+			print_tb(exc_traceback)
+			del exc_traceback
+			print "Trying again in 5 seconds."
+			sleep(5)
+			continue
+		try:
+			run_forever(rfh, wfh)
+		except VendingException:
+			print
+			print "Connection died, trying again..."
+