BIND 10 trac547, updated. 982bf48eb2831feaf2a8ed6ea25e100e8077af27 [trac547] change default verbose mode [trac547] change variable name "running" [trac547] change minor verbose message [trac547] fix missing function "check_command" in CCSessionListener class [trac547] add PID with 'status' command

[BIND 10 source code commits]

The branch, trac547 has been updated
       via  982bf48eb2831feaf2a8ed6ea25e100e8077af27 (commit)
      from  d301d84a89e2775dc0fa1364b1101a01adf128dc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 982bf48eb2831feaf2a8ed6ea25e100e8077af27
Author: Naoki Kambe <kambe at jprs.co.jp>
Date:   Sun Feb 20 22:33:19 2011 +0900

    [trac547] change default verbose mode
    [trac547] change variable name "running"
    [trac547] change minor verbose message
    [trac547] fix missing function "check_command" in CCSessionListener class
    [trac547] add PID with 'status' command

-----------------------------------------------------------------------

Summary of changes:
 src/bin/stats/stats_httpd.py.in             |   21 ++++++++++++++-------
 src/bin/stats/tests/b10-stats-httpd_test.py |   12 ++++++++----
 2 files changed, 22 insertions(+), 11 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/stats/stats_httpd.py.in b/src/bin/stats/stats_httpd.py.in
index be7a52c..fce41ae 100644
--- a/src/bin/stats/stats_httpd.py.in
+++ b/src/bin/stats/stats_httpd.py.in
@@ -41,7 +41,7 @@ else:
 # Assign this process name
 isc.util.process.rename()
 
-IS_VERBOSE = False
+IS_VERBOSE = True
 
 class CCSessionListener():
     """
@@ -51,7 +51,7 @@ class CCSessionListener():
         self.ccs = isc.config.ModuleCCSession(SPECFILE_LOCATION, 
                                          self.config_handler, self.command_handler)
         self.ccs.start()
-        self.runnable = True
+        self.running = True
 
     def config_handler(self, new_config):
         """
@@ -67,15 +67,16 @@ class CCSessionListener():
         if command == "status":
             if IS_VERBOSE:
                 sys.stdout.write("[b10-stats-httpd] Received 'status' command\n")
-            return isc.config.ccsession.create_answer(0, "Stats Httpd is alive.")
+            return isc.config.ccsession.create_answer(
+                0, "Stats Httpd is alive. (PID: " + str(os.getpid()) + ")")
         elif command == "shutdown":
             if IS_VERBOSE:
                 sys.stdout.write("[b10-stats-httpd] Received 'shutdown' command\n")
+            self.running = False
             return isc.config.ccsession.create_answer(0)
-            self.runnable = False
         else:
             if IS_VERBOSE:
-                sys.stdout.write("[b10-stats-httpd] Received a unknown command\n")
+                sys.stdout.write("[b10-stats-httpd] Received unknown command\n")
             return isc.config.ccsession.create_answer(1, "Unknown command: " + str(command))
 
     def get_spec(self):
@@ -90,12 +91,18 @@ class CCSessionListener():
         """
         return self.ccs.get_socket()
 
+    def check_command(self):
+        """
+        return socket object
+        """
+        return self.ccs.check_command()
+
     def close(self):
         """
         close cc session
         """
         self.ccs.close()
-        self.runnable = False
+        self.running = False
 
 class HttpHandler(http.server.BaseHTTPRequestHandler):
     """
@@ -163,7 +170,7 @@ def main():
         for fd in rfd + xfd:
             if fd == css_fd:
                 ccs_lsnr.check_command()
-                running = ccs.runnable
+                running = ccs_lsnr.running
             elif fd == ht_fd:
                 http_lsnr.handle_request()
             else:
diff --git a/src/bin/stats/tests/b10-stats-httpd_test.py b/src/bin/stats/tests/b10-stats-httpd_test.py
index e149987..952366f 100644
--- a/src/bin/stats/tests/b10-stats-httpd_test.py
+++ b/src/bin/stats/tests/b10-stats-httpd_test.py
@@ -14,6 +14,7 @@
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 import unittest
+import os
 
 import isc.cc
 
@@ -26,14 +27,14 @@ class TestStats(unittest.TestCase):
         self.http_lsnr = stats_httpd.HttpListener(httpd_spec=self.ccs_lsnr.get_spec())
         self.http_handler = stats_httpd.HttpHandler()
         self.assertFalse(self.ccs_lsnr.get_socket().closed)
-        self.assertTrue(self.ccs_lsnr.runnable)
+        self.assertTrue(self.ccs_lsnr.running)
         self.assertFalse(self.http_lsnr.get_socket().closed)
 
     def tearDown(self):
         self.ccs_lsnr.close()
         self.http_lsnr.close()
         self.assertTrue(self.ccs_lsnr.get_socket().closed)
-        self.assertFalse(self.ccs_lsnr.runnable)
+        self.assertFalse(self.ccs_lsnr.running)
         self.assertTrue(self.http_lsnr.get_socket().closed)
 
     def test_sockets(self):
@@ -42,11 +43,14 @@ class TestStats(unittest.TestCase):
 
     def test_ccs_listener(self):
         self.assertIsNone(self.ccs_lsnr.get_spec())
+        self.assertIsNone(self.ccs_lsnr.check_command())
         self.assertEqual(self.ccs_lsnr.command_handler("status", None),
                          isc.config.ccsession.create_answer(
-                0, "Stats Httpd is alive."))
+                0, "Stats Httpd is alive. (PID: " + str(os.getpid()) + ")"))
+        self.assertTrue(self.ccs_lsnr.running)
         self.assertEqual(self.ccs_lsnr.command_handler("shutdown", None),
                          isc.config.ccsession.create_answer(0))
+        self.assertFalse(self.ccs_lsnr.running)
         self.assertEqual(
             self.ccs_lsnr.command_handler("__UNKNOWN_COMMAND__", None),
             isc.config.ccsession.create_answer(
@@ -60,7 +64,7 @@ class TestStats(unittest.TestCase):
         self.assertIsNone(self.http_handler.do_GET())
 
     def test_main(self):
-        self.assertEqual(stats_httpd.IS_VERBOSE, False)
+        self.assertEqual(stats_httpd.IS_VERBOSE, True)
         self.assertRaises(TypeError, stats_httpd.main)
 
 if __name__ == "__main__":