Show More
@@ -162,6 +162,10 b' class BaseParallelApplication(BaseIPythonApplication):' | |||||
162 | self._log_formatter = logging.Formatter("[%(name)s] %(message)s") |
|
162 | self._log_formatter = logging.Formatter("[%(name)s] %(message)s") | |
163 | self._log_handler.setFormatter(self._log_formatter) |
|
163 | self._log_handler.setFormatter(self._log_formatter) | |
164 | self.log.addHandler(self._log_handler) |
|
164 | self.log.addHandler(self._log_handler) | |
|
165 | # do not propagate log messages to root logger | |||
|
166 | # ipcluster app will sometimes print duplicate messages during shutdown | |||
|
167 | # if this is 1 (default): | |||
|
168 | self.log.propagate = False | |||
165 |
|
169 | |||
166 | def write_pid_file(self, overwrite=False): |
|
170 | def write_pid_file(self, overwrite=False): | |
167 | """Create a .pid file in the pid_dir with my pid. |
|
171 | """Create a .pid file in the pid_dir with my pid. |
@@ -40,6 +40,7 b' import zmq' | |||||
40 | from zmq.log import handlers |
|
40 | from zmq.log import handlers | |
41 |
|
41 | |||
42 | # IPython imports |
|
42 | # IPython imports | |
|
43 | from IPython.config.application import Application | |||
43 | from IPython.utils.pickleutil import can, uncan, canSequence, uncanSequence |
|
44 | from IPython.utils.pickleutil import can, uncan, canSequence, uncanSequence | |
44 | from IPython.utils.newserialized import serialize, unserialize |
|
45 | from IPython.utils.newserialized import serialize, unserialize | |
45 | from IPython.zmq.log import EnginePUBHandler |
|
46 | from IPython.zmq.log import EnginePUBHandler | |
@@ -391,7 +392,8 b' def select_random_ports(n):' | |||||
391 | def signal_children(children): |
|
392 | def signal_children(children): | |
392 | """Relay interupt/term signals to children, for more solid process cleanup.""" |
|
393 | """Relay interupt/term signals to children, for more solid process cleanup.""" | |
393 | def terminate_children(sig, frame): |
|
394 | def terminate_children(sig, frame): | |
394 | logging.critical("Got signal %i, terminating children..."%sig) |
|
395 | log = Application.instance().log | |
|
396 | log.critical("Got signal %i, terminating children..."%sig) | |||
395 | for child in children: |
|
397 | for child in children: | |
396 | child.terminate() |
|
398 | child.terminate() | |
397 |
|
399 |
General Comments 0
You need to be logged in to leave comments.
Login now