Merge pull request ipython#5379 from minrk/config-grr

don't instantiate Application just for default logger
mattvonrocketstein · Mar 19, 2014 · 1943f33 · 1943f33
2 parents d110b06 + 2a81bf9
commit 1943f33
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/IPython/config/configurable.py b/IPython/config/configurable.py
@@ -26,6 +26,7 @@
 # Imports
 #-----------------------------------------------------------------------------
 
+import logging
 from copy import deepcopy
 
 from .loader import Config, LazyConfigValue
@@ -381,6 +382,9 @@ class LoggingConfigurable(Configurable):
     log = Instance('logging.Logger')
     def _log_default(self):
         from IPython.config.application import Application
-        return Application.instance().log
+        if Application.initialized():
+            return Application.instance().log
+        else:
+            return logging.getLogger()
 
 
diff --git a/IPython/config/loader.py b/IPython/config/loader.py
@@ -25,6 +25,7 @@
 
 import argparse
 import copy
+import logging
 import os
 import re
 import sys
@@ -308,7 +309,10 @@ class ConfigLoader(object):
 
     def _log_default(self):
         from IPython.config.application import Application
-        return Application.instance().log
+        if Application.initialized():
+            return Application.instance().log
+        else:
+            return logging.getLogger()
 
     def __init__(self, log=None):
         """A base class for config loaders.