summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2010-12-26 21:22:33 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2010-12-26 21:22:33 (GMT)
commit7d10129369d55821e51d28d4efebaee3ac79a85b (patch)
tree7408272bbf5f709d8a87287a3ea3a1ed0c5ea02c
parentb4ca59b783d6d2047c34eb242d97272d81b94688 (diff)
downloadcpython-7d10129369d55821e51d28d4efebaee3ac79a85b.zip
cpython-7d10129369d55821e51d28d4efebaee3ac79a85b.tar.gz
cpython-7d10129369d55821e51d28d4efebaee3ac79a85b.tar.bz2
Added logging documentation cross-references.
-rw-r--r--Doc/howto/logging-cookbook.rst21
-rw-r--r--Doc/howto/logging.rst13
2 files changed, 30 insertions, 4 deletions
diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
index 61492e4..7a13790 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -966,8 +966,8 @@ example. You would want to set *maxBytes* to an appropriate value.
.. _zeromq-handlers:
-Subclassing QueueHandler
-------------------------
+Subclassing QueueHandler - a ZeroMQ example
+-------------------------------------------
You can use a :class:`QueueHandler` subclass to send messages to other kinds
of queues, for example a ZeroMQ 'publish' socket. In the example below,the
@@ -1006,8 +1006,8 @@ data needed by the handler to create the socket::
self.queue.close()
-Subclassing QueueListener
--------------------------
+Subclassing QueueListener - a ZeroMQ example
+--------------------------------------------
You can also subclass :class:`QueueListener` to get messages from other kinds
of queues, for example a ZeroMQ 'subscribe' socket. Here's an example::
@@ -1024,4 +1024,17 @@ of queues, for example a ZeroMQ 'subscribe' socket. Here's an example::
return logging.makeLogRecord(json.loads(msg))
+.. seealso::
+ Module :mod:`logging`
+ API reference for the logging module.
+
+ Module :mod:`logging.config`
+ Configuration API for the logging module.
+
+ Module :mod:`logging.handlers`
+ Useful handlers included with the logging module.
+
+ :ref:`A basic logging tutorial <logging-basic-tutorial>`
+
+ :ref:`A more advanced logging tutorial <logging-advanced-tutorial>`
diff --git a/Doc/howto/logging.rst b/Doc/howto/logging.rst
index a94915d..21b5cbc 100644
--- a/Doc/howto/logging.rst
+++ b/Doc/howto/logging.rst
@@ -1015,3 +1015,16 @@ Also note that the core logging module only includes the basic handlers. If
you don't import :mod:`logging.handlers` and :mod:`logging.config`, they won't
take up any memory.
+.. seealso::
+
+ Module :mod:`logging`
+ API reference for the logging module.
+
+ Module :mod:`logging.config`
+ Configuration API for the logging module.
+
+ Module :mod:`logging.handlers`
+ Useful handlers included with the logging module.
+
+ :ref:`A logging cookbook <logging-cookbook>`
+