[Python-checkins] cpython (merge 3.5 -> default): Closed #26533: Merged update from 3.5.

[vinay.sajip]

https://hg.python.org/cpython/rev/abd744bf62fb
changeset:   103627:abd744bf62fb
parent:      103625:0383ae836de9
parent:      103626:65a1abf4b432
user:        Vinay Sajip <vinay_sajip at yahoo.co.uk>
date:        Sun Sep 11 13:15:57 2016 +0100
summary:
  Closed #26533: Merged update from 3.5.

files:
  Doc/library/logging.config.rst |  19 ++++++++++++++-----
  1 files changed, 14 insertions(+), 5 deletions(-)


diff --git a/Doc/library/logging.config.rst b/Doc/library/logging.config.rst
--- a/Doc/library/logging.config.rst
+++ b/Doc/library/logging.config.rst
@@ -126,10 +126,10 @@
    Starts up a socket server on the specified port, and listens for new
    configurations. If no port is specified, the module's default
    :const:`DEFAULT_LOGGING_CONFIG_PORT` is used. Logging configurations will be
-   sent as a file suitable for processing by :func:`fileConfig`. Returns a
-   :class:`~threading.Thread` instance on which you can call
-   :meth:`~threading.Thread.start` to start the server, and which you can
-   :meth:`~threading.Thread.join` when appropriate. To stop the server,
+   sent as a file suitable for processing by :func:`dictConfig` or
+   :func:`fileConfig`. Returns a :class:`~threading.Thread` instance on which
+   you can call :meth:`~threading.Thread.start` to start the server, and which
+   you can :meth:`~threading.Thread.join` when appropriate. To stop the server,
    call :func:`stopListening`.
 
    The ``verify`` argument, if specified, should be a callable which should
@@ -165,9 +165,18 @@
       ``verify`` argument to :func:`listen` to prevent unrecognised
       configurations from being applied.
 
-   .. versionchanged:: 3.4.
+   .. versionchanged:: 3.4
       The ``verify`` argument was added.
 
+   .. note::
+
+      If you want to send configurations to the listener which don't
+      disable existing loggers, you will need to use a JSON format for
+      the configuration, which will use :func:`dictConfig` for configuration.
+      This method allows you to specify ``disable_existing_loggers`` as
+      ``False`` in the configuration you send.
+
+
 .. function:: stopListening()
 
    Stops the listening server which was created with a call to :func:`listen`.

-- 
Repository URL: https://hg.python.org/cpython