Browse Source

[213] Remove some dead code after rip-out

Michal 'vorner' Vaner 13 years ago
parent
commit
911b53ae02
1 changed files with 4 additions and 13 deletions
  1. 4 13
      src/bin/bind10/bind10_src.py.in

+ 4 - 13
src/bin/bind10/bind10_src.py.in

@@ -67,7 +67,6 @@ import isc.util.process
 import isc.net.parse
 import isc.net.parse
 import isc.log
 import isc.log
 from isc.log_messages.bind10_messages import *
 from isc.log_messages.bind10_messages import *
-import isc.bind10.sockcreator
 import isc.bind10.component
 import isc.bind10.component
 
 
 isc.log.init("b10-boss")
 isc.log.init("b10-boss")
@@ -143,7 +142,7 @@ class ProcessInfo:
 
 
     def __init__(self, name, args, env={}, dev_null_stdout=False,
     def __init__(self, name, args, env={}, dev_null_stdout=False,
                  dev_null_stderr=False, uid=None, username=None):
                  dev_null_stderr=False, uid=None, username=None):
-        self.name = name 
+        self.name = name
         self.args = args
         self.args = args
         self.env = env
         self.env = env
         self.dev_null_stdout = dev_null_stdout
         self.dev_null_stdout = dev_null_stdout
@@ -211,13 +210,13 @@ class CChannelConnectError(Exception): pass
 
 
 class BoB:
 class BoB:
     """Boss of BIND class."""
     """Boss of BIND class."""
-    
+
     def __init__(self, msgq_socket_file=None, data_path=None,
     def __init__(self, msgq_socket_file=None, data_path=None,
     config_filename=None, nocache=False, verbose=False, setuid=None,
     config_filename=None, nocache=False, verbose=False, setuid=None,
     username=None, cmdctl_port=None, brittle=False):
     username=None, cmdctl_port=None, brittle=False):
         """
         """
             Initialize the Boss of BIND. This is a singleton (only one can run).
             Initialize the Boss of BIND. This is a singleton (only one can run).
-        
+
             The msgq_socket_file specifies the UNIX domain socket file that the
             The msgq_socket_file specifies the UNIX domain socket file that the
             msgq process listens on.  If verbose is True, then the boss reports
             msgq process listens on.  If verbose is True, then the boss reports
             what it is doing.
             what it is doing.
@@ -243,7 +242,6 @@ class BoB:
         self.config_filename = config_filename
         self.config_filename = config_filename
         self.cmdctl_port = cmdctl_port
         self.cmdctl_port = cmdctl_port
         self.brittle = brittle
         self.brittle = brittle
-        self.sockcreator = None
         self.__component_configurator = isc.bind10.component.Configurator(self)
         self.__component_configurator = isc.bind10.component.Configurator(self)
         self.__core_components = {
         self.__core_components = {
             'sockcreator': {
             'sockcreator': {
@@ -321,11 +319,6 @@ class BoB:
                                                             "Unknown command")
                                                             "Unknown command")
         return answer
         return answer
 
 
-    def start_creator(self):
-        self.curproc = 'b10-sockcreator'
-        self.sockcreator = isc.bind10.sockcreator.Creator("@@LIBEXECDIR@@:" +
-                                                          os.environ['PATH'])
-
     def kill_started_processes(self):
     def kill_started_processes(self):
         """
         """
             Called as part of the exception handling when a process fails to
             Called as part of the exception handling when a process fails to
@@ -334,8 +327,6 @@ class BoB:
         """
         """
         logger.info(BIND10_KILLING_ALL_PROCESSES)
         logger.info(BIND10_KILLING_ALL_PROCESSES)
 
 
-        self.stop_creator(True)
-
         for pid in self.processes:
         for pid in self.processes:
             logger.info(BIND10_KILL_PROCESS, self.processes[pid].name())
             logger.info(BIND10_KILL_PROCESS, self.processes[pid].name())
             os.kill(self.processes[pid].pid(), signal.SIGTERM)
             os.kill(self.processes[pid].pid(), signal.SIGTERM)
@@ -619,7 +610,7 @@ class BoB:
         if not self.__started:
         if not self.__started:
             raise Exception("Component failed during startup");
             raise Exception("Component failed during startup");
         else:
         else:
-            self.shutdown()
+            self.runnable = False
 
 
     def shutdown(self):
     def shutdown(self):
         """Stop the BoB instance."""
         """Stop the BoB instance."""