fix Bernard's indentation again

[zanchey/dispense2.git] / sql-edition / servers / VendServer.py

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 4a601b7..d8122aa 100755 (executable)
--- 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
 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
 from VendingMachine import VendingMachine, VendingException
 from HorizScroll import HorizScroll
 from random import random, seed


@@ -410,9 +410,10 @@ if __name__ == '__main__':
        while True:
                try:
                        rfh, wfh = connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword, ServerName, ConnectPassword, PrivPassword)
        while True:
                try:
                        rfh, wfh = connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword, ServerName, ConnectPassword, PrivPassword)

-               except Exception:
+               except (LATClientException, socket.error), e:

                        (exc_type, exc_value, exc_traceback) = sys.exc_info()
                        (exc_type, exc_value, exc_traceback) = sys.exc_info()

-                       print "Connection error ("+str(exc_type)+"):"
+                       print
+                       print "Connection error: "+str(exc_type)+" "+str(e)

                        print_tb(exc_traceback)
                        del exc_traceback
                        print "Trying again in 5 seconds."
                        print_tb(exc_traceback)
                        del exc_traceback
                        print "Trying again in 5 seconds."


@@ -421,5 +422,6 @@ if __name__ == '__main__':
                try:
                        run_forever(rfh, wfh)
                except VendingException:
                try:
                        run_forever(rfh, wfh)
                except VendingException:

+                       print

                        print "Connection died, trying again..."
 
                        print "Connection died, trying again..."