[svn] commit: r3294 - in /trunk: ./ ChangeLog src/bin/stats/stats.py.in src/bin/stats/tests/isc/config/ccsession.py

[BIND 10 source code commits]

Author: vorner
Date: Wed Oct 20 12:14:21 2010
New Revision: 3294

Log:
Merge #382

Modified:
    trunk/   (props changed)
    trunk/ChangeLog
    trunk/src/bin/stats/stats.py.in
    trunk/src/bin/stats/tests/isc/config/ccsession.py

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Wed Oct 20 12:14:21 2010
@@ -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.

Modified: trunk/src/bin/stats/stats.py.in
==============================================================================
--- trunk/src/bin/stats/stats.py.in (original)
+++ trunk/src/bin/stats/stats.py.in Wed Oct 20 12:14:21 2010
@@ -233,7 +233,7 @@
         """
         check the cc chanel
         """
-        return self.cc_session.check_command()
+        return self.cc_session.check_command(False)
 
     def config_handler(self, new_config):
         """

Modified: trunk/src/bin/stats/tests/isc/config/ccsession.py
==============================================================================
--- trunk/src/bin/stats/tests/isc/config/ccsession.py (original)
+++ trunk/src/bin/stats/tests/isc/config/ccsession.py Wed Oct 20 12:14:21 2010
@@ -90,8 +90,8 @@
     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)