fix: distributed logging configuration now enabled

Author: satra

nipype/pipeline/plugins/base.py

@@ -461,6 +461,7 @@ def _submit_job(self, node, updatehash=False):
 from nipype import config, logging
 config_dict=%s
 config.update_config(config_dict)
+logging.update_logging(config)
 from nipype.utils.filemanip import loadpkl, savepkl
 """
 

nipype/pipeline/plugins/ipython.py

@@ -18,13 +18,14 @@
 def execute_task(pckld_task, node_config, updatehash):
     from socket import gethostname
     from traceback import format_exc
-    from nipype import config
-    config.update_config(node_config)
-    from cPickle import loads
-    task = loads(pckld_task)
+    from nipype import config, logging
     traceback=None
     result=None
     try:
+        config.update_config(node_config)
+        logging.update_logging(config)
+        from cPickle import loads
+        task = loads(pckld_task)
         result = task.run(updatehash=updatehash)
     except:
         traceback = format_exc()

nipype/utils/config.py

@@ -24,7 +24,7 @@
 workflow_level = INFO
 filemanip_level = INFO
 interface_level = INFO
-log_to_file = true
+log_to_file = false
 log_directory = %s
 log_size = 16384000
 log_rotate = 4

nipype/utils/logger.py

@@ -22,39 +22,53 @@ class Logging(object):
            '%(levelname)-2s:\n\t %(message)s')
     datefmt = '%y%m%d-%H:%M:%S'
     def __init__(self, config):
+        self._config = config
         logging.basicConfig(format=self.fmt, datefmt=self.datefmt,
                             stream=sys.stdout)
         #logging.basicConfig(stream=sys.stdout)
         self._logger = logging.getLogger('workflow')
         self._fmlogger = logging.getLogger('filemanip')
         self._iflogger = logging.getLogger('interface')
 
-        self._logger.setLevel(logging.getLevelName(config.get('logging',
-                                                              'workflow_level')))
-        self._fmlogger.setLevel(logging.getLevelName(config.get('logging',
-                                                          'filemanip_level')))
-        self._iflogger.setLevel(logging.getLevelName(config.get('logging',
-                                                          'interface_level')))
         self.loggers = {'workflow': self._logger,
                         'filemanip': self._fmlogger,
                         'interface': self._iflogger}
+        self.update_logging(self._config)
+        self._hdlr = None
+
+    def enable_file_logging(self):
+        config = self._config
+        LOG_FILENAME = os.path.join(config.get('logging', 'log_directory'),
+                                    'pypeline.log')
+        hdlr = RFHandler(LOG_FILENAME,
+                         maxBytes=int(config.get('logging', 'log_size')),
+                         backupCount=int(config.get('logging',
+                                                    'log_rotate')))
+        formatter = logging.Formatter(fmt=self.fmt, datefmt=self.datefmt)
+        hdlr.setFormatter(formatter)
+        self._logger.addHandler(hdlr)
+        self._fmlogger.addHandler(hdlr)
+        self._iflogger.addHandler(hdlr)
+        self._hdlr = hdlr
 
-    def add_file_handler(self, config=None):
-        if config is None:
-            config = NipypeConfig()
+    def disable_file_logging(self):
+        if self._hdlr:
+            self._logger.removeHandler(self._hdlr)
+            self._fmlogger.removeHandler(self._hdlr)
+            self._iflogger.removeHandler(self._hdlr)
+            self._hdlr = None
+
+    def update_logging(self, config):
+        self._config = config
+        self._logger.setLevel(logging.getLevelName(config.get('logging',
+                                                              'workflow_level')))
+        self._fmlogger.setLevel(logging.getLevelName(config.get('logging',
+                                                                'filemanip_level')))
+        self._iflogger.setLevel(logging.getLevelName(config.get('logging',
+                                                                'interface_level')))
         if str2bool(config.get('logging', 'log_to_file')):
-            LOG_FILENAME = os.path.join(config.get('logging', 'log_directory'),
-                                        'pypeline.log')
-            hdlr = RFHandler(LOG_FILENAME,
-                             maxBytes=int(config.get('logging', 'log_size')),
-                             backupCount=int(config.get('logging',
-                                                        'log_rotate')))
-            formatter = logging.Formatter(fmt=self.fmt, datefmt=self.datefmt)
-            hdlr.setFormatter(formatter)
-            self._logger.addHandler(hdlr)
-            self._fmlogger.addHandler(hdlr)
-            self._iflogger.addHandler(hdlr)
-            self._hdlr = hdlr
+            self.disable_file_logging()
+            self.enable_file_logging()
 
     def getLogger(self, name):
         if name in self.loggers: