Browse Source

[1271] Modify the message associated with command/configuration session

The ccsession is not a process, so it should not have a "process started"
message associated with it.
Stephen Morris 13 years ago
parent
commit
b10e71aafd
2 changed files with 18 additions and 5 deletions
  1. 11 2
      src/bin/bind10/bind10_messages.mes
  2. 7 3
      src/bin/bind10/bind10_src.py.in

+ 11 - 2
src/bin/bind10/bind10_messages.mes

@@ -161,6 +161,10 @@ indicated OS API function with given error.
 % BIND10_SOCKET_GET requesting socket [%1]:%2 of type %3 from the creator
 The boss forwards a request for a socket to the socket creator.
 
+% BIND10_STARTED_CC started configuration/command session
+Debug message given when BIND 10 has successfull started the object that
+handles configuration and commands.
+
 % BIND10_STARTED_PROCESS started %1
 The given process has successfully been started.
 
@@ -170,6 +174,10 @@ The given process has successfully been started, and has the given PID.
 % BIND10_STARTING starting BIND10: %1
 Informational message on startup that shows the full version.
 
+% BIND10_STARTING_CC starting configuration/command session
+Informational message given when BIND 10 is starting the session object
+that handles configuration and commands.
+
 % BIND10_STARTING_PROCESS starting process %1
 The boss module is starting the given process.
 
@@ -215,12 +223,13 @@ the message channel.
 An unknown child process has exited. The PID is printed, but no further
 action will be taken by the boss process.
 
-% BIND10_WAIT_CFGMGR waiting for configuration manager process to start
+% BIND10_WAIT_CFGMGR waiting for configuration manager process to initialize
 The configuration manager process is so critical to operation of BIND 10
 that after starting it, the Boss module will wait for it to initialize
 itself before continuing.  This debug message is produced during the
 wait and may be output zero or more times depending on how long it takes
 the configuration manager to start up.  The total length of time Boss
 will wait for the configuration manager before reporting an error is
-set with the command line --wait switch.
+set with the command line --wait switch, which has a default value of
+ten seconds.
 

+ 7 - 3
src/bin/bind10/bind10_src.py.in

@@ -533,13 +533,16 @@ class BoB:
 
             The argument c_channel_env is unused but is supplied to keep the
             argument list the same for all start_xxx methods.
+
+            With regards to logging, note that as the CC session is not a
+            process, the log_starting/log_started methods are not used.
         """
-        self.log_starting("ccsession")
+        logger.info(BIND10_STARTING_CC)
         self.ccs = isc.config.ModuleCCSession(SPECFILE_LOCATION, 
                                       self.config_handler,
                                       self.command_handler)
         self.ccs.start()
-        self.log_started()
+        logger.debug(DBG_PROCESS, BIND10_STARTED_CC)
 
     # A couple of utility methods for starting processes...
 
@@ -673,7 +676,8 @@ class BoB:
         self.start_ccsession(c_channel_env)
 
         # Extract the parameters associated with Bob.  This can only be
-        # done after the CC Session is started.
+        # done after the CC Session is started.  Note that the logging
+        # configuration may override the "-v" switch set on the command line.
         self.read_bind10_config()
 
         # Continue starting the processes.  The authoritative server (if