From: JINMEI Tatuya <jinmei@isc.org>
Date: Thu, 8 Nov 2012 07:51:23 +0000 (-0800)
Subject: [2447] improve intitial failure handling for msgq, gracefully and with logs
X-Git-Tag: trac2487_base~1^2~31^2~1^2^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0bd58df7cece9187f8a962cb60eda4ada388857;p=thirdparty%2Fkea.git

[2447] improve intitial failure handling for msgq, gracefully and with logs
---

diff --git a/src/bin/msgq/msgq.py.in b/src/bin/msgq/msgq.py.in
index 010a1a51fe..bab193e225 100755
--- a/src/bin/msgq/msgq.py.in
+++ b/src/bin/msgq/msgq.py.in
@@ -178,6 +178,8 @@ class MsgQ:
             if os.path.exists(self.socket_file):
                 os.remove(self.socket_file)
             self.listen_socket.close()
+            sys.stderr.write("[b10-msgq] failed to setup listener on %s: %s\n"
+                             % (self.socket_file, str(e)))
             raise e
 
         if self.poller:
@@ -543,9 +545,10 @@ if __name__ == "__main__":
 
     msgq = MsgQ(options.msgq_socket_file, options.verbose)
 
-    setup_result = msgq.setup()
-    if setup_result:
-        sys.stderr.write("[b10-msgq] Error on startup: %s\n" % setup_result)
+    try:
+        msgq.setup()
+    except Exception as e:
+        sys.stderr.write("[b10-msgq] Error on startup: %s\n" % str(e))
         sys.exit(1)
 
     try: