Skip to content

Commit

Permalink
Merge clean-build-for-documentation-6970: Make the documentation buil…
Browse files Browse the repository at this point in the history
…d without warnings.

Author: bramwelt, adiroiban

Reviewer: glyph, exarkun

Fixes: twisted#6970

Just fix a couple of warnings introduced in the logger docs.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@42961 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
  • Loading branch information
glyph committed Aug 10, 2014
1 parent 1f63908 commit 370dabf
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions docs/core/howto/logger.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

Logging with twisted.python.logger
==================================
.. _core-howto-logger-main

.. _core-howto-logger-main:

The Basics
----------
Expand Down Expand Up @@ -280,8 +280,10 @@ Emitting applications should be cautious about inserting objects into event whic
While observers are called synchronously, it is possible that an observer will do something like queue up the event for later serialization, in which case the serialized object may be different than intended.


.. _core-howto-logger-saving-events-for-later: Saving events for later
---------------------------------------------------------------------------
.. _core-howto-logger-saving-events-for-later:

Saving events for later
-----------------------

For compatibility reasons, ``twistd`` will log to a text-based format by default.
However, it's much better to use a structured log file format which preserves information about the events being logged.
Expand Down
2 changes: 1 addition & 1 deletion docs/web/howto/web-in-60/access-logging.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Do this by passing ``logPath`` to the initializer:
Or if you want to change the logging behavior of a server you're launching with ``twistd web`` then just pass the ``--logfile`` option:

.. code-block:: shell
.. code-block:: sh
$ twistd -n web --logfile /tmp/access-logging-demo.log
Expand Down
Empty file added twisted/topfiles/6970.misc
Empty file.
Empty file added twisted/web/topfiles/6970.misc
Empty file.

0 comments on commit 370dabf

Please sign in to comment.