X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=de763f267c04d96266590fb6149fb1c0c0a57a31;hp=d8122aa0507af0b8a218fed5b399db2f40be6c95;hb=b7790bb34c56554b35a68d2d657642e81d1af6e7;hpb=f14c215ea165a9a5d66229f59993e4d6263629b7

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index d8122aa..de763f2 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -379,8 +379,7 @@ def connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName,
 		
 	return rfh, wfh
 
-if __name__ == '__main__':
-	from ConfigParser import ConfigParser
+def parse_args():
 	from optparse import OptionParser
 
 	op = OptionParser(usage="%prog [OPTION]...")
@@ -393,19 +392,30 @@ 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')
+	return options
+
+if __name__ == '__main__':
+	import ConfigParser
 
-	ServiceName = cp.get('VendingMachine', 'ServiceName')
-	ServicePassword = cp.get('VendingMachine', 'Password')
+	options = parse_args()
 
-	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: