Fix #618: avoid configuring the root logger

pitrou · pitrou · commit 08c6c67a9258 · 2016-11-09T22:28:05.000+01:00
diff --git a/distributed/cli/tests/test_dask_scheduler.py b/distributed/cli/tests/test_dask_scheduler.py
@@ -53,11 +53,6 @@ def test_bokeh(loop):
         with Client('127.0.0.1:%d' % Scheduler.default_port, loop=loop) as c:
             pass
 
-        while True:
-            line = proc.stderr.readline()
-            if b'Bokeh UI' in line:
-                break
-
         names = ['localhost', '127.0.0.1', get_ip()]
         if 'linux' in sys.platform:
             names.append(socket.gethostname())
@@ -87,11 +82,6 @@ def test_bokeh_non_standard_ports(loop):
         with Client('127.0.0.1:3448', loop=loop) as c:
             pass
 
-        while True:
-            line = proc.stderr.readline()
-            if b'Bokeh UI' in line:
-                break
-
         start = time()
         while True:
             try:
@@ -102,7 +92,7 @@ def test_bokeh_non_standard_ports(loop):
                 sleep(0.1)
                 assert time() < start + 20
     with pytest.raises(Exception):
-        requests.get('http://127.0.0.1:4832/status/')
+        requests.get('http://localhost:4832/status/')
 
 
 @pytest.mark.skipif(not sys.platform.startswith('linux'),
@@ -117,11 +107,6 @@ def test_bokeh_whitelist(loop):
         with Client('127.0.0.1:%d' % Scheduler.default_port, loop=loop) as c:
             pass
 
-        while True:
-            line = proc.stderr.readline()
-            if b'Bokeh UI' in line:
-                break
-
         start = time()
         while True:
             try:
diff --git a/distributed/config.py b/distributed/config.py
@@ -1,7 +1,11 @@
 from __future__ import print_function, division, absolute_import
 
+import logging
 import os
-from .compatibility import FileExistsError
+import sys
+
+from .compatibility import FileExistsError, logging_names
+
 try:
     import yaml
 except ImportError:
@@ -33,3 +37,26 @@ def load_config_file(path=dask_config_path):
 
     ensure_config_file()
     config = load_config_file()
+
+
+def initialize_logging(config):
+    loggers = config.get('logging', None)
+    loggers.setdefault('distributed', 'info')
+
+    fmt = '%(name)s - %(levelname)s - %(message)s'
+
+    handler = logging.StreamHandler(sys.stderr)
+    handler.setFormatter(logging.Formatter(fmt))
+    for name, level in loggers.items():
+        LEVEL = logging_names[level.upper()]
+        logger = logging.getLogger(name)
+        logger.setLevel(LEVEL)
+        logger.addHandler(handler)
+        logger.propagate = False
+
+    # http://stackoverflow.com/questions/21234772/python-tornado-disable-logging-to-stderr
+    # XXX this silences legitimate error messages
+    logging.getLogger('tornado').setLevel(logging.CRITICAL)
+
+
+initialize_logging(config)
diff --git a/distributed/scheduler.py b/distributed/scheduler.py
@@ -1129,8 +1129,8 @@ def worker_stream(self, worker):
                     self.transitions(recommendations)
 
                     if self.validate:
-                        logger.info("Messages: %s\nRecommendations: %s",
-                                    msgs, recommendations)
+                        logger.debug("Messages: %s\nRecommendations: %s",
+                                     msgs, recommendations)
                 self.ensure_occupied()
 
         except (StreamClosedError, IOError, OSError):
@@ -2454,8 +2454,8 @@ def transition(self, key, finish, *args, **kwargs):
             finish2 = self.task_state.get(key, 'forgotten')
             self.transition_log.append((key, start, finish2, recommendations))
             if self.validate:
-                logger.info("Transition %s->%s: %s New: %s",
-                            start, finish2, key, recommendations)
+                logger.debug("Transition %s->%s: %s New: %s",
+                             start, finish2, key, recommendations)
             for plugin in self.plugins:
                 try:
                     plugin.transition(key, start, finish2, *args, **kwargs)
diff --git a/distributed/utils.py b/distributed/utils.py
@@ -5,6 +5,7 @@
 import logging
 import os
 import re
+import shutil
 import socket
 import six
 import sys
@@ -357,26 +358,6 @@ def convert(task):
     return {tokey(k): convert(v) for k, v in dsk.items()}
 
 
-import logging
-from .compatibility import logging_names
-logging.basicConfig(format='%(name)s - %(levelname)s - %(message)s',
-                    level=logging.INFO)
-
-for name, level in config.get('logging', {}).items():
-    LEVEL = logging_names[level.upper()]
-    logging.getLogger(name).setLevel(LEVEL)
-
-# http://stackoverflow.com/questions/21234772/python-tornado-disable-logging-to-stderr
-stream = logging.StreamHandler(sys.stderr)
-stream.setLevel(logging.CRITICAL)
-logging.getLogger('tornado').addHandler(stream)
-logging.getLogger('tornado').propagate = False
-
-
-from contextlib import contextmanager
-import shutil
-
-
 def seek_delimiter(file, delimiter, blocksize):
     """ Seek current file to next byte after a delimiter bytestring
 
