Browse Source

Merge #382

git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@3294 e5f2f494-b856-4b98-b285-d166d9295462
Michal Vaner 14 years ago
parent
commit
6144ff818b
3 changed files with 4 additions and 4 deletions
  1. 1 1
      ChangeLog
  2. 1 1
      src/bin/stats/stats.py.in
  3. 2 2
      src/bin/stats/tests/isc/config/ccsession.py

+ 1 - 1
ChangeLog

@@ -38,7 +38,7 @@
   105.  [bug]       Michal Vaner
 	Python processes: they no longer take 100% CPU while idle
 	due to a busy loop in reading command session in a nonblocking way.
-	(Trac #349, svn r3153)
+	(Trac #349, svn r3153), (Trac #382, svn r3294)
 
   104.	[bug]		jerry
 	bin/zonemgr: zonemgr should be attempting to refresh expired zones.

+ 1 - 1
src/bin/stats/stats.py.in

@@ -233,7 +233,7 @@ class CCSessionListener(Listener):
         """
         check the cc chanel
         """
-        return self.cc_session.check_command()
+        return self.cc_session.check_command(False)
 
     def config_handler(self, new_config):
         """

+ 2 - 2
src/bin/stats/tests/isc/config/ccsession.py

@@ -90,8 +90,8 @@ class ModuleCCSession(ConfigData):
     def close(self):
         self._session.close()
 
-    def check_command(self):
-        msg, env = self._session.group_recvmsg(False)
+    def check_command(self, nonblock=True):
+        msg, env = self._session.group_recvmsg(nonblock)
         if not msg or 'result' in msg:
             return
         cmd, arg = parse_command(msg)