From: ACC Murphy <wheel@ucc.asn.au>
Date: Sun, 27 Jan 2013 09:13:20 +0000 (+0000)
Subject: [TPG] Increased serial timeout to account for vend time
X-Git-Tag: IMPORT-FROM-UCCCVS~2
X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=commitdiff_plain;h=2a2caab39b8dc858641001acf096e53f90c992f7

[TPG] Increased serial timeout to account for vend time
---

diff --git a/sql-edition/servers/SerialClient.py b/sql-edition/servers/SerialClient.py
index 4025e3b..e0a9a7e 100644
--- a/sql-edition/servers/SerialClient.py
+++ b/sql-edition/servers/SerialClient.py
@@ -13,7 +13,7 @@ class SerialClient:
 			bytesize=EIGHTBITS,     #number of databits
 			parity=PARITY_NONE,     #enable parity checking
 			stopbits=STOPBITS_ONE,  #number of stopbits
-			timeout=1,           #set a timeout value, None for waiting forever, return on read
+			timeout=10,           #set a timeout value, None for waiting forever, return on read
 			xonxoff=0,              #enable software flow control
 			rtscts=0,               #enable RTS/CTS flow control
 		)
diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 2259108..ce75837 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -1091,8 +1091,9 @@ def do_vend_server(options, config_opts):
 		
 		try:
 			run_forever(rfh, wfh, options, config_opts)
-		except VendingException:
+		except VendingException as e:
 			logging.error("Connection died, trying again...")
+			logging.info("Exception: "+e.__str__())
 			logging.info("Trying again in 5 seconds.")
 			sleep(5)