handle config parser errors more nicely than just throwing up tracebacks

[uccvend-vendserver.git] / sql-edition / servers / VendServer.py

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 4a601b7..dd9739d 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
-from LATClient import LATClient
+from LATClient import LATClient, LATClientException
 from VendingMachine import VendingMachine, VendingException
 from HorizScroll import HorizScroll
 from random import random, seed
@@ -380,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]...")
@@ -393,26 +393,31 @@ 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:
                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()
-                       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."
@@ -421,5 +426,6 @@ if __name__ == '__main__':
                try:
                        run_forever(rfh, wfh)
                except VendingException:
+                       print
                        print "Connection died, trying again..."