You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2015/06/16 20:15:07 UTC
[2/2] trafficserver git commit: TS-1985: clang-format
TS-1985: clang-format
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9236bb73
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9236bb73
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9236bb73
Branch: refs/heads/master
Commit: 9236bb738db2cdcab6174a619f25c89190aa0e3a
Parents: 5c2b032
Author: Phil Sorber <so...@apache.org>
Authored: Tue Jun 16 12:13:24 2015 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Tue Jun 16 12:13:24 2015 -0600
----------------------------------------------------------------------
doc/admin/working-log-files.en.rst | 6 +++---
doc/reference/configuration/records.config.en.rst | 2 +-
proxy/logging/LogConfig.cc | 18 +++++++++---------
proxy/logging/LogConfig.h | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9236bb73/doc/admin/working-log-files.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/working-log-files.en.rst b/doc/admin/working-log-files.en.rst
index 0ac2d1d..85f1fd3 100644
--- a/doc/admin/working-log-files.en.rst
+++ b/doc/admin/working-log-files.en.rst
@@ -222,8 +222,8 @@ analyzed with a wide variety of off-the-shelf log-analysis packages. You
should use one of the standard event log formats unless you need
information that these formats do not provide. Refer to `Using the Custom Format`_.
-#. Log formats are now configured and enabled via :file:`logs_xml.config`.
- Here are four example log formats, which match with the previous configurations (set formerly in :file:`records.config`).
+#. Log formats are now configured and enabled via :file:`logs_xml.config`.
+ Here are four example log formats, which match with the previous configurations (set formerly in :file:`records.config`).
- :ts:cv: [format]_log_enabled
- :ts:cv: [format]_is_ascii
- :ts:cv: [format]_name
@@ -232,7 +232,7 @@ information that these formats do not provide. Refer to `Using the Custom Format
The [format] specified can be squid (Squid), common (Netscape Common),
extended (Netscape Extended), or extended2 (Netscape Extended 2).
-Note that the squid log object is created by default, and will be used if logging is enabled.
+Note that the squid log object is created by default, and will be used if logging is enabled.
Users can use any number of log formats and create any number of log objects via the XML config.
#. Run the command :option:`traffic_line -x` to apply the configuration
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9236bb73/doc/reference/configuration/records.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst
index d4b0fba..2c7267b 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -2020,7 +2020,7 @@ Logging Configuration
- ``log_header_ STRING NULL
The file header text (ex. :ref:`squid log <log-formats-squid-format>`).
- The format can be either ``squid`` (Squid Format), ``common`` (Netscape Common), ``extended`` (Netscape Extended),
+ The format can be either ``squid`` (Squid Format), ``common`` (Netscape Common), ``extended`` (Netscape Extended),
or ``extended2`` (Netscape Extended-2).
.. ts:cv:: CONFIG proxy.config.log.separate_icp_logs INT 0
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9236bb73/proxy/logging/LogConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogConfig.cc b/proxy/logging/LogConfig.cc
index 63189ee..7b59792 100644
--- a/proxy/logging/LogConfig.cc
+++ b/proxy/logging/LogConfig.cc
@@ -447,7 +447,7 @@ LogConfig::init(LogConfig *prev_config)
// ----------------------------------------------------------------------
Log::error_log = NULL;
-
+
if (prev_config) {
// Transfer objects from previous configuration.
transfer_objects(prev_config);
@@ -705,14 +705,14 @@ LogConfig::register_config_callbacks()
static const char *names[] = {
"proxy.config.log.log_buffer_size", "proxy.config.log.max_secs_per_buffer", "proxy.config.log.max_space_mb_for_logs",
"proxy.config.log.max_space_mb_for_orphan_logs", "proxy.config.log.max_space_mb_headroom", "proxy.config.log.logfile_perm",
- "proxy.config.log.hostname", "proxy.config.log.logfile_dir", "proxy.config.log.separate_icp_logs",
- "proxy.config.log.separate_host_logs", "proxy.local.log.collation_mode",
- "proxy.config.log.collation_host", "proxy.config.log.collation_port", "proxy.config.log.collation_host_tagged",
- "proxy.config.log.collation_secret", "proxy.config.log.collation_retry_sec", "proxy.config.log.collation_max_send_buffers",
- "proxy.config.log.rolling_enabled", "proxy.config.log.rolling_interval_sec", "proxy.config.log.rolling_offset_hr",
- "proxy.config.log.rolling_size_mb", "proxy.config.log.auto_delete_rolled_files", "proxy.config.log.custom_logs_enabled",
- "proxy.config.log.xml_config_file", "proxy.config.log.hosts_config_file", "proxy.config.log.sampling_frequency",
- "proxy.config.log.file_stat_frequency", "proxy.config.log.space_used_frequency",
+ "proxy.config.log.hostname", "proxy.config.log.logfile_dir", "proxy.config.log.separate_icp_logs",
+ "proxy.config.log.separate_host_logs", "proxy.local.log.collation_mode", "proxy.config.log.collation_host",
+ "proxy.config.log.collation_port", "proxy.config.log.collation_host_tagged", "proxy.config.log.collation_secret",
+ "proxy.config.log.collation_retry_sec", "proxy.config.log.collation_max_send_buffers", "proxy.config.log.rolling_enabled",
+ "proxy.config.log.rolling_interval_sec", "proxy.config.log.rolling_offset_hr", "proxy.config.log.rolling_size_mb",
+ "proxy.config.log.auto_delete_rolled_files", "proxy.config.log.custom_logs_enabled", "proxy.config.log.xml_config_file",
+ "proxy.config.log.hosts_config_file", "proxy.config.log.sampling_frequency", "proxy.config.log.file_stat_frequency",
+ "proxy.config.log.space_used_frequency",
};
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9236bb73/proxy/logging/LogConfig.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogConfig.h b/proxy/logging/LogConfig.h
index c4310ad..6143d91 100644
--- a/proxy/logging/LogConfig.h
+++ b/proxy/logging/LogConfig.h
@@ -209,7 +209,7 @@ private:
void setup_default_values();
void setup_collation(LogConfig *prev_config);
-
+
LogFilter *split_by_protocol();
size_t split_by_hostname(LogFilter *reject_protocol);