trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [trafficserver] branch master updated: Doc: Fix build errors in logging. These are artifacts of the YAML update and the shn changes.
Date Tue, 03 Jul 2018 16:31:46 GMT
This is an automated email from the ASF dual-hosted git repository.

amc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new d13931a  Doc: Fix build errors in logging. These are artifacts of the YAML update
and the shn changes.
d13931a is described below

commit d13931ae263a83f0a23bbdbf7687a2e364b3ceed
Author: Alan M. Carroll <amc@apache.org>
AuthorDate: Tue Jul 3 10:57:49 2018 -0500

    Doc: Fix build errors in logging.
    These are artifacts of the YAML update and the shn changes.
---
 doc/admin-guide/files/logging.yaml.en.rst | 62 +++++++++++++++----------------
 doc/admin-guide/logging/examples.en.rst   |  3 +-
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/doc/admin-guide/files/logging.yaml.en.rst b/doc/admin-guide/files/logging.yaml.en.rst
index 30fc173..00be1ec 100644
--- a/doc/admin-guide/files/logging.yaml.en.rst
+++ b/doc/admin-guide/files/logging.yaml.en.rst
@@ -291,37 +291,37 @@ The following subsections cover the contents of the table which should
be
 passed when creating your logging object. Only ``Filename`` and ``Format`` are
 required.
 
-=================== =========== ===============================================
-Name                Type        Description
-=================== =========== ===============================================
-filename            string      The name of the logfile relative to the default
-                                logging directory (set with
-                                :ts:cv:`proxy.config.log.logfile_dir`).
-format              string      a string with a valid named format specification.
-header              string      If present, emitted as the first line of each
-                                new log file.
-rolling_enabled     *see below* Determines the type of log rolling to use (or
-                                whether to disable rolling). Overrides
-                                :ts:cv:`proxy.config.log.rolling_enabled`.
-rolling_interval_sec number     Interval in seconds between log file rolling.
-                                Overrides
-                                :ts:cv:`proxy.config.log.rolling_interval_sec`.
-rolling_offset_hr   number      Specifies an hour (from 0 to 23) at which log
-                                rolling is guaranteed to align. Only has an
-                                effect if RollingIntervalSec is set to greater
-                                than one hour. Overrides
-                                :ts:cv:`proxy.config.log.rolling_offset_hr`.
-rolling_size_mb     number      Size, in megabytes, at which log files are
-                                rolled.
-filters             array of    The optional list of filter objects which
-                    filters     restrict the individual events logged. The array
-                                may only contain one accept filter.
-collation_hosts     array of    If present, one or more strings specifying the
-                    strings     log collation hosts to which logs should be
-                                delivered, each in the form of "<ip>:<port>".
-                                :ref:`admin-logging-collation` for more
-                                information.
-=================== =========== ===============================================
+====================== =========== =================================================
+Name                   Type        Description
+====================== =========== =================================================
+filename               string      The name of the logfile relative to the default
+                                   logging directory (set with
+                                   :ts:cv:`proxy.config.log.logfile_dir`).
+format                 string      a string with a valid named format specification.
+header                 string      If present, emitted as the first line of each
+                                   new log file.
+rolling_enabled        *see below* Determines the type of log rolling to use (or
+                                   whether to disable rolling). Overrides
+                                   :ts:cv:`proxy.config.log.rolling_enabled`.
+rolling_interval_sec   number      Interval in seconds between log file rolling.
+                                   Overrides
+                                   :ts:cv:`proxy.config.log.rolling_interval_sec`.
+rolling_offset_hr      number      Specifies an hour (from 0 to 23) at which log
+                                   rolling is guaranteed to align. Only has an
+                                   effect if RollingIntervalSec is set to greater
+                                   than one hour. Overrides
+                                   :ts:cv:`proxy.config.log.rolling_offset_hr`.
+rolling_size_mb        number      Size, in megabytes, at which log files are
+                                   rolled.
+filters                array of    The optional list of filter objects which
+                       filters     restrict the individual events logged. The array
+                                   may only contain one accept filter.
+collation_hosts        array of    If present, one or more strings specifying the
+                       strings     log collation hosts to which logs should be
+                                   delivered, each in the form of "<ip>:<port>".
+                                   :ref:`admin-logging-collation` for more
+                                   information.
+====================== =========== =================================================
 
 Enabling log rolling may be done globally in :file:`records.config`, or on a
 per-log basis by passing appropriate values for the ``rolling_enabled`` key. The
diff --git a/doc/admin-guide/logging/examples.en.rst b/doc/admin-guide/logging/examples.en.rst
index 466b520..df4d957 100644
--- a/doc/admin-guide/logging/examples.en.rst
+++ b/doc/admin-guide/logging/examples.en.rst
@@ -199,7 +199,7 @@ No. Field    Description
              hex.
 8   caun     The username of the authenticated client. A hyphen (``-``)
              means that no authentication was required.
-9   phr/shn The proxy hierarchy route. The route |TS| used to retrieve the
+9   phr/shn  The proxy hierarchy route. The route |TS| used to retrieve the
              object.
 10  psct     The proxy response content type. The object content type taken
              from the |TS| response header.
@@ -325,4 +325,3 @@ the request to clients during that hour.
      filters:
      - originfilter
      filename: origin_access_summary
-


Mime
View raw message