Clean up scheduler startup logging (#657)

* clean up scheduler startup logging

* update cli tests for new logging information

Author: mrocklin

distributed/bokeh/application.py

@@ -23,7 +23,7 @@
              'memory-usage.py', 'task-stream.py', 'task-progress.py',
              'resource-profiles.py', 'worker-table.py', 'processing-stacks.py']]
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger(__name__)
 
 dask_dir = os.path.join(os.path.expanduser('~'), '.dask')
 if not os.path.exists(dask_dir):
@@ -92,7 +92,7 @@ def cleanup_process():
         atexit.register(cleanup_process)
 
         if not quiet:
-            logger.info(" Bokeh UI at:  http://%s:%d/status/"
+            logger.info("Web UI: http://%s:%d/status/"
                          % (ip, bokeh_port))
 
     def close(self, join=True, timeout=None):

distributed/cli/dask_scheduler.py

@@ -64,6 +64,7 @@ def del_pid_file():
         port = int(port)
     ip = socket.gethostbyname(host)
     loop = IOLoop.current()
+    logger.info('-' * 47)
     scheduler = Scheduler(ip=ip, loop=loop,
                           services={('http', http_port): HTTPScheduler})
     scheduler.start(port)
@@ -81,6 +82,8 @@ def del_pid_file():
         except Exception as e:
             logger.warn("Could not start Bokeh web UI", exc_info=True)
 
+
+    logger.info('-' * 47)
     try:
         loop.start()
         loop.close()

distributed/cli/tests/test_dask_scheduler.py

@@ -55,7 +55,7 @@ def test_bokeh(loop):
 
         while True:
             line = proc.stderr.readline()
-            if b'Bokeh UI' in line:
+            if b'Web UI' in line:
                 break
 
         names = ['localhost', '127.0.0.1', get_ip()]
@@ -89,7 +89,7 @@ def test_bokeh_non_standard_ports(loop):
 
         while True:
             line = proc.stderr.readline()
-            if b'Bokeh UI' in line:
+            if b'Web UI' in line:
                 break
 
         start = time()
@@ -119,7 +119,7 @@ def test_bokeh_whitelist(loop):
 
         while True:
             line = proc.stderr.readline()
-            if b'Bokeh UI' in line:
+            if b'Web UI' in line:
                 break
 
         start = time()
@@ -162,7 +162,7 @@ def check_pidfile(proc, pidfile):
             assert pid
         else:
             assert proc.pid == pid
-    
+
     with tmpfile() as s:
         with popen(['dask-scheduler', '--pid-file', s]) as sched:
             check_pidfile(sched, s)

distributed/scheduler.py

@@ -395,9 +395,9 @@ def start(self, port=8786, start_queues=True):
             self.listen(port)
 
             self.status = 'running'
-            logger.info("Scheduler at: %20s:%s", self.ip, self.port)
+            logger.info("  Scheduler at: %20s:%s", self.ip, self.port)
             for k, v in self.services.items():
-                logger.info("%9s at: %20s:%s", k, self.ip, v.port)
+                logger.info("%11s at: %20s:%s", k, self.ip, v.port)
 
         return self.finished()