From 833ddeb822493f6ab2abd6f193b4c0bc8ea76854 Mon Sep 17 00:00:00 2001
From: Simeon Simeonov
Date: Tue, 29 Apr 2014 20:37:32 +0200
Subject: Overall design finished

---
 beinc_server.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'beinc_server.py')

diff --git a/beinc_server.py b/beinc_server.py
index 300c954..8687da3 100755
--- a/beinc_server.py
+++ b/beinc_server.py
@@ -206,12 +206,13 @@ class WebNotifyServer(object):
         try:
             instance = self.__instances[args[0]]
         except Exception as e:
-            sys.stderr.write('Wrong instance or password: {0}\n'.format(e))
+            sys.stderr.write('Wrong instance or password\n')
+            #print('DEBUG: {0}'.format(e))
             raise cherrypy.HTTPError('403 Forbidden',
                                      'Wrong instance or password')
 
         if not instance.password_match(kwargs.get('password')):
-            sys.stderr.write('Wrong instance or password: {0}\n'.format(e))
+            sys.stderr.write('Wrong instance or password\n')
             raise cherrypy.HTTPError('403 Forbidden',
                                      'Wrong instance or password')
 
@@ -282,6 +283,7 @@ def main():
     except Exception as e:
         sys.stderr.write('Unable to parse {0}: {1}'.format(args.config_file,
                                                            e))
+        sys.exit(1)
 
     cherrypy.config.update({
         'server.socket_host': args.hostname,
-- 
cgit v1.3