summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2013-01-22 13:13:16 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2013-01-22 13:13:16 (GMT)
commit7f3e993a3a318017422d493cd4daff8deb48e332 (patch)
treee66ec23eb8d7a9dad337e3ebd116b54fcc21ae24
parent80c88f4304a0da47610aee0968df30bce4ac5209 (diff)
parentf186911e247b287d555852ce73afb721f8eb79b9 (diff)
downloadcpython-7f3e993a3a318017422d493cd4daff8deb48e332.zip
cpython-7f3e993a3a318017422d493cd4daff8deb48e332.tar.gz
cpython-7f3e993a3a318017422d493cd4daff8deb48e332.tar.bz2
Merged documentation update from 3.2.
-rw-r--r--Doc/howto/logging.rst10
-rwxr-xr-xDoc/howto/logging_flow.pngbin0 -> 49648 bytes
2 files changed, 10 insertions, 0 deletions
diff --git a/Doc/howto/logging.rst b/Doc/howto/logging.rst
index c2a13d9..79f1336 100644
--- a/Doc/howto/logging.rst
+++ b/Doc/howto/logging.rst
@@ -330,6 +330,9 @@ of components: loggers, handlers, filters, and formatters.
to output.
* Formatters specify the layout of log records in the final output.
+Log event information is passed between loggers, handlers, filters and
+formatters in a :class:`LogRecord` instance.
+
Logging is performed by calling methods on instances of the :class:`Logger`
class (hereafter called :dfn:`loggers`). Each instance has a name, and they are
conceptually arranged in a namespace hierarchy using dots (periods) as
@@ -374,6 +377,13 @@ You can change this by passing a format string to :func:`basicConfig` with the
*format* keyword argument. For all options regarding how a format string is
constructed, see :ref:`formatter-objects`.
+Logging Flow
+^^^^^^^^^^^^
+
+The flow of log event information in loggers and handlers is illustrated in the
+following diagram.
+
+.. image:: logging_flow.png
Loggers
^^^^^^^
diff --git a/Doc/howto/logging_flow.png b/Doc/howto/logging_flow.png
new file mode 100755
index 0000000..a883823
--- /dev/null
+++ b/Doc/howto/logging_flow.png
Binary files differ