X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=ad972ca76d4e03026aee1024ed280bad0b422628;hp=8017d3a133466948e1b4f813af8a8baf60b4a5d9;hb=1768a767d068674f66a3d542fa95308c2c623f30;hpb=f2651fa924fc99c0304e187cb1adc1ed8b638214

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 8017d3a..ad972ca 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -7,7 +7,7 @@ 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 LATClient import LATClient, LATClientException
 from VendingMachine import VendingMachine, VendingException
 from HorizScroll import HorizScroll
 from random import random, seed
@@ -111,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:
@@ -409,8 +409,8 @@ if __name__ == '__main__':
 
 	while True:
 		try:
-		rfh, wfh = connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword, ServerName, ConnectPassword, PrivPassword)
-		except Exception:
+			rfh, wfh = connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword, ServerName, ConnectPassword, PrivPassword)
+		except (LATClientException, socket.error):
 			(exc_type, exc_value, exc_traceback) = sys.exc_info()
 			print "Connection error ("+str(exc_type)+"):"
 			print_tb(exc_traceback)