X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=dd9739d7014919a0076854be6be3fdd40f605046;hp=cea3cfa48a94b3fc327277d8f826611269edf2ac;hb=48db22f8d2af1191fb7f3b51bfc5e5cb0993f33e;hpb=a69762a12a7825f31c92c15431b72b5f1e997a79

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index cea3cfa..dd9739d 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -7,11 +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 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
@@ -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:
@@ -378,7 +380,7 @@ def connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName,
 	return rfh, wfh
 
 if __name__ == '__main__':
-	from ConfigParser import ConfigParser
+	import ConfigParser
 	from optparse import OptionParser
 
 	op = OptionParser(usage="%prog [OPTION]...")
@@ -391,24 +393,39 @@ if __name__ == '__main__':
 	if len(args) != 0:
 		op.error('extra command line arguments: ' + ' '.join(args))
 
-	cp = 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')
+	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:
-		rfh, wfh = connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword, ServerName, ConnectPassword, PrivPassword)
+		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..."