Ticket #14388: 14388_2.patch

File 14388_2.patch, 4.8 KB (added by Gabriel Hurley, 14 years ago)

Corrected "a Error" -> "an Error", otherwise same patch.

  • docs/ref/settings.txt 

    diff -r c50edf53c11e docs/ref/settings.txt
     
    10061006A tuple of directories where Django looks for translation files.
    10071007See :ref:`using-translations-in-your-own-projects`.
    10081008
    1009 .. setting:: LOGIN_REDIRECT_URL
     1009.. setting:: LOGGING
    10101010
    10111011LOGGING
    10121012-------
    … …  
    10221022
    10231023.. versionadded:: 1.3
    10241024
     1025.. setting:: LOGGING_CONFIG
     1026
    10251027LOGGING_CONFIG
    10261028--------------
    10271029
    … …  
    10381040
    10391041.. versionadded:: 1.3
    10401042
     1043.. setting:: LOGIN_REDIRECT_URL
     1044
    10411045LOGIN_REDIRECT_URL
    10421046------------------
    10431047

  • docs/topics/logging.txt 

    diff -r c50edf53c11e docs/topics/logging.txt
     
    3535A logger is the entry point into the logging system. Each logger is
    3636a named bucket to which messages can be written for processing.
    3737
    38 A logger is configured to have *log level*. This log level describes
     38A logger is configured to have a *log level*. This log level describes
    3939the severity of the messages that the logger will handle. Python
    4040defines the following log levels:
    4141
    … …  
    5959stack trace or an error code.
    6060
    6161When a message is given to the logger, the log level of the message is
    62 compare to the log level of the logger. If the log level of the
     62compared to the log level of the logger. If the log level of the
    6363message meets or exceeds the log level of the logger itself, the
    6464message will undergo further processing. If it doesn't, the message
    6565will be ignored.
    … …  
    7676in a logger. It describes a particular logging behavior, such as
    7777writing a message to the screen, to a file, or to a network socket.
    7878
    79 Like loggers, handlers also have a log level. If the log level of a
     79Like loggers, handlers also have a *log level*. If the log level of a
    8080log record doesn't meet or exceed the level of the handler, the
    8181handler will ignore the message.
    8282
    … …  
    8484different log level. In this way, it is possible to provide different
    8585forms of notification depending on the importance of a message. For
    8686example, you could install one handler that forwards ``ERROR`` and
    87 ``CRITICIAL`` messages to a paging service, while a second handler
     87``CRITICAL`` messages to a paging service, while a second handler
    8888logs all messages (including ``ERROR`` and ``CRITICAL`` messages) to a
    8989file for later analysis.
    9090
    … …  
    143143error log record will be written.
    144144
    145145Naming loggers
    146 ~~~~~~~~~~~~~~
     146--------------
    147147
    148148The call to :meth:`logging.getLogger()` obtains (creating, if
    149149necessary) an instance of a logger. The logger instance is identified
    … …  
    177177can turn off this behavior.
    178178
    179179Making logging calls
    180 ~~~~~~~~~~~~~~~~~~~~
     180--------------------
    181181
    182182The logger instance contains an entry method for each of the default
    183183log levels:
    … …  
    190190
    191191There are two other logging calls available:
    192192
    193     * ``logger.log()``: manually a logging message with a specific
     193    * ``logger.log()``: Manually emits a logging message with a specific
    194194      log level.
    195195
    196     * ``logger.exception()``: create a ``ERRORR`` level logging
     196    * ``logger.exception()``: Create an ``ERROR`` level logging
    197197      message wrapping the current exception stack frame.
    198198
    199199Configuring logging
    … …  
    204204formatters to ensure that logging output is output in a useful way.
    205205
    206206Python's logging library provides several techniques to configure
    207 logging, ranging from a programatic interface to configuration files.
     207logging, ranging from a programmatic interface to configuration files.
    208208By default, Django uses the `dictConfig format`_.
    209209
    210210.. note::
    … …  
    320320
    321321    * Defines three handlers:
    322322
    323         * ``null``, a NullHandler, which will pass any `DEBUG` or
     323        * ``null``, a NullHandler, which will pass any ``DEBUG`` or
    324324          higher message to ``/dev/null``.
    325325
    326         * ``console``, a StreamHandler, which will print any `DEBUG`
     326        * ``console``, a StreamHandler, which will print any ``DEBUG``
    327327          message to stdout. This handler uses the `simple` output
    328328          format.
    329329
    330330        * ``mail_admins``, an AdminEmailHandler, which will email any
    331           `ERROR` level message to the site admins. This handler uses
     331          ``ERROR`` level message to the site admins. This handler uses
    332332          the ``special`` filter.
    333333
    334334    * Configures three loggers:
    … …  
    346346          or higher that also pass the ``special`` filter to two
    347347          handlers -- the ``console``, and ``mail_admins``. This
    348348          means that all ``INFO`` level messages (or higher) will be
    349           printed to the console; ``ERROR`` and ``CRITICIAL``
     349          printed to the console; ``ERROR`` and ``CRITICAL``
    350350          messages will also be output via e-mail.
    351351
    352352.. _formatter documentation: http://docs.python.org/library/logging.html#formatter-objects
Back to Top