core: more descriptive graceful shutdown timeout error

Accounts for timers too
Tidy up a wordy comment further down the file

mitogen/core.py

@@ -3333,10 +3333,10 @@ class Broker(object):
             self._loop_once(max(0, deadline - time.time()))
 
         if self.keep_alive():
-            LOG.error('%r: some streams did not close gracefully. '
+            LOG.error('%r: pending work still existed %d seconds after '
-                      'The most likely cause for this is one or '
+                      'shutdown began. This may be due to a timer that is yet '
-                      'more child processes still connected to '
+                      'to expire, or a child connection that did not fully '
-                      'our stdout/stderr pipes.', self)
+                      'shut down.', self, self.shutdown_timeout)
 
     def _do_broker_main(self):
         """
@@ -3511,11 +3511,11 @@ class ExternalContext(object):
         if not self.config['profiling']:
             os.kill(os.getpid(), signal.SIGTERM)
 
-    #: On Python >3.4, the global importer lock has been sharded into a
+    #: On Python >3.4, the global importer lock has split into per-module
-    #: per-module lock, meaning there is no guarantee the import statement in
+    #: locks, so there is no guarantee the import statement in
-    #: service_stub_main will be truly complete before a second thread
+    #: service_stub_main will complete before a second thread attempting the
-    #: attempting the same import will see a partially initialized module.
+    #: same import will see a partially initialized module. Therefore serialize
-    #: Sigh. Therefore serialize execution of the stub itself.
+    #: the stub explicitly.
     service_stub_lock = threading.Lock()
 
     def _service_stub_main(self, msg):