[svn] commit: r134 - in /branches/f2f200910/src/lib: bind-cfgd/bind-cfgd.py cc/python/ISC/CC/session.py

[BIND 10 source code commits]

Author: jelte
Date: Wed Oct 28 00:04:10 2009
New Revision: 134

Log:
session initialization raises SessionError instead of socket.error
catch that error in bind-cfgd.py

Modified:
    branches/f2f200910/src/lib/bind-cfgd/bind-cfgd.py
    branches/f2f200910/src/lib/cc/python/ISC/CC/session.py

Modified: branches/f2f200910/src/lib/bind-cfgd/bind-cfgd.py
==============================================================================
--- branches/f2f200910/src/lib/bind-cfgd/bind-cfgd.py (original)
+++ branches/f2f200910/src/lib/bind-cfgd/bind-cfgd.py Wed Oct 28 00:04:10 2009
@@ -19,6 +19,6 @@
     try:
         cm = ConfigManager()
         cm.run()
-    except socket.error:
+    except ISC.CC.SessionError, se:
         print "Error creating config manager, "\
               "is the command channel daemon running?"

Modified: branches/f2f200910/src/lib/cc/python/ISC/CC/session.py
==============================================================================
--- branches/f2f200910/src/lib/cc/python/ISC/CC/session.py (original)
+++ branches/f2f200910/src/lib/cc/python/ISC/CC/session.py Wed Oct 28 00:04:10 2009
@@ -20,6 +20,7 @@
 import Message
 
 class ProtocolError(Exception): pass
+class SessionError(Exception): pass
 
 class Session:
     def __init__(self):
@@ -30,14 +31,17 @@
         self._sendbuffer = ""
         self._sequence = 1
 
-        self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self._socket.connect(tuple(['127.0.0.1', 9912]))
+        try:
+            self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            self._socket.connect(tuple(['127.0.0.1', 9912]))
 
-        self.sendmsg({ "type": "getlname" })
-        msg = self.recvmsg(False)
-        self._lname = msg["lname"]
-        if not self._lname:
-            raise ProtocolError("Could not get local name")
+            self.sendmsg({ "type": "getlname" })
+            msg = self.recvmsg(False)
+            self._lname = msg["lname"]
+            if not self._lname:
+                raise ProtocolError("Could not get local name")
+        except socket.error, se:
+                raise SessionError(se)
 
     @property
     def lname(self):