This is an automated email from the ASF dual-hosted git repository. zwoop pushed a commit to branch 8.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 0e95e363910332bb8c2e96606f42b37bf175787f Author: Randall Meyer <[email protected]> AuthorDate: Tue Jun 19 12:51:14 2018 -0700 Renames yaml-based configuration files to .yaml This includes logging.config and ssl_server_name.config (cherry picked from commit 1029ce6b9fdf2a074f33c88368cdec1f85a4e173) --- configs/Makefile.am | 4 ++-- configs/{logging.config.default => logging.yaml.default} | 0 configs/records.config.default.in | 2 +- ...server_name.config.default => ssl_server_name.yaml.default} | 0 doc/.tx/config | 6 +++--- doc/admin-guide/files/index.en.rst | 8 ++++---- .../files/{logging.config.en.rst => logging.yaml.en.rst} | 10 +++++----- doc/admin-guide/files/records.config.en.rst | 10 +++++----- ...l_server_name.config.en.rst => ssl_server_name.yaml.en.rst} | 6 +++--- doc/admin-guide/layer-4-routing.en.rst | 4 ++-- doc/admin-guide/logging/destinations.en.rst | 8 ++++---- doc/admin-guide/logging/examples.en.rst | 10 +++++----- doc/admin-guide/logging/filters.en.rst | 4 ++-- doc/admin-guide/logging/formatting.en.rst | 6 +++--- doc/admin-guide/logging/rotation.en.rst | 2 +- doc/admin-guide/logging/understanding.en.rst | 4 ++-- doc/admin-guide/plugins/header_rewrite.en.rst | 2 +- doc/manpages.py | 2 +- iocore/net/SSLSNIConfig.cc | 6 +++--- mgmt/RecordsConfig.cc | 4 ++-- mgmt/utils/MgmtUtils.h | 2 +- proxy/logging/LogConfig.cc | 10 +++++----- proxy/logging/YamlLogConfig.cc | 4 ++-- src/traffic_manager/AddConfigFilesHere.cc | 2 +- src/traffic_manager/traffic_manager.cc | 2 +- tests/README.md | 2 +- tests/gold_tests/autest-site/trafficserver.test.ext | 4 ++-- tests/gold_tests/h2/httpbin.test.py | 2 +- tests/gold_tests/logging/ccid_ctid.test.py | 2 +- tests/gold_tests/logging/custom-log.test.py | 2 +- tests/gold_tests/logging/log-field.test.py | 2 +- 31 files changed, 66 insertions(+), 66 deletions(-) diff --git a/configs/Makefile.am b/configs/Makefile.am index bffdbf8..0e03312 100644 --- a/configs/Makefile.am +++ b/configs/Makefile.am @@ -30,14 +30,14 @@ dist_sysconf_DATA = \ cache.config.default \ hosting.config.default \ ip_allow.config.default \ - logging.config.default \ + logging.yaml.default \ parent.config.default \ plugin.config.default \ remap.config.default \ socks.config.default \ splitdns.config.default \ ssl_multicert.config.default \ - ssl_server_name.config.default \ + ssl_server_name.yaml.default \ volume.config.default install-exec-hook: diff --git a/configs/logging.config.default b/configs/logging.yaml.default similarity index 100% rename from configs/logging.config.default rename to configs/logging.yaml.default diff --git a/configs/records.config.default.in b/configs/records.config.default.in index e0f8d7b..daf04b4 100644 --- a/configs/records.config.default.in +++ b/configs/records.config.default.in @@ -137,7 +137,7 @@ CONFIG proxy.config.cache.min_average_object_size INT 8000 ############################################################################## # Logging Config. Docs: # https://docs.trafficserver.apache.org/records.config#logging-configuration -# https://docs.trafficserver.apache.org/en/latest/admin-guide/files/logging.config.en.html +# https://docs.trafficserver.apache.org/en/latest/admin-guide/files/logging.yaml.en.html ############################################################################## CONFIG proxy.config.log.logging_enabled INT 3 CONFIG proxy.config.log.max_space_mb_for_logs INT 25000 diff --git a/configs/ssl_server_name.config.default b/configs/ssl_server_name.yaml.default similarity index 100% rename from configs/ssl_server_name.config.default rename to configs/ssl_server_name.yaml.default diff --git a/doc/.tx/config b/doc/.tx/config index fec2ade..6be02f9 100644 --- a/doc/.tx/config +++ b/doc/.tx/config @@ -82,9 +82,9 @@ file_filter = locale/<lang>/LC_MESSAGES/admin-guide/files/ip_allow.config.en.po source_file = _build/locale/pot/admin-guide/files/ip_allow.config.en.pot source_lang = en -[apache-traffic-server-6x.admin-guide--files--logging.config_en] -file_filter = locale/<lang>/LC_MESSAGES/admin-guide/files/logging.config.en.po -source_file = _build/locale/pot/admin-guide/files/logging.config.en.pot +[apache-traffic-server-6x.admin-guide--files--logging.yaml_en] +file_filter = locale/<lang>/LC_MESSAGES/admin-guide/files/logging.yaml.en.po +source_file = _build/locale/pot/admin-guide/files/logging.yaml.en.pot source_lang = en [apache-traffic-server-6x.admin-guide--files--parent_config_en] diff --git a/doc/admin-guide/files/index.en.rst b/doc/admin-guide/files/index.en.rst index 12b6949..65b9018 100644 --- a/doc/admin-guide/files/index.en.rst +++ b/doc/admin-guide/files/index.en.rst @@ -28,14 +28,14 @@ Configuration Files cache.config.en hosting.config.en ip_allow.config.en - logging.config.en + logging.yaml.en parent.config.en plugin.config.en records.config.en remap.config.en splitdns.config.en ssl_multicert.config.en - ssl_server_name.config.en + ssl_server_name.yaml.en storage.config.en volume.config.en @@ -51,7 +51,7 @@ Configuration Files Controls access to the |TS| cache based on source IP addresses and networks including limiting individual HTTP methods. -:doc:`logging.config.en` +:doc:`logging.yaml.en` Defines custom log file formats, filters, and processing options. :doc:`parent.config.en` @@ -74,7 +74,7 @@ Configuration Files Configures |TS| to use different server certificates for SSL termination when listening on multiple addresses or when clients employ SNI. -:doc:`ssl_server_name.config.en` +:doc:`ssl_server_name.yaml.en` Configures SNI based Layer 4 routing. :doc:`storage.config.en` diff --git a/doc/admin-guide/files/logging.config.en.rst b/doc/admin-guide/files/logging.yaml.en.rst similarity index 98% rename from doc/admin-guide/files/logging.config.en.rst rename to doc/admin-guide/files/logging.yaml.en.rst index 9ad9a21..30fc173 100644 --- a/doc/admin-guide/files/logging.config.en.rst +++ b/doc/admin-guide/files/logging.yaml.en.rst @@ -17,12 +17,12 @@ .. include:: ../../common.defs -.. configfile:: logging.config +.. configfile:: logging.yaml -logging.config +logging.yaml ************** -The :file:`logging.config` file defines all custom log file formats, filters, +The :file:`logging.yaml` file defines all custom log file formats, filters, and processing options. The file itself is a Lua script. .. important:: @@ -56,7 +56,7 @@ Formats ------- Custom logging formats may be provided directly to a log definition, or they -may be defined as a reusable variable in your :file:`logging.config` for ease +may be defined as a reusable variable in your :file:`logging.yaml` for ease of reference, particularly when you may have more than one log using the same format. Which approach you use is entirely up to you, though it's strongly recommended to create an explicit format object if you intend to reuse the same @@ -328,7 +328,7 @@ per-log basis by passing appropriate values for the ``rolling_enabled`` key. The latter method may also be used to effect different rolling settings for individual logs. The numeric values that may be passed are the same as used by :ts:cv:`proxy.config.log.rolling_enabled`. For convenience and readability, -the following predefined variables may also be used in :file:`logging.config`: +the following predefined variables may also be used in :file:`logging.yaml`: log.roll.none Disable log rolling. diff --git a/doc/admin-guide/files/records.config.en.rst b/doc/admin-guide/files/records.config.en.rst index 922f525..8bc17b9 100644 --- a/doc/admin-guide/files/records.config.en.rst +++ b/doc/admin-guide/files/records.config.en.rst @@ -2723,7 +2723,7 @@ Logging Configuration For information on sending custom formats to the collation server, refer to :ref:`admin-logging-collating-custom-formats` and - :file:`logging.config`. + :file:`logging.yaml`. .. note:: @@ -2845,11 +2845,11 @@ Logging Configuration completion will cause its timing stats to be written to the :ts:cv:`debugging log file <proxy.config.output.logfile>`. This is identifying data about the transaction and all of the :c:type:`transaction milestones <TSMilestonesType>`. -.. ts:cv:: CONFIG proxy.config.log.config.filename STRING logging.config +.. ts:cv:: CONFIG proxy.config.log.config.filename STRING logging.yaml :reloadable: This configuration value specifies the path to the - :file:`logging.config` configuration file. If this is a relative + :file:`logging.yaml` configuration file. If this is a relative path, |TS| loads it relative to the ``SYSCONFDIR`` directory. Diagnostic Logging Configuration @@ -3130,9 +3130,9 @@ SSL Termination ``head -c48 /dev/urandom | openssl enc -base64 | head -c48 > file.ticket``. Also note that OpenSSL session tickets are sensitive to the version of the ca-certificates. -.. ts:cv:: CONFIG proxy.config.ssl.servername.filename STRING ssl_server_name.config +.. ts:cv:: CONFIG proxy.config.ssl.servername.filename STRING ssl_server_name.yaml - The filename of the :file:`ssl_server_name.config` configuration file. If relative, it is relative to the + The filename of the :file:`ssl_server_name.yaml` configuration file. If relative, it is relative to the configuration directory (ts:cv:`proxy.config.config_dir`). .. ts:cv:: CONFIG proxy.config.ssl.max_record_size INT 0 diff --git a/doc/admin-guide/files/ssl_server_name.config.en.rst b/doc/admin-guide/files/ssl_server_name.yaml.en.rst similarity index 97% rename from doc/admin-guide/files/ssl_server_name.config.en.rst rename to doc/admin-guide/files/ssl_server_name.yaml.en.rst index 7760ee0..4aa1ebc 100644 --- a/doc/admin-guide/files/ssl_server_name.config.en.rst +++ b/doc/admin-guide/files/ssl_server_name.yaml.en.rst @@ -17,10 +17,10 @@ .. include:: ../../common.defs -ssl_server_name.config +ssl_server_name.yaml ********************** -.. configfile:: ssl_server_name.config +.. configfile:: ssl_server_name.yaml Description =========== @@ -33,7 +33,7 @@ the items specified by this file and if there is a match, the values specified i the defaults. This is done during the inbound connection processing and be some outbound properties can be overridden again later, such as via :file:`remap.config` or plugins. -By default this is named :file:`ssl_server_name.config`. The file can be changed by settting +By default this is named :file:`ssl_server_name.yaml`. The file can be changed by settting :ts:cv:`proxy.config.ssl.servername.filename`. This file is loaded on start up and by :option:`traffic_ctl config reload` if the file has been modified since process start. diff --git a/doc/admin-guide/layer-4-routing.en.rst b/doc/admin-guide/layer-4-routing.en.rst index d43a1d2..86c22b0 100644 --- a/doc/admin-guide/layer-4-routing.en.rst +++ b/doc/admin-guide/layer-4-routing.en.rst @@ -54,7 +54,7 @@ imposes some requirements on the traffic. * The inbound connection must be TLS. * The outbound destination must handle the HTTP ``CONNECT`` method. -SNI routing is configured by :file:`ssl_server_name.config`. +SNI routing is configured by :file:`ssl_server_name.yaml`. If SNI Routing is enabled the initial "`CLIENT HELLO <https://tools.ietf.org/html/rfc5246#section-7.4.1.2>`__" data of an inbound TLS connection is @@ -98,7 +98,7 @@ service-1.example.com app-server-29:443 service-2.example.com app-server-56:4443 ========================== ===================================== -The :file:`ssl_server_name.config` contents would be +The :file:`ssl_server_name.yaml` contents would be .. code-block:: lua diff --git a/doc/admin-guide/logging/destinations.en.rst b/doc/admin-guide/logging/destinations.en.rst index 354fb80..044200c 100644 --- a/doc/admin-guide/logging/destinations.en.rst +++ b/doc/admin-guide/logging/destinations.en.rst @@ -214,7 +214,7 @@ proxying or caching). When a |TS| node generates a buffer of event log entries, it first determines if it is the collation server or a collation client. The collation server node -writes all log buffers to its local disk (as per its :file:`logging.config` +writes all log buffers to its local disk (as per its :file:`logging.yaml` configuration), just as it would if log collation was not enabled. The collation client nodes prepare their log buffers for transfer across the network and send the buffers to the configured log collation server. @@ -243,7 +243,7 @@ To configure a |TS| node to be a collation client, follow the steps below. - :ts:cv:`proxy.local.log.collation_mode`: ``2`` to configure this node as log collation client and send standard formatted log entries to the - collation server. For custom log entries, see :file:`logging.config`. + collation server. For custom log entries, see :file:`logging.yaml`. - :ts:cv:`proxy.config.log.collation_host` - :ts:cv:`proxy.config.log.collation_port` - :ts:cv:`proxy.config.log.collation_secret` @@ -297,12 +297,12 @@ configuration adjustments in :file:`records.config`: Collating Custom Logs ~~~~~~~~~~~~~~~~~~~~~ -If you use custom event log files, then you must edit :file:`logging.config`, +If you use custom event log files, then you must edit :file:`logging.yaml`, in addition to configuring a collation server and collation clients. To collate custom event log files: -#. On each collation client, edit :file:`logging.config` and add the +#. On each collation client, edit :file:`logging.yaml` and add the ``CollationHosts`` attribute to the relevant logs. For example, adding two collation hosts to an ASCII log that uses the Squid format would look like: diff --git a/doc/admin-guide/logging/examples.en.rst b/doc/admin-guide/logging/examples.en.rst index 07474bf..63b5ce6 100644 --- a/doc/admin-guide/logging/examples.en.rst +++ b/doc/admin-guide/logging/examples.en.rst @@ -27,7 +27,7 @@ exhaustive of all possibilities (|TS| logging is quite flexible), these entries should hopefully get most administrators headed onto the right path. Unless otherwise noted, the example configurations here are to be applied in -:file:`logging.config`. +:file:`logging.yaml`. Online Event Log Builder ======================== @@ -65,7 +65,7 @@ No. Field Description 7 pscl The length of the |TS| response to the client in bytes. === ====== ==================================================================== -To recreate this as a log format in :file:`logging.config` you would define the +To recreate this as a log format in :file:`logging.yaml` you would define the following format object: .. code:: yaml @@ -112,7 +112,7 @@ No. Field Description of the response back to the client. === ===== ===================================================================== -To recreate this as a log format in :file:`logging.config` you would define the +To recreate this as a log format in :file:`logging.yaml` you would define the following format object: .. code:: yaml @@ -151,7 +151,7 @@ No. Field Description listed in :ref:`admin-logging-crc`. === ====== =============================================================== -To recreate this as a log format in :file:`logging.config` you would define the +To recreate this as a log format in :file:`logging.yaml` you would define the following format object: .. code:: yaml @@ -205,7 +205,7 @@ No. Field Description from the |TS| response header. === ======== ================================================================== -To recreate this as a log format in :file:`logging.config` you would define the +To recreate this as a log format in :file:`logging.yaml` you would define the following format object: .. code:: yaml diff --git a/doc/admin-guide/logging/filters.en.rst b/doc/admin-guide/logging/filters.en.rst index e0c3bfb..f3005ba 100644 --- a/doc/admin-guide/logging/filters.en.rst +++ b/doc/admin-guide/logging/filters.en.rst @@ -22,7 +22,7 @@ Log Filters *********** -Filters, configured in :file:`logging.config` allow you to create rules which +Filters, configured in :file:`logging.yaml` allow you to create rules which may be applied to log definitions, limiting the entries included in the log output. This may be useful if your |TS| nodes receive many events which you have no need to log or analyze, or you wish to establish separate logs with @@ -30,5 +30,5 @@ their own rotation policies to more rapidly perform log analysis for a subset of events. Configuration options are covered in detail in the -:ref:`admin-custom-logs-filters` section of :file:`logging.config`, so this +:ref:`admin-custom-logs-filters` section of :file:`logging.yaml`, so this page is currently left as a reference to the feature's existence. diff --git a/doc/admin-guide/logging/formatting.en.rst b/doc/admin-guide/logging/formatting.en.rst index d42640b..d917b6a 100644 --- a/doc/admin-guide/logging/formatting.en.rst +++ b/doc/admin-guide/logging/formatting.en.rst @@ -23,7 +23,7 @@ Formatting Log Files ******************** This section covers the creation of logging formats. All but a few logging -output related settings in |TS| are performed in :file:`logging.config` and +output related settings in |TS| are performed in :file:`logging.yaml` and consulting the documentation for that file is recommended in addition to this section. Any configurations or settings performed outside that file will be clearly noted. @@ -33,7 +33,7 @@ clearly noted. Defining Formats ================ -Logging formats in |TS| are defined by editing :file:`logging.config` +Logging formats in |TS| are defined by editing :file:`logging.yaml` and adding new format entries for each format you wish to define. The syntax is fairly simple: every format must contain a ``Format`` attribute, which is the string defining the contents of each line in the log, and may also contain an @@ -70,7 +70,7 @@ just adding the desired characters to the format string: You may define as many custom formats as you wish. To apply changes to custom formats, you will need to run the command :option:`traffic_ctl config reload` -after saving your changes to :file:`logging.config`. +after saving your changes to :file:`logging.yaml`. .. _admin-logging-fields: diff --git a/doc/admin-guide/logging/rotation.en.rst b/doc/admin-guide/logging/rotation.en.rst index 6d8e64c..94f25e6 100644 --- a/doc/admin-guide/logging/rotation.en.rst +++ b/doc/admin-guide/logging/rotation.en.rst @@ -171,7 +171,7 @@ they reach a certain size, adjust the following settings in changes. You can fine-tune log file rolling settings for individual log files in the -``log.*`` specification in :file:`logging.config`. The custom log file uses the +``log.*`` specification in :file:`logging.yaml`. The custom log file uses the rolling settings provided in the relevant ``log`` function call, which override the default settings you specify in Traffic Manager or :file:`records.config` described above. diff --git a/doc/admin-guide/logging/understanding.en.rst b/doc/admin-guide/logging/understanding.en.rst index 0c9fcb9..56432fa 100644 --- a/doc/admin-guide/logging/understanding.en.rst +++ b/doc/admin-guide/logging/understanding.en.rst @@ -108,7 +108,7 @@ each transaction |TS| processes and form the true bulk of logging output in |TS| installations. Most of the remaining documentation in this chapter applies to creating, formatting, rotating, and filtering event logs. -Individual event log outputs are configured in :file:`logging.config` and as +Individual event log outputs are configured in :file:`logging.yaml` and as such, the documentation provided in that configuration file's section should be consulted in concert with the sections of this chapter. @@ -143,7 +143,7 @@ Function Description May only be used on numeric fields. =========== =================================================================== -Summary logs are defined in :file:`logging.config` just like regular event +Summary logs are defined in :file:`logging.yaml` just like regular event logs, with the only two differences being the exclusive use of the aforementioned aggregate functions and the specification of an interval, as so: diff --git a/doc/admin-guide/plugins/header_rewrite.en.rst b/doc/admin-guide/plugins/header_rewrite.en.rst index 7f3d7d6..50fbf1d 100644 --- a/doc/admin-guide/plugins/header_rewrite.en.rst +++ b/doc/admin-guide/plugins/header_rewrite.en.rst @@ -1244,4 +1244,4 @@ could each be tagged with a consistent name to make finding logs easier.:: cond %{REMAP_PSEUDO_HOOK} set-header @PropertyName "someproperty" -(Then in :file:`logging.config`, log ``%<{@PropertyName}cqh>``) +(Then in :file:`logging.yaml`, log ``%<{@PropertyName}cqh>``) diff --git a/doc/manpages.py b/doc/manpages.py index 3feb55e..8a48500 100644 --- a/doc/manpages.py +++ b/doc/manpages.py @@ -37,7 +37,7 @@ man_pages = [ ('admin-guide/files/cache.config.en', 'cache.config', u'Traffic Server cache configuration file', None, '5'), ('admin-guide/files/hosting.config.en', 'hosting.config', u'Traffic Server domain hosting configuration file', None, '5'), ('admin-guide/files/ip_allow.config.en', 'ip_allow.config', u'Traffic Server IP access control configuration file', None, '5'), - ('admin-guide/files/logging.config.en', 'logging.config', u'Traffic Server logging configuration file', None, '5'), + ('admin-guide/files/logging.yaml.en', 'logging.yaml', u'Traffic Server logging configuration file', None, '5'), ('admin-guide/files/parent.config.en', 'parent.config', u'Traffic Server parent cache configuration file', None, '5'), ('admin-guide/files/plugin.config.en', 'plugin.config', u'Traffic Server global plugin configuration file', None, '5'), ('admin-guide/files/records.config.en', 'records.config', u'Traffic Server configuration file', None, '5'), diff --git a/iocore/net/SSLSNIConfig.cc b/iocore/net/SSLSNIConfig.cc index f140612..a735444 100644 --- a/iocore/net/SSLSNIConfig.cc +++ b/iocore/net/SSLSNIConfig.cc @@ -144,19 +144,19 @@ SNIConfigParams::Initialize() struct stat sbuf; if (stat(sni_filename, &sbuf) == -1 && errno == ENOENT) { - Note("failed to reload ssl_server_name.config"); + Note("failed to reload ssl_server_name.yaml"); Warning("Loading SNI configuration - filename: %s doesn't exist", sni_filename); return 1; } ts::Errata zret = Y_sni.loader(sni_filename); if (!zret.isOK()) { - Note("failed to reload ssl_server_name.config"); + Note("failed to reload ssl_server_name.yaml"); return 1; } loadSNIConfig(); - Note("ssl_server_name.config done reloading!"); + Note("ssl_server_name.yaml done reloading!"); return 0; } diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc index 53dc726..13b3c1b 100644 --- a/mgmt/RecordsConfig.cc +++ b/mgmt/RecordsConfig.cc @@ -1005,7 +1005,7 @@ static const RecordElement RecordsConfig[] = , {RECT_CONFIG, "proxy.config.log.logfile_perm", RECD_STRING, "rw-r--r--", RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL} , - {RECT_CONFIG, "proxy.config.log.config.filename", RECD_STRING, "logging.config", RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL} + {RECT_CONFIG, "proxy.config.log.config.filename", RECD_STRING, "logging.yaml", RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL} , {RECT_CONFIG, "proxy.config.log.collation_host", RECD_STRING, nullptr, RECU_DYNAMIC, RR_NULL, RECC_STR, "^[^[:space:]]*$", RECA_NULL} , @@ -1107,7 +1107,7 @@ static const RecordElement RecordsConfig[] = , {RECT_CONFIG, "proxy.config.ssl.server.multicert.exit_on_load_fail", RECD_INT, "1", RECU_RESTART_TS, RR_NULL, RECC_NULL, "[0-1]", RECA_NULL} , - {RECT_CONFIG, "proxy.config.ssl.servername.filename", RECD_STRING, "ssl_server_name.config", RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL} + {RECT_CONFIG, "proxy.config.ssl.servername.filename", RECD_STRING, "ssl_server_name.yaml", RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL} , {RECT_CONFIG, "proxy.config.ssl.server.ticket_key.filename", RECD_STRING, nullptr, RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL} , diff --git a/mgmt/utils/MgmtUtils.h b/mgmt/utils/MgmtUtils.h index 74fd57a..c2512e6 100644 --- a/mgmt/utils/MgmtUtils.h +++ b/mgmt/utils/MgmtUtils.h @@ -39,7 +39,7 @@ #include "P_RecCore.h" -constexpr const char SSL_SERVER_NAME_CONFIG[] = "ssl_server_name.config"; +constexpr const char SSL_SERVER_NAME_CONFIG[] = "ssl_server_name.yaml"; int mgmt_readline(int fd, char *buf, int maxlen); int mgmt_writeline(int fd, const char *data, int nbytes); diff --git a/proxy/logging/LogConfig.cc b/proxy/logging/LogConfig.cc index b849b5e..15c960e 100644 --- a/proxy/logging/LogConfig.cc +++ b/proxy/logging/LogConfig.cc @@ -497,7 +497,7 @@ LogConfig::setup_log_objects() filter_list.clear(); - // Evaluate logging.config to construct the custom log objects. + // Evaluate logging.yaml to construct the custom log objects. evaluate_config(); // Open local pipes so readers can see them. @@ -924,21 +924,21 @@ LogConfig::update_space_used() bool LogConfig::evaluate_config() { - ats_scoped_str path(RecConfigReadConfigPath("proxy.config.log.config.filename", "logging.config")); + ats_scoped_str path(RecConfigReadConfigPath("proxy.config.log.config.filename", "logging.yaml")); struct stat sbuf; if (stat(path.get(), &sbuf) == -1 && errno == ENOENT) { Warning("logging configuration '%s' doesn't exist", path.get()); return false; } - Note("loading logging.config"); + Note("loading logging.yaml"); YamlLogConfig y(this); bool zret = y.parse(path.get()); if (zret) { - Note("logging.config done reloading!"); + Note("logging.yaml done reloading!"); } else { - Note("failed to reload logging.config"); + Note("failed to reload logging.yaml"); } return zret; diff --git a/proxy/logging/YamlLogConfig.cc b/proxy/logging/YamlLogConfig.cc index 83cc384..e6b9e8c 100644 --- a/proxy/logging/YamlLogConfig.cc +++ b/proxy/logging/YamlLogConfig.cc @@ -50,12 +50,12 @@ YamlLogConfig::loadLogConfig(const char *cfgFilename) YAML::Node config = YAML::LoadFile(cfgFilename); if (config.IsNull()) { - Warning("logging.config is empty"); + Warning("logging.yaml is empty"); return false; } if (!config.IsMap()) { - Error("malformed logging.config file; expected a map"); + Error("malformed logging.yaml file; expected a map"); return false; } diff --git a/src/traffic_manager/AddConfigFilesHere.cc b/src/traffic_manager/AddConfigFilesHere.cc index cd55894..f112637 100644 --- a/src/traffic_manager/AddConfigFilesHere.cc +++ b/src/traffic_manager/AddConfigFilesHere.cc @@ -61,7 +61,7 @@ initializeRegistry() ink_assert(!"Configuration Object Registry Initialized More than Once"); } - configFiles->addFile("logging.config", false); + configFiles->addFile("logging.yaml", false); configFiles->addFile("storage.config", false); configFiles->addFile("socks.config", false); configFiles->addFile("records.config", false); diff --git a/src/traffic_manager/traffic_manager.cc b/src/traffic_manager/traffic_manager.cc index 2c4a551..e25a0b9 100644 --- a/src/traffic_manager/traffic_manager.cc +++ b/src/traffic_manager/traffic_manager.cc @@ -987,7 +987,7 @@ fileUpdated(char *fname, bool incVersion) } else if (strcmp(fname, "hosting.config") == 0) { lmgmt->signalFileChange("proxy.config.cache.hosting_filename"); - } else if (strcmp(fname, "logging.config") == 0) { + } else if (strcmp(fname, "logging.yaml") == 0) { lmgmt->signalFileChange("proxy.config.log.config.filename"); } else if (strcmp(fname, "splitdns.config") == 0) { diff --git a/tests/README.md b/tests/README.md index f77e58d..619c0c0 100644 --- a/tests/README.md +++ b/tests/README.md @@ -85,7 +85,7 @@ A number of file object are define to help with adding values to a given configu * congestion.config * hosting.config * ip_allow.config - * logging.config + * logging.yaml * parent.config * plugin.config * remap.config diff --git a/tests/gold_tests/autest-site/trafficserver.test.ext b/tests/gold_tests/autest-site/trafficserver.test.ext index e5baabe..1682b9f 100755 --- a/tests/gold_tests/autest-site/trafficserver.test.ext +++ b/tests/gold_tests/autest-site/trafficserver.test.ext @@ -202,7 +202,7 @@ def MakeATSProcess(obj, name, command='traffic_server', select_ports=True): p.Disk.File(tmpname, id=make_id(fname), typename="ats:config") # magic file that should probally not exist - fname = "logging.config" + fname = "logging.yaml" tmpname = os.path.join(config_dir, fname) p.Disk.File(tmpname, id=make_id(fname), typename="ats:config") @@ -230,7 +230,7 @@ def MakeATSProcess(obj, name, command='traffic_server', select_ports=True): tmpname = os.path.join(config_dir, fname) p.Disk.File(tmpname, id=make_id(fname), typename="ats:config") - fname = "ssl_server_name.config" + fname = "ssl_server_name.yaml" tmpname = os.path.join(config_dir, fname) p.Disk.File(tmpname, id=make_id(fname), typename="ats:config") diff --git a/tests/gold_tests/h2/httpbin.test.py b/tests/gold_tests/h2/httpbin.test.py index 9738739..170891b 100644 --- a/tests/gold_tests/h2/httpbin.test.py +++ b/tests/gold_tests/h2/httpbin.test.py @@ -65,7 +65,7 @@ ts.Disk.records_config.update({ 'proxy.config.diags.debug.tags': 'http2', }) -ts.Disk.logging_config.AddLines( +ts.Disk.logging_yaml.AddLines( ''' formats: # Extended Log Format. diff --git a/tests/gold_tests/logging/ccid_ctid.test.py b/tests/gold_tests/logging/ccid_ctid.test.py index 762529c..ef3f031 100644 --- a/tests/gold_tests/logging/ccid_ctid.test.py +++ b/tests/gold_tests/logging/ccid_ctid.test.py @@ -58,7 +58,7 @@ ts.Disk.ssl_multicert_config.AddLine( 'dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key' ) -ts.Disk.logging_config.AddLines( +ts.Disk.logging_yaml.AddLines( ''' formats: - name: custom diff --git a/tests/gold_tests/logging/custom-log.test.py b/tests/gold_tests/logging/custom-log.test.py index e297348..c67eaab 100644 --- a/tests/gold_tests/logging/custom-log.test.py +++ b/tests/gold_tests/logging/custom-log.test.py @@ -36,7 +36,7 @@ ts.Disk.remap_config.AddLine( 'map / http://www.linkedin.com/ @action=deny' ) -ts.Disk.logging_config.AddLines( +ts.Disk.logging_yaml.AddLines( ''' formats: - name: custom diff --git a/tests/gold_tests/logging/log-field.test.py b/tests/gold_tests/logging/log-field.test.py index 81359f0..11e9c7a 100644 --- a/tests/gold_tests/logging/log-field.test.py +++ b/tests/gold_tests/logging/log-field.test.py @@ -55,7 +55,7 @@ ts.Disk.remap_config.AddLine( 'map / http://localhost:{}/'.format(server.Variables.Port) ) -ts.Disk.logging_config.AddLines( +ts.Disk.logging_yaml.AddLines( ''' formats: - name: custom
