diff --git a/contrib/set_trafficserver.sh b/contrib/set_trafficserver.sh index d6486d11e12..b21fa077f5f 100644 --- a/contrib/set_trafficserver.sh +++ b/contrib/set_trafficserver.sh @@ -46,7 +46,7 @@ function recordsConfig() { traffic_ctl config set proxy.config.exec_thread.autoconfig.scale 1.000000 traffic_ctl config set proxy.config.accept_threads 1 - traffic_ctl config set proxy.config.log.logging_enabled 0 + traffic_ctl config set proxy.config.log.logging.mode 0 traffic_ctl config set proxy.config.http.server_port 8080 traffic_ctl config set proxy.config.url_remap.pristine_host_hdr 1 diff --git a/doc/admin-guide/files/logging.yaml.en.rst b/doc/admin-guide/files/logging.yaml.en.rst index 6bc7d222d36..7c5c0aaf2e7 100644 --- a/doc/admin-guide/files/logging.yaml.en.rst +++ b/doc/admin-guide/files/logging.yaml.en.rst @@ -289,7 +289,11 @@ filename string The name of the logfile relative to the defau 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 +rolling_mode *see below* Determines the type of log rolling to use (or + whether to disable rolling). Overrides + :ts:cv:`proxy.config.log.rolling.mode`. +rolling_enabled *see below* **Deprecated in 10.1.0**. Use ``rolling_mode`` + instead. 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. @@ -310,12 +314,17 @@ filters array of The optional list of filter objects which ====================== =========== ================================================= Enabling log rolling may be done globally in :file:`records.yaml`, or on a -per-log basis by passing appropriate values for the ``rolling_enabled`` key. The +per-log basis by passing appropriate values for the ``rolling_mode`` 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, +:ts:cv:`proxy.config.log.rolling.mode`. For convenience and readability, the following predefined variables may also be used in :file:`logging.yaml`: +.. deprecated:: 10.1.0 + + The ``rolling_enabled`` parameter is deprecated. Use ``rolling_mode`` instead. + ``rolling_enabled`` will continue to work for backwards compatibility. + log.roll.none Disable log rolling. @@ -389,3 +398,18 @@ matched the REFRESH_HIT filter we created. format: summaryfmt filters: - refreshhitfilter + +The following is an example of a log specification that creates a rolling log +that rolls every hour when the size reaches 100MB. This shows the new ``rolling_mode`` +parameter (recommended) which replaces the deprecated ``rolling_enabled`` parameter. +Mode 4 combines both time and size rolling triggers. + +.. code:: yaml + + logs: + - mode: ascii + filename: combined_rolling + format: minimalfmt + rolling_mode: 4 # Roll on time when size reached + rolling_interval_sec: 3600 # Check every hour + rolling_size_mb: 100 # Roll when 100MB is reached diff --git a/doc/admin-guide/files/records.yaml.en.rst b/doc/admin-guide/files/records.yaml.en.rst index 0f54c848779..9ae37580bc0 100644 --- a/doc/admin-guide/files/records.yaml.en.rst +++ b/doc/admin-guide/files/records.yaml.en.rst @@ -320,6 +320,29 @@ System Variables .. ts:cv:: CONFIG proxy.config.output.logfile.rolling_enabled INT 0 :reloadable: + :deprecated: + + .. deprecated:: 10.1.0 + + This configuration is deprecated. Use :ts:cv:`proxy.config.output.logfile.rolling.mode` instead. + + Specifies how the output log is rolled. You can specify the following values: + + ===== ====================================================================== + Value Description + ===== ====================================================================== + ``0`` Disables output log rolling. + ``1`` Enables output log rolling at specific intervals (specified with the + :ts:cv:`proxy.config.output.logfile.rolling_interval_sec` variable). + The clock starts ticking on |TS| boot. + ``2`` Enables output log rolling when the output log reaches a specific size + (specified with :ts:cv:`proxy.config.output.logfile.rolling_size_mb`). + ``3`` Enables output log rolling at specific intervals or when the output log + reaches a specific size (whichever occurs first). + ===== ====================================================================== + +.. ts:cv:: CONFIG proxy.config.output.logfile.rolling.mode INT 0 + :reloadable: Specifies how the output log is rolled. You can specify the following values: @@ -443,6 +466,35 @@ Thread Variables that :program:`traffic_server` crashes. ``-1`` means there is no limit. A value of ``0`` prevents core dump creation. +.. ts:cv:: CONFIG proxy.config.mlock_enabled INT 0 + :deprecated: + + .. deprecated:: 10.1.0 + + This configuration is deprecated. Use :ts:cv:`proxy.config.mlock.mode` instead. + + Controls memory locking behavior for Traffic Server: + + ===== ====================================================================== + Value Description + ===== ====================================================================== + ``0`` Disabled - no memory locking. + ``1`` Enabled for important pages (e.g. cache directory). + ``2`` Enabled for all pages. + ===== ====================================================================== + +.. ts:cv:: CONFIG proxy.config.mlock.mode INT 0 + + Controls memory locking behavior for Traffic Server: + + ===== ====================================================================== + Value Description + ===== ====================================================================== + ``0`` No memory locking. + ``1`` Memory locking enabled for important pages (e.g. cache directory). + ``2`` Memory locking enabled for all pages. + ===== ====================================================================== + .. ts:cv:: CONFIG proxy.config.restart.stop_listening INT 0 :reloadable: @@ -967,6 +1019,11 @@ allow-plain .. ts:cv:: CONFIG proxy.config.http.response_server_enabled INT 1 :reloadable: :overridable: + :deprecated: + + .. deprecated:: 10.1.0 + + This configuration is deprecated. Use :ts:cv:`proxy.config.http.response_server.mode` instead. You can specify one of the following: @@ -980,6 +1037,22 @@ allow-plain not have one already. ===== ====================================================================== +.. ts:cv:: CONFIG proxy.config.http.response_server.mode INT 1 + :reloadable: + :overridable: + + Specifies how the ``Server`` header is handled in responses: + + ===== ====================================================================== + Value Description + ===== ====================================================================== + ``0`` No ``Server`` header is added to the response. + ``1`` The ``Server`` header is added according to + :ts:cv:`proxy.config.http.response_server_str`. + ``2`` The ``Server`` header is added only if the response from origin does + not have one already. + ===== ====================================================================== + .. ts:cv:: CONFIG proxy.config.http.response_server_str STRING ATS/${PACKAGE_VERSION} :reloadable: :overridable: @@ -3175,6 +3248,11 @@ Logging Configuration .. ts:cv:: CONFIG proxy.config.log.logging_enabled INT 3 :reloadable: + :deprecated: + + .. deprecated:: 10.1.0 + + This configuration is deprecated. Use :ts:cv:`proxy.config.log.logging.mode` instead. Enables and disables event logging: @@ -3189,6 +3267,22 @@ Logging Configuration Refer to :ref:`admin-logging` for more information on event logging. +.. ts:cv:: CONFIG proxy.config.log.logging.mode INT 3 + :reloadable: + + Enables and disables event logging: + + ===== =================================================================== + Value Effect + ===== =================================================================== + ``0`` Logging disabled. + ``1`` Log errors only. + ``2`` Log transactions only. + ``3`` Dual logging (errors and transactions). + ===== =================================================================== + + Refer to :ref:`admin-logging` for more information on event logging. + .. ts:cv:: CONFIG proxy.config.log.log_fast_buffer INT 0 :reloadable: @@ -3264,6 +3358,32 @@ Logging Configuration .. ts:cv:: CONFIG proxy.config.log.rolling_enabled INT 1 :reloadable: + :deprecated: + + .. deprecated:: 10.1.0 + + This configuration is deprecated. Use :ts:cv:`proxy.config.log.rolling.mode` instead. + + Specifies how log files are rolled. You can specify the following values: + + ===== ====================================================================== + Value Description + ===== ====================================================================== + ``0`` Disables log file rolling. + ``1`` Enables log file rolling at specific intervals during the day + (specified with the :ts:cv:`proxy.config.log.rolling_interval_sec` and + :ts:cv:`proxy.config.log.rolling_offset_hr` variables). + ``2`` Enables log file rolling when log files reach a specific size + (specified with :ts:cv:`proxy.config.log.rolling_size_mb`). + ``3`` Enables log file rolling at specific intervals during the day or when + log files reach a specific size (whichever occurs first). + ``4`` Enables log file rolling at specific intervals during the day when log + files reach a specific size (i.e. at a specified time if the file is + of the specified size). + ===== ====================================================================== + +.. ts:cv:: CONFIG proxy.config.log.rolling.mode INT 1 + :reloadable: Specifies how log files are rolled. You can specify the following values: @@ -3497,6 +3617,11 @@ Diagnostic Logging Configuration .. ts:cv:: CONFIG proxy.config.diags.debug.enabled INT 0 :reloadable: + :deprecated: + + .. deprecated:: 10.1.0 + + This configuration is deprecated. Use :ts:cv:`proxy.config.diags.debug.mode` instead. When set to 1, enables logging for diagnostic messages whose log level is `diag` or `debug`. @@ -3504,9 +3629,25 @@ Diagnostic Logging Configuration See the :ref:`Enable debug using traffic_ctl` for a convenient way to handle this. +.. ts:cv:: CONFIG proxy.config.diags.debug.mode INT 0 + :reloadable: + + Controls diagnostic debug message logging: + + ===== ====================================================================== + Value Description + ===== ====================================================================== + ``0`` Disables debug message logging. + ``1`` Enables logging for diagnostic messages whose log level is `diag` or `debug`. + ``2`` Interprets the :ts:cv:`proxy.config.diags.debug.client_ip` setting to + determine whether diagnostic messages are logged. + ===== ====================================================================== + + See the :ref:`Enable debug using traffic_ctl` for a convenient way to handle this. + .. ts:cv:: CONFIG proxy.config.diags.debug.client_ip STRING NULL - if :ts:cv:`proxy.config.diags.debug.enabled` is set to 2, this value is tested against the source IP of the incoming connection. If there is a match, all the diagnostic messages for that connection and the related outgoing connection will be logged. + if :ts:cv:`proxy.config.diags.debug.mode` is set to 2, this value is tested against the source IP of the incoming connection. If there is a match, all the diagnostic messages for that connection and the related outgoing connection will be logged. .. ts:cv:: CONFIG proxy.config.diags.debug.tags STRING http|dns @@ -3578,6 +3719,30 @@ Diagnostic Logging Configuration .. ts:cv:: CONFIG proxy.config.diags.logfile.rolling_enabled INT 0 :reloadable: + :deprecated: + + .. deprecated:: 10.1.0 + + This configuration is deprecated. Use :ts:cv:`proxy.config.diags.logfile.rolling.mode` instead. + + Specifies how the diagnostics log is rolled. You can specify the following values: + + ===== ====================================================================== + Value Description + ===== ====================================================================== + ``0`` Disables diagnostics log rolling. + ``1`` Enables diagnostics log rolling at specific intervals (specified with + :ts:cv:`proxy.config.diags.logfile.rolling_interval_sec`). The "clock" + starts ticking on |TS| startup. + ``2`` Enables diagnostics log rolling when the diagnostics log reaches a + specific size (specified with + :ts:cv:`proxy.config.diags.logfile.rolling_size_mb`). + ``3`` Enables diagnostics log rolling at specific intervals or when the + diagnostics log reaches a specific size (whichever occurs first). + ===== ====================================================================== + +.. ts:cv:: CONFIG proxy.config.diags.logfile.rolling.mode INT 0 + :reloadable: Specifies how the diagnostics log is rolled. You can specify the following values: @@ -3959,6 +4124,11 @@ SSL Termination SSL session cache for the origin server. .. ts:cv:: CONFIG proxy.config.ssl.session_cache.enabled INT 2 + :deprecated: + + .. deprecated:: 10.1.0 + + This configuration is deprecated. Use :ts:cv:`proxy.config.ssl.session_cache.mode` instead. Enables the SSL session cache: @@ -3972,13 +4142,27 @@ SSL Termination implementation. ===== ====================================================================== +.. ts:cv:: CONFIG proxy.config.ssl.session_cache.mode INT 2 + + Specifies how the SSL session cache is configured: + + ===== ====================================================================== + Value Description + ===== ====================================================================== + ``0`` Disables the session cache entirely. + ``1`` Enables the session cache using OpenSSL's implementation. + ``2`` Default. Enables the session cache using |TS|'s implementation. This + implementation should perform much better than the OpenSSL + implementation. + ===== ====================================================================== + .. ts:cv:: CONFIG proxy.config.ssl.session_cache.timeout INT 0 This configuration specifies the lifetime of SSL session cache entries in seconds. If it is ``0``, then the SSL library will use a default value, typically 300 seconds. Note: This option has no affect when using the |TS| session cache (option ``2`` in - ``proxy.config.ssl.session_cache.enabled``) + ``proxy.config.ssl.session_cache.mode``) See :ref:`admin-performance-timeouts` for more discussion on |TS| timeouts. @@ -4020,9 +4204,9 @@ SSL Termination Take into account that setting the value to 0 will disable session caching for TLSv1.3 connections. - Lowering this setting to ``1`` can be interesting when ``proxy.config.ssl.session_cache.enabled`` is enabled because + Lowering this setting to ``1`` can be interesting when ``proxy.config.ssl.session_cache.mode`` is enabled because otherwise for every new TLSv1.3 connection two session IDs will be inserted in the session cache. - On the other hand, if ``proxy.config.ssl.session_cache.enabled`` is disabled, using the default value is recommended. + On the other hand, if ``proxy.config.ssl.session_cache.mode`` is disabled, using the default value is recommended. In those scenarios, increasing the number of tickets could be potentially beneficial for clients performing multiple requests over concurrent TLS connections as per RFC 8446 clients SHOULDN'T reuse TLS Tickets. diff --git a/doc/admin-guide/logging/rotation.en.rst b/doc/admin-guide/logging/rotation.en.rst index 81f2cfd6e3a..c1501d016d2 100644 --- a/doc/admin-guide/logging/rotation.en.rst +++ b/doc/admin-guide/logging/rotation.en.rst @@ -148,9 +148,9 @@ To set log file rolling options and/or configure |TS| to roll log files when they reach a certain size, adjust the following settings in :file:`records.yaml`: -#. Enable log rolling with :ts:cv:`proxy.config.log.rolling_enabled`. :: +#. Enable log rolling with :ts:cv:`proxy.config.log.rolling.mode`. :: - CONFIG proxy.config.log.rolling_enabled INT 1 + CONFIG proxy.config.log.rolling.mode INT 1 #. Configure the upper limit on log file size with :ts:cv:`proxy.config.log.rolling_size_mb`. :: diff --git a/doc/admin-guide/logging/understanding.en.rst b/doc/admin-guide/logging/understanding.en.rst index 36b6bef5ef3..035ddf2fb59 100644 --- a/doc/admin-guide/logging/understanding.en.rst +++ b/doc/admin-guide/logging/understanding.en.rst @@ -40,7 +40,7 @@ Enabling Logs By default, |TS| creates both error and event log files and records system information in system log files. You can disable event logging and/or error logging by setting the configuration variable -:ts:cv:`proxy.config.log.logging_enabled` in :file:`records.yaml` +:ts:cv:`proxy.config.log.logging.mode` in :file:`records.yaml` to one of the following values: ===== ========================================================================= diff --git a/doc/admin-guide/performance/index.en.rst b/doc/admin-guide/performance/index.en.rst index 689ef41ea46..461c6a9d844 100644 --- a/doc/admin-guide/performance/index.en.rst +++ b/doc/admin-guide/performance/index.en.rst @@ -528,7 +528,7 @@ SSL-Specific Options ~~~~~~~~~~~~~~~~~~~~ :ts:cv:`proxy.config.ssl.max_record_size` -:ts:cv:`proxy.config.ssl.session_cache.enabled` +:ts:cv:`proxy.config.ssl.session_cache.mode` :ts:cv:`proxy.config.ssl.session_cache.size` Thread Types diff --git a/doc/admin-guide/plugins/tcpinfo.en.rst b/doc/admin-guide/plugins/tcpinfo.en.rst index 79a9efba38c..b7bb76137ed 100644 --- a/doc/admin-guide/plugins/tcpinfo.en.rst +++ b/doc/admin-guide/plugins/tcpinfo.en.rst @@ -121,7 +121,7 @@ The following options may be specified in :file:`plugin.config`: This logfile option allows you to set logfile rolling behaviour of the output log file without making any changes to the global logging configurations. This option overrides the - :ts:cv:`proxy.config.output.logfile.rolling_enabled` setting in :file:`records.yaml` + :ts:cv:`proxy.config.output.logfile.rolling.mode` setting in :file:`records.yaml` for the ``tcpinfo`` plugin. The setting may range from ``0`` to ``3``. ``0`` disables logfile rolling. ``1`` is the ``default`` and enables logfile rolling at specific intervals set by ``--rolling-interval-sec`` discussed diff --git a/doc/admin-guide/plugins/url_sig.en.rst b/doc/admin-guide/plugins/url_sig.en.rst index 5faa2930256..6ab3513cc4c 100644 --- a/doc/admin-guide/plugins/url_sig.en.rst +++ b/doc/admin-guide/plugins/url_sig.en.rst @@ -283,7 +283,7 @@ Edge Cache Debugging ==================== To include debugging output for this plugin in your |TS| logs, adjust the values -for :ts:cv:`proxy.config.diags.debug.enabled` and +for :ts:cv:`proxy.config.diags.debug.mode` and :ts:cv:`proxy.config.diags.debug.tags` in your :file:`records.yaml` as so: .. code-block:: yaml diff --git a/doc/admin-guide/plugins/xdebug.en.rst b/doc/admin-guide/plugins/xdebug.en.rst index 987477cbb8c..f120c8fac74 100644 --- a/doc/admin-guide/plugins/xdebug.en.rst +++ b/doc/admin-guide/plugins/xdebug.en.rst @@ -70,7 +70,7 @@ Via Diags If the ``Diags`` header is requested, the `XDebug` plugin enables the transaction specific diagnostics for the transaction. This also requires - that :ts:cv:`proxy.config.diags.debug.enabled` is set to ``1``. + that :ts:cv:`proxy.config.diags.debug.mode` is set to ``1``. Probe All request and response headers are written to the response body. Because diff --git a/doc/admin-guide/tools/converting-records-to-yaml.en.rst b/doc/admin-guide/tools/converting-records-to-yaml.en.rst index c6ef4d40804..c5397ca1d23 100644 --- a/doc/admin-guide/tools/converting-records-to-yaml.en.rst +++ b/doc/admin-guide/tools/converting-records-to-yaml.en.rst @@ -53,7 +53,7 @@ a new YAML map from each name, so for instance, with the following records: CONFIG proxy.config.task_threads INT 2 CONFIG proxy.config.cache.threads_per_disk INT 8 CONFIG proxy.config.exec_thread.affinity INT 1 - CONFIG proxy.config.diags.debug.enabled INT 0 + CONFIG proxy.config.diags.debug.mode INT 0 CONFIG proxy.config.diags.debug.tags STRING http|dns @@ -69,7 +69,7 @@ the following: threads_per_disk: 8 diags: debug: - enabled: 0 + mode: 0 tags: http|dns exec_thread: affinity: 1 diff --git a/doc/appendices/command-line/traffic_ctl.en.rst b/doc/appendices/command-line/traffic_ctl.en.rst index c6009a49647..3555aac8cf5 100644 --- a/doc/appendices/command-line/traffic_ctl.en.rst +++ b/doc/appendices/command-line/traffic_ctl.en.rst @@ -252,7 +252,7 @@ Display the current value of a configuration record. .. code-block:: bash - $ traffic_ctl config set proxy.config.diags.debug.enabled 1 -c records.yaml + $ traffic_ctl config set proxy.config.diags.debug.mode 1 -c records.yaml $ cat records.yaml records: ... @@ -413,17 +413,17 @@ traffic_ctl server Enables diagnostic messages at runtime. This is equivalent to manually setting the below records but this is done in one go. - Note that if you just set this to enable, the :ts:cv:`proxy.config.diags.debug.enabled` + Note that if you just set this to enable, the :ts:cv:`proxy.config.diags.debug.mode` will be set to ``1`` unless you specify the ``--client_ip,-c`` option. - :ts:cv:`proxy.config.diags.debug.enabled` + :ts:cv:`proxy.config.diags.debug.mode` :ts:cv:`proxy.config.diags.debug.tags` :ts:cv:`proxy.config.diags.debug.client_ip` - Enables logging for diagnostic messages. See :ts:cv:`proxy.config.diags.debug.enabled` for information. + Enables logging for diagnostic messages. See :ts:cv:`proxy.config.diags.debug.mode` for information. .. option:: --tags, -t tags @@ -439,7 +439,7 @@ traffic_ctl server .. program:: traffic_ctl server .. option:: debug disable - Disables logging for diagnostic messages. Equivalent to set :ts:cv:`proxy.config.diags.debug.enabled` to ``0``. + Disables logging for diagnostic messages. Equivalent to set :ts:cv:`proxy.config.diags.debug.mode` to ``0``. Example: diff --git a/doc/appendices/faq.en.rst b/doc/appendices/faq.en.rst index 2620fc9060a..20b769cae99 100644 --- a/doc/appendices/faq.en.rst +++ b/doc/appendices/faq.en.rst @@ -405,7 +405,7 @@ generated, verify the following: open or create log files. - Check that logging is enabled by checking the value of the - :ts:cv:`proxy.config.log.logging_enabled` variable in :file:`records.yaml`. + :ts:cv:`proxy.config.log.logging.mode` variable in :file:`records.yaml`. - Check that a log format is enabled. In :file:`records.yaml`, select the standard or custom format by editing variables in the Logging Config diff --git a/doc/developer-guide/api/functions/TSHttpOverridableConfig.en.rst b/doc/developer-guide/api/functions/TSHttpOverridableConfig.en.rst index 73865be169a..4ac68951ceb 100644 --- a/doc/developer-guide/api/functions/TSHttpOverridableConfig.en.rst +++ b/doc/developer-guide/api/functions/TSHttpOverridableConfig.en.rst @@ -159,6 +159,7 @@ TSOverridableConfigKey Value Config :enumerator:`TS_CONFIG_HTTP_REQUEST_BUFFER_ENABLED` :ts:cv:`proxy.config.http.request_buffer_enabled` :enumerator:`TS_CONFIG_HTTP_REQUEST_HEADER_MAX_SIZE` :ts:cv:`proxy.config.http.request_header_max_size` :enumerator:`TS_CONFIG_HTTP_RESPONSE_HEADER_MAX_SIZE` :ts:cv:`proxy.config.http.response_header_max_size` +:enumerator:`TS_CONFIG_HTTP_RESPONSE_SERVER_MODE` :ts:cv:`proxy.config.http.response_server.mode` :enumerator:`TS_CONFIG_HTTP_RESPONSE_SERVER_ENABLED` :ts:cv:`proxy.config.http.response_server_enabled` :enumerator:`TS_CONFIG_HTTP_RESPONSE_SERVER_STR` :ts:cv:`proxy.config.http.response_server_str` :enumerator:`TS_CONFIG_HTTP_SEND_HTTP11_REQUESTS` :ts:cv:`proxy.config.http.send_http11_requests` diff --git a/doc/developer-guide/api/functions/TSRecYAMLConfigParse.en.rst b/doc/developer-guide/api/functions/TSRecYAMLConfigParse.en.rst index afcc8b809e9..035ed29068b 100644 --- a/doc/developer-guide/api/functions/TSRecYAMLConfigParse.en.rst +++ b/doc/developer-guide/api/functions/TSRecYAMLConfigParse.en.rst @@ -62,7 +62,7 @@ Description .. var:: const char* record_name - A null-terminated string with the record name which was built when parsing the YAML file. Example: `proxy.config.diags.debug.enabled`. + A null-terminated string with the record name which was built when parsing the YAML file. Example: `proxy.config.diags.debug.mode`. Use this to validate or do any check base on a record name. .. var:: TSYaml value_node diff --git a/doc/developer-guide/api/functions/TSSslSession.en.rst b/doc/developer-guide/api/functions/TSSslSession.en.rst index 2e0ab9230bc..07a29d633e5 100644 --- a/doc/developer-guide/api/functions/TSSslSession.en.rst +++ b/doc/developer-guide/api/functions/TSSslSession.en.rst @@ -38,7 +38,7 @@ Description =========== These functions work with the internal ATS session cache. These functions are only useful if the ATS internal -session cache is enabled by setting :ts:cv:`proxy.config.ssl.session_cache.enabled` has been set to 2. +session cache is enabled by setting :ts:cv:`proxy.config.ssl.session_cache.mode` has been set to 2. These functions tend to be used with the :enumerator:`TS_SSL_SESSION_HOOK`. diff --git a/doc/developer-guide/api/functions/TSTextLogObjectCreate.en.rst b/doc/developer-guide/api/functions/TSTextLogObjectCreate.en.rst index ceacafe2edd..d0d716f0b57 100644 --- a/doc/developer-guide/api/functions/TSTextLogObjectCreate.en.rst +++ b/doc/developer-guide/api/functions/TSTextLogObjectCreate.en.rst @@ -37,6 +37,7 @@ Synopsis .. function:: TSReturnCode TSTextLogObjectDestroy(TSTextLogObject the_object) .. function:: void TSTextLogObjectHeaderSet(TSTextLogObject the_object, const char * header) .. function:: TSReturnCode TSTextLogObjectRollingEnabledSet(TSTextLogObject the_object, int rolling_enabled) +.. function:: TSReturnCode TSTextLogObjectRollingModeSet(TSTextLogObject the_object, int rolling_mode) .. function:: void TSTextLogObjectRollingIntervalSecSet(TSTextLogObject the_object, int rolling_interval_sec) .. function:: void TSTextLogObjectRollingOffsetHrSet(TSTextLogObject the_object, int rolling_offset_hr) .. function:: void TSTextLogObjectRollingSizeMbSet(TSTextLogObject the_object, int rolling_size_mb) @@ -44,18 +45,24 @@ Synopsis Description =========== -:func:`TSTextLogObjectRollingEnabledSet` sets the log rolling mode +:func:`TSTextLogObjectRollingModeSet` sets the log rolling mode for the given object. This API must be used once the object is -created and before writing into logs. The :arg:`rolling_enabled` -argument must be a valid :ts:cv:`proxy.config.log.rolling_enabled` -values. If :func:`TSTextLogObjectRollingEnabledSet` is never called, +created and before writing into logs. The :arg:`rolling_mode` +argument must be a valid :ts:cv:`proxy.config.log.rolling.mode` +value. If :func:`TSTextLogObjectRollingModeSet` is never called, the log object takes it's log rolling mode from the global -:ts:cv:`proxy.config.log.rolling_enabled` setting. +:ts:cv:`proxy.config.log.rolling.mode` setting. -It's also important to call :func:`TSTextLogObjectRollingEnabledSet` before -any of the other APIs that modifies the rolling object. This is due to the -fact that this API dictates which rolling mode should be used, and therefore -affects further modifications of the logging object. +.. deprecated:: 10.1.0 + :func:`TSTextLogObjectRollingModeSet` is the modern equivalent of + :func:`TSTextLogObjectRollingEnabledSet` and provides the same functionality + with a clearer name. :func:`TSTextLogObjectRollingEnabledSet` is deprecated + as of 10.1.0. + +It's important to call :func:`TSTextLogObjectRollingModeSet` before any of the +other APIs that modify the rolling object. This is due to the fact that these +APIs dictate which rolling mode should be used, and therefore affect further +modifications of the logging object. See Also ======== diff --git a/doc/developer-guide/api/types/TSOverridableConfigKey.en.rst b/doc/developer-guide/api/types/TSOverridableConfigKey.en.rst index 64c4b19571e..cdede613784 100644 --- a/doc/developer-guide/api/types/TSOverridableConfigKey.en.rst +++ b/doc/developer-guide/api/types/TSOverridableConfigKey.en.rst @@ -52,6 +52,7 @@ Enumeration Members .. enumerator:: TS_CONFIG_HTTP_ANONYMIZE_REMOVE_COOKIE .. enumerator:: TS_CONFIG_HTTP_ANONYMIZE_REMOVE_CLIENT_IP .. enumerator:: TS_CONFIG_HTTP_ANONYMIZE_INSERT_CLIENT_IP +.. enumerator:: TS_CONFIG_HTTP_RESPONSE_SERVER_MODE .. enumerator:: TS_CONFIG_HTTP_RESPONSE_SERVER_ENABLED .. enumerator:: TS_CONFIG_HTTP_INSERT_SQUID_X_FORWARDED_FOR .. enumerator:: TS_CONFIG_HTTP_SEND_HTTP11_REQUESTS diff --git a/doc/developer-guide/plugins/hooks-and-transactions/ssl-session-api.en.rst b/doc/developer-guide/plugins/hooks-and-transactions/ssl-session-api.en.rst index d6f050872d3..f85ed866080 100644 --- a/doc/developer-guide/plugins/hooks-and-transactions/ssl-session-api.en.rst +++ b/doc/developer-guide/plugins/hooks-and-transactions/ssl-session-api.en.rst @@ -31,7 +31,7 @@ to enable the plugin to update the session cache based on outside information, e This hook is invoked when a change has been made to the ATS session cache or a session has been accessed from ATS via OpenSSL. These hooks are only activated if the ATS implementation of the session cache is in -use. This means :ts:cv:`proxy.config.ssl.session_cache.enabled` has been set to 2. +use. This means :ts:cv:`proxy.config.ssl.session_cache.mode` has been set to 2. The hook callback has the following signature diff --git a/doc/developer-guide/plugins/plugin-management/logging-api.en.rst b/doc/developer-guide/plugins/plugin-management/logging-api.en.rst index 67fe8521211..56af7aa7d5b 100644 --- a/doc/developer-guide/plugins/plugin-management/logging-api.en.rst +++ b/doc/developer-guide/plugins/plugin-management/logging-api.en.rst @@ -37,9 +37,13 @@ The logging API enables you to: - Set the log header for your custom text log: see :func:`TSTextLogObjectHeaderSet` -- Enable or disable rolling your custom text log: see +- Enable or disable rolling your custom text log (deprecated in 10.1.0, + use :func:`TSTextLogObjectRollingModeSet` instead): see :func:`TSTextLogObjectRollingEnabledSet` +- Set the rolling mode for your custom text log: see + :func:`TSTextLogObjectRollingModeSet` + - Set the rolling interval (in seconds) for your custom text log: see :func:`TSTextLogObjectRollingIntervalSecSet` diff --git a/doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/logging/managing-logs.en.po b/doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/logging/managing-logs.en.po index 68e35e90a08..bd8569c3f5f 100644 --- a/doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/logging/managing-logs.en.po +++ b/doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/logging/managing-logs.en.po @@ -363,7 +363,7 @@ msgid "" msgstr "" #: ../../../admin-guide/monitoring/logging/managing-logs.en.rst:197 -msgid "Enable log rolling with :ts:cv:`proxy.config.log.rolling_enabled`. ::" +msgid "Enable log rolling with :ts:cv:`proxy.config.log.rolling.mode`. ::" msgstr "" #: ../../../admin-guide/monitoring/logging/managing-logs.en.rst:201 diff --git a/doc/locale/ja/LC_MESSAGES/admin-guide/plugins/url_sig.en.po b/doc/locale/ja/LC_MESSAGES/admin-guide/plugins/url_sig.en.po index 440e3f01e68..66904a6c0c9 100644 --- a/doc/locale/ja/LC_MESSAGES/admin-guide/plugins/url_sig.en.po +++ b/doc/locale/ja/LC_MESSAGES/admin-guide/plugins/url_sig.en.po @@ -362,7 +362,7 @@ msgstr "" #: ../../../admin-guide/plugins/url_sig.en.rst:246 msgid "" "To include debugging output for this plugin in your |TS| logs, adjust the " -"values for :ts:cv:`proxy.config.diags.debug.enabled` and :ts:cv:`proxy." +"values for :ts:cv:`proxy.config.diags.debug.mode` and :ts:cv:`proxy." "config.diags.debug.tags` in your :file:`records.yaml` as so::" msgstr "" diff --git a/doc/locale/ja/LC_MESSAGES/admin-guide/plugins/xdebug.en.po b/doc/locale/ja/LC_MESSAGES/admin-guide/plugins/xdebug.en.po index 24d231e24c1..f11826f2a18 100644 --- a/doc/locale/ja/LC_MESSAGES/admin-guide/plugins/xdebug.en.po +++ b/doc/locale/ja/LC_MESSAGES/admin-guide/plugins/xdebug.en.po @@ -98,7 +98,7 @@ msgstr "" msgid "" "If the ``Diags`` header is requested, the `XDebug` plugin enables the " "transaction specific diagnostics for the transaction. This also requires " -"that :ts:cv:`proxy.config.diags.debug.enabled` is set to ``1``." +"that :ts:cv:`proxy.config.diags.debug.mode` is set to ``1``." msgstr "" #: ../../../admin-guide/plugins/xdebug.en.rst:60 diff --git a/doc/locale/ja/LC_MESSAGES/appendices/faq.en.po b/doc/locale/ja/LC_MESSAGES/appendices/faq.en.po index 150a912cba2..37dc0d02620 100644 --- a/doc/locale/ja/LC_MESSAGES/appendices/faq.en.po +++ b/doc/locale/ja/LC_MESSAGES/appendices/faq.en.po @@ -1128,7 +1128,7 @@ msgid "" "config.log.logging_enabled` variable in :file:`records.yaml`." msgstr "" "ログ出力が有効になっているかどうかを :file:`records.yaml` の :ts:cv:" -"`proxy.config.log.logging_enabled` 変数の値を見て確認してください。" +"`proxy.config.log.logging.mode` 変数の値を見て確認してください。" #: ../../../appendices/faq.en.rst:533 msgid "" diff --git a/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSHttpOverridableConfig.en.po b/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSHttpOverridableConfig.en.po index 5b6054aeadc..563949a168b 100644 --- a/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSHttpOverridableConfig.en.po +++ b/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSHttpOverridableConfig.en.po @@ -161,7 +161,7 @@ msgid ":ts:cv:`proxy.config.http.insert_client_ip`" msgstr "" #: ../../../developer-guide/api/functions/TSHttpOverridableConfig.en.rst:84 -msgid ":ts:cv:`proxy.config.http.response_server_enabled`" +msgid ":ts:cv:`proxy.config.http.response_server.mode`" msgstr "" #: ../../../developer-guide/api/functions/TSHttpOverridableConfig.en.rst:85 diff --git a/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSTextLogObjectCreate.en.po b/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSTextLogObjectCreate.en.po index 549163b79bd..e86c47539ed 100644 --- a/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSTextLogObjectCreate.en.po +++ b/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSTextLogObjectCreate.en.po @@ -29,15 +29,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 2.1.1\n" -#: ../../developer-guide/api/functions/TSTextLogObjectCreate.en.rst:45 +#: ../../developer-guide/api/functions/TSTextLogObjectCreate.en.rst:48 msgid "" -":func:`TSTextLogObjectRollingEnabledSet` sets the log rolling mode for the " +":func:`TSTextLogObjectRollingModeSet` sets the log rolling mode for the " "given object. This API must be used once the object is created and before " -"writing into logs. The :arg:`rolling_enabled` argument must be a valid :ts:" -"cv:`proxy.config.log.rolling_enabled` values. If :func:" -"`TSTextLogObjectRollingEnabledSet` is never called, the log object takes " -"it's log rolling mode from the global :ts:cv:`proxy.config.log." -"rolling_enabled` setting." +"writing into logs. The :arg:`rolling_mode` argument must be a valid :ts:cv:" +"`proxy.config.log.rolling.mode` value. If :func:" +"`TSTextLogObjectRollingModeSet` is never called, the log object takes it's " +"log rolling mode from the global :ts:cv:`proxy.config.log.rolling.mode` " +"setting." msgstr "" #: ../../developer-guide/api/functions/TSTextLogObjectCreate.en.rst:28 @@ -60,18 +60,37 @@ msgstr ":manpage:`TSAPI(3ts)`" msgid "Description" msgstr "解説" -#: ../../developer-guide/api/functions/TSTextLogObjectCreate.en.rst:53 +#: ../../developer-guide/api/functions/TSTextLogObjectCreate.en.rst:56 msgid "" -"It's also important to call :func:`TSTextLogObjectRollingEnabledSet` before " -"any of the other APIs that modifies the rolling object. This is due to the " -"fact that this API dictates which rolling mode should be used, and " -"therefore affects further modifications of the logging object." +".. deprecated:: 10.1.0" msgstr "" -#: ../../developer-guide/api/functions/TSTextLogObjectCreate.en.rst:59 +#: ../../developer-guide/api/functions/TSTextLogObjectCreate.en.rst:57 +msgid "" +":func:`TSTextLogObjectRollingModeSet` is the modern equivalent of :func:" +"`TSTextLogObjectRollingEnabledSet` and provides the same functionality with " +"a clearer name. :func:`TSTextLogObjectRollingEnabledSet` is deprecated as " +"of 10.1.0." +msgstr "" + +#: ../../developer-guide/api/functions/TSTextLogObjectCreate.en.rst:62 +msgid "" +"It's important to call :func:`TSTextLogObjectRollingModeSet` before any of " +"the other APIs that modify the rolling object. This is due to the fact that " +"these APIs dictate which rolling mode should be used, and therefore affect " +"further modifications of the logging object." +msgstr "" + +#: ../../developer-guide/api/functions/TSTextLogObjectCreate.en.rst:67 msgid "See Also" msgstr "参照" #: ../../developer-guide/api/functions/TSTextLogObjectCreate.en.rst:30 msgid "`#include `" msgstr "`#include `" + +#: ../../developer-guide/api/functions/TSTextLogObjectCreate.en.rst:40 +msgid "" +".. function:: TSReturnCode TSTextLogObjectRollingModeSet(TSTextLogObject " +"the_object, int rolling_mode)" +msgstr "" diff --git a/doc/release-notes/upgrading.en.rst b/doc/release-notes/upgrading.en.rst index 7b6eaf06e83..90df999654d 100644 --- a/doc/release-notes/upgrading.en.rst +++ b/doc/release-notes/upgrading.en.rst @@ -172,7 +172,7 @@ The following :file:`records.yaml` changes have been made: - The records.yaml entry ``proxy.config.exec_thread.autoconfig`` has been renamed to :ts:cv:`proxy.config.exec_thread.autoconfig.enabled`. - The records.yaml entry ``proxy.config.tunnel.prewarm`` has been renamed to :ts:cv:`proxy.config.tunnel.prewarm.enabled`. - The records.yaml entry ``proxy.config.ssl.origin_session_cache`` has been renamed to :ts:cv:`proxy.config.ssl.origin_session_cache.enabled`. -- The records.yaml entry ``proxy.config.ssl.session_cache`` has been renamed to :ts:cv:`proxy.config.ssl.session_cache.enabled`. +- The records.yaml entry ``proxy.config.ssl.session_cache`` has been renamed to :ts:cv:`proxy.config.ssl.session_cache.mode`. - The records.yaml entry ``proxy.config.ssl.TLSv1_3`` has been renamed to :ts:cv:`proxy.config.ssl.TLSv1_3.enabled`. - The records.yaml entry ``proxy.config.ssl.client.TLSv1_3`` has been renamed to :ts:cv:`proxy.config.ssl.client.TLSv1_3.enabled`. - The records.yaml entry :ts:cv:`proxy.config.allocator.iobuf_chunk_sizes` has been added diff --git a/include/cripts/Configs.hpp b/include/cripts/Configs.hpp index 6826f64247f..b2cdc71d2de 100644 --- a/include/cripts/Configs.hpp +++ b/include/cripts/Configs.hpp @@ -264,6 +264,7 @@ class Proxy cripts::IntConfig request_header_max_size{"proxy.config.http.request_header_max_size"}; cripts::IntConfig response_header_max_size{"proxy.config.http.response_header_max_size"}; cripts::IntConfig response_server_enabled{"proxy.config.http.response_server_enabled"}; + cripts::IntConfig response_server_mode{"proxy.config.http.response_server.mode"}; cripts::StringConfig response_server_str{"proxy.config.http.response_server_str"}; cripts::IntConfig send_http11_requests{"proxy.config.http.send_http11_requests"}; diff --git a/include/proxy/http/HttpConfig.h b/include/proxy/http/HttpConfig.h index bfdef446c67..783dbc61d5f 100644 --- a/include/proxy/http/HttpConfig.h +++ b/include/proxy/http/HttpConfig.h @@ -509,7 +509,8 @@ struct OverridableHttpConfigParams { MgmtByte anonymize_remove_client_ip = 0; MgmtByte anonymize_insert_client_ip = 1; - MgmtByte proxy_response_server_enabled = 1; + MgmtByte proxy_response_server_mode = 1; + MgmtByte proxy_response_server_enabled = 1; // Deprecated. Use proxy_response_server_mode instead. MgmtByte proxy_response_hsts_include_subdomains = 0; ///////////////////// diff --git a/include/records/RecCore.h b/include/records/RecCore.h index e4c80c94f36..7f03554183c 100644 --- a/include/records/RecCore.h +++ b/include/records/RecCore.h @@ -247,6 +247,9 @@ RecErrT RecGetRecordDataType(const char *name, RecDataT *data_type, bool lock = RecErrT RecGetRecordPersistenceType(const char *name, RecPersistT *persist_type, bool lock = true); RecErrT RecGetRecordSource(const char *name, RecSourceT *source, bool lock = true); +/// Check if a configuration record is using its default value (vs being set by user, plugin, env, etc.). +bool RecConfigIsUsingDefaultValue(char const *name); + /// Generate a warning if any configuration name/value is not registered. void RecConfigWarnIfUnregistered(); diff --git a/include/ts/apidefs.h.in b/include/ts/apidefs.h.in index 32fe28e01e7..dbc34bd9d3c 100644 --- a/include/ts/apidefs.h.in +++ b/include/ts/apidefs.h.in @@ -793,6 +793,7 @@ enum TSOverridableConfigKey { TS_CONFIG_HTTP_ANONYMIZE_REMOVE_COOKIE, TS_CONFIG_HTTP_ANONYMIZE_REMOVE_CLIENT_IP, TS_CONFIG_HTTP_ANONYMIZE_INSERT_CLIENT_IP, + TS_CONFIG_HTTP_RESPONSE_SERVER_MODE, TS_CONFIG_HTTP_RESPONSE_SERVER_ENABLED, TS_CONFIG_HTTP_INSERT_SQUID_X_FORWARDED_FOR, TS_CONFIG_HTTP_SEND_HTTP11_REQUESTS, diff --git a/include/ts/ts.h b/include/ts/ts.h index 42998a756fb..078722e7fcf 100644 --- a/include/ts/ts.h +++ b/include/ts/ts.h @@ -2438,11 +2438,21 @@ void TSTextLogObjectHeaderSet(TSTextLogObject the_object, const char *header); /** Enable/disable rolling. + Deprecated in 10.1.0. Use :func:`TSTextLogObjectRollingModeSet` instead. + @param rolling_enabled a valid proxy.config.log.rolling_enabled value. */ TSReturnCode TSTextLogObjectRollingEnabledSet(TSTextLogObject the_object, int rolling_enabled); +/** + Set the rolling mode for log object. + + @param rolling_mode a valid proxy.config.log.rolling.mode value. + + */ +TSReturnCode TSTextLogObjectRollingModeSet(TSTextLogObject the_object, int rolling_mode); + /** Set the rolling interval. diff --git a/plugins/lua/ts_lua_http_config.cc b/plugins/lua/ts_lua_http_config.cc index 938538b41be..9067de99603 100644 --- a/plugins/lua/ts_lua_http_config.cc +++ b/plugins/lua/ts_lua_http_config.cc @@ -40,6 +40,7 @@ typedef enum { TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_COOKIE = TS_CONFIG_HTTP_ANONYMIZE_REMOVE_COOKIE, TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_CLIENT_IP = TS_CONFIG_HTTP_ANONYMIZE_REMOVE_CLIENT_IP, TS_LUA_CONFIG_HTTP_ANONYMIZE_INSERT_CLIENT_IP = TS_CONFIG_HTTP_ANONYMIZE_INSERT_CLIENT_IP, + TS_LUA_CONFIG_HTTP_RESPONSE_SERVER_MODE = TS_CONFIG_HTTP_RESPONSE_SERVER_MODE, TS_LUA_CONFIG_HTTP_RESPONSE_SERVER_ENABLED = TS_CONFIG_HTTP_RESPONSE_SERVER_ENABLED, TS_LUA_CONFIG_HTTP_INSERT_SQUID_X_FORWARDED_FOR = TS_CONFIG_HTTP_INSERT_SQUID_X_FORWARDED_FOR, TS_LUA_CONFIG_HTTP_INSERT_FORWARDED = TS_CONFIG_HTTP_INSERT_FORWARDED, @@ -185,6 +186,7 @@ ts_lua_var_item ts_lua_http_config_vars[] = { TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_COOKIE), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ANONYMIZE_REMOVE_CLIENT_IP), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_ANONYMIZE_INSERT_CLIENT_IP), + TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_RESPONSE_SERVER_MODE), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_RESPONSE_SERVER_ENABLED), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_INSERT_SQUID_X_FORWARDED_FOR), TS_LUA_MAKE_VAR_ITEM(TS_LUA_CONFIG_HTTP_INSERT_FORWARDED), diff --git a/plugins/tcpinfo/tcpinfo.cc b/plugins/tcpinfo/tcpinfo.cc index 20bdd5cf73a..79786807968 100644 --- a/plugins/tcpinfo/tcpinfo.cc +++ b/plugins/tcpinfo/tcpinfo.cc @@ -377,8 +377,7 @@ TSPluginInit(int argc, const char *argv[]) case 'e': i = strtoul(optarg, &endptr, 10); if (*endptr != '\0' || i > 3) { - TSError("[tcpinfo] invalid rolling-enabled argument, '%s', using the system's proxy.config.log.rolling_enabled value", - optarg); + TSError("[tcpinfo] invalid rolling-enabled argument, '%s', using the system's proxy.config.log.rolling.mode value", optarg); } else { rolling_enabled = i; } @@ -433,7 +432,7 @@ TSPluginInit(int argc, const char *argv[]) if (rolling_enabled == -1) { // The user either did not provide a value or the value they provided was // invalid. - Dbg(dbg_ctl, "Using system default value of proxy.config.log.rolling_enabled "); + Dbg(dbg_ctl, "Using system default value of proxy.config.log.rolling.mode "); } else { if (TSTextLogObjectRollingEnabledSet(config->log, rolling_enabled) != TS_SUCCESS) { TSError("[tcpinfo] failed to enable log file rolling to: '%d'", rolling_enabled); diff --git a/src/api/InkAPI.cc b/src/api/InkAPI.cc index 8987180a325..25fc01b7259 100644 --- a/src/api/InkAPI.cc +++ b/src/api/InkAPI.cc @@ -6437,11 +6437,18 @@ TSTextLogObjectHeaderSet(TSTextLogObject the_object, const char *header) TSReturnCode TSTextLogObjectRollingEnabledSet(TSTextLogObject the_object, int rolling_enabled) +{ + /// TODO: Remove TSTextLogObjectRollingEnabledSet in 11.0.0. + return TSTextLogObjectRollingModeSet(the_object, rolling_enabled); +} + +TSReturnCode +TSTextLogObjectRollingModeSet(TSTextLogObject the_object, int rolling_mode) { sdk_assert(sdk_sanity_check_iocore_structure(the_object) == TS_SUCCESS); - if (LogRollingEnabledIsValid(rolling_enabled)) { - (reinterpret_cast(the_object))->set_rolling_enabled(static_cast(rolling_enabled)); + if (LogRollingEnabledIsValid(rolling_mode)) { + (reinterpret_cast(the_object))->set_rolling_enabled(static_cast(rolling_mode)); return TS_SUCCESS; } @@ -7166,6 +7173,9 @@ _conf_to_memberp(TSOverridableConfigKey conf, OverridableHttpConfigParams *overr case TS_CONFIG_HTTP_ANONYMIZE_INSERT_CLIENT_IP: ret = _memberp_to_generic(&overridableHttpConfig->anonymize_insert_client_ip, conv); break; + case TS_CONFIG_HTTP_RESPONSE_SERVER_MODE: + ret = _memberp_to_generic(&overridableHttpConfig->proxy_response_server_mode, conv); + break; case TS_CONFIG_HTTP_RESPONSE_SERVER_ENABLED: ret = _memberp_to_generic(&overridableHttpConfig->proxy_response_server_enabled, conv); break; diff --git a/src/api/InkAPITest.cc b/src/api/InkAPITest.cc index 8f6ddadffd9..58bcbe8e7ce 100644 --- a/src/api/InkAPITest.cc +++ b/src/api/InkAPITest.cc @@ -8676,6 +8676,7 @@ std::array SDK_Overridable_Configs = { "proxy.config.http.anonymize_remove_cookie", "proxy.config.http.anonymize_remove_client_ip", "proxy.config.http.insert_client_ip", + "proxy.config.http.response_server.mode", "proxy.config.http.response_server_enabled", "proxy.config.http.insert_squid_x_forwarded_for", "proxy.config.http.send_http11_requests", diff --git a/src/iocore/net/SSLConfig.cc b/src/iocore/net/SSLConfig.cc index 00a53b700f5..b898cbdcf66 100644 --- a/src/iocore/net/SSLConfig.cc +++ b/src/iocore/net/SSLConfig.cc @@ -452,7 +452,30 @@ SSLConfigParams::initialize() // SSL session cache configurations ssl_origin_session_cache = RecGetRecordInt("proxy.config.ssl.origin_session_cache.enabled").value_or(0); ssl_origin_session_cache_size = RecGetRecordInt("proxy.config.ssl.origin_session_cache.size").value_or(0); - ssl_session_cache = RecGetRecordInt("proxy.config.ssl.session_cache.value").value_or(0); + + // Validate that new mode and deprecated enabled configs don't conflict (if both explicitly defined). + auto session_cache_mode = RecGetRecordInt("proxy.config.ssl.session_cache.mode"); + auto session_cache_enabled = RecGetRecordInt("proxy.config.ssl.session_cache.enabled"); + auto session_cache_value = RecGetRecordInt("proxy.config.ssl.session_cache.value"); + + if (session_cache_mode.has_value() && session_cache_enabled.has_value() && + session_cache_mode.value() != session_cache_enabled.value() && + !RecConfigIsUsingDefaultValue("proxy.config.ssl.session_cache.enabled")) { + Emergency("Conflicting SSL session cache configuration: proxy.config.ssl.session_cache.mode=%d but " + "proxy.config.ssl.session_cache.enabled=%d", + static_cast(session_cache_mode.value()), static_cast(session_cache_enabled.value())); + } + if (session_cache_mode.has_value() && session_cache_value.has_value() && + session_cache_mode.value() != session_cache_value.value() && + !RecConfigIsUsingDefaultValue("proxy.config.ssl.session_cache.value")) { + Emergency("Conflicting SSL session cache configuration: proxy.config.ssl.session_cache.mode=%d but " + "proxy.config.ssl.session_cache.value=%d", + static_cast(session_cache_mode.value()), static_cast(session_cache_value.value())); + } + + ssl_session_cache = session_cache_mode.value_or( + session_cache_enabled.value_or(session_cache_value.value_or(SSL_SESSION_CACHE_MODE_SERVER_ATS_IMPL))); + ssl_session_cache_size = RecGetRecordInt("proxy.config.ssl.session_cache.size").value_or(0); ssl_session_cache_num_buckets = RecGetRecordInt("proxy.config.ssl.session_cache.num_buckets").value_or(0); ssl_session_cache_skip_on_contention = diff --git a/src/proxy/http/HttpConfig.cc b/src/proxy/http/HttpConfig.cc index adead9915db..c4fc5e5addd 100644 --- a/src/proxy/http/HttpConfig.cc +++ b/src/proxy/http/HttpConfig.cc @@ -931,7 +931,22 @@ HttpConfig::startup() HttpEstablishStaticConfigStringAlloc(c.oride.global_user_agent_header, "proxy.config.http.global_user_agent_header"); c.oride.global_user_agent_header_size = c.oride.global_user_agent_header ? strlen(c.oride.global_user_agent_header) : 0; + HttpEstablishStaticConfigByte(c.oride.proxy_response_server_mode, "proxy.config.http.response_server.mode"); + + // The following is the deprecated version of proxy_response_server_mode. HttpEstablishStaticConfigByte(c.oride.proxy_response_server_enabled, "proxy.config.http.response_server_enabled"); + + // Validate that new mode and deprecated enabled configs don't conflict (if both explicitly defined). + auto response_server_mode = RecGetRecordInt("proxy.config.http.response_server.mode"); + auto response_server_enabled = RecGetRecordInt("proxy.config.http.response_server_enabled"); + + if (response_server_mode.has_value() && response_server_enabled.has_value() && + response_server_mode.value() != response_server_enabled.value() && + !RecConfigIsUsingDefaultValue("proxy.config.http.response_server_enabled")) { + Emergency("Conflicting HTTP response server configuration: proxy.config.http.response_server.mode=%d but " + "proxy.config.http.response_server_enabled=%d", + static_cast(response_server_mode.value()), static_cast(response_server_enabled.value())); + } HttpEstablishStaticConfigStringAlloc(c.oride.proxy_response_server_string, "proxy.config.http.response_server_str"); c.oride.proxy_response_server_string_len = c.oride.proxy_response_server_string ? strlen(c.oride.proxy_response_server_string) : 0; @@ -1236,6 +1251,7 @@ HttpConfig::reconfigure() params->oride.proxy_response_server_string_len = params->oride.proxy_response_server_string ? strlen(params->oride.proxy_response_server_string) : 0; params->oride.proxy_response_server_enabled = m_master.oride.proxy_response_server_enabled; + params->oride.proxy_response_server_mode = m_master.oride.proxy_response_server_mode; params->oride.insert_squid_x_forwarded_for = INT_TO_BOOL(m_master.oride.insert_squid_x_forwarded_for); params->oride.insert_forwarded = m_master.oride.insert_forwarded; diff --git a/src/proxy/http/HttpTransactHeaders.cc b/src/proxy/http/HttpTransactHeaders.cc index 4a26790675e..f25b70d3d41 100644 --- a/src/proxy/http/HttpTransactHeaders.cc +++ b/src/proxy/http/HttpTransactHeaders.cc @@ -1119,7 +1119,7 @@ HttpTransactHeaders::add_forwarded_field_to_request(HttpTransact::State *s, HTTP void HttpTransactHeaders::add_server_header_to_response(const OverridableHttpConfigParams *http_txn_conf, HTTPHdr *header) { - if (http_txn_conf->proxy_response_server_enabled && http_txn_conf->proxy_response_server_string) { + if (http_txn_conf->proxy_response_server_mode && http_txn_conf->proxy_response_server_string) { MIMEField *ua_field; bool do_add = true; @@ -1129,7 +1129,7 @@ HttpTransactHeaders::add_server_header_to_response(const OverridableHttpConfigPa } } else { // There was an existing header from Origin, so only add if setting allows to overwrite. - do_add = (1 == http_txn_conf->proxy_response_server_enabled); + do_add = (1 == http_txn_conf->proxy_response_server_mode); } // This will remove any old string (free it), and set our Server header. diff --git a/src/proxy/logging/Log.cc b/src/proxy/logging/Log.cc index c11ccd13096..a33b4d1e992 100644 --- a/src/proxy/logging/Log.cc +++ b/src/proxy/logging/Log.cc @@ -215,14 +215,24 @@ Log::periodic_tasks(long time_now) Dbg(dbg_ctl_log_config, "Performing reconfiguration, init status = %d", init_status); if (logging_mode_changed) { - int val; - val = RecGetRecordInt("proxy.config.log.logging_enabled").value_or(0); + // Validate that new mode and deprecated enabled configs don't conflict (if both explicitly defined). + auto logging_mode_config = RecGetRecordInt("proxy.config.log.logging.mode"); + auto logging_enabled_config = RecGetRecordInt("proxy.config.log.logging_enabled"); + + if (logging_mode_config.has_value() && logging_enabled_config.has_value() && + logging_mode_config.value() != logging_enabled_config.value() && + !RecConfigIsUsingDefaultValue("proxy.config.log.logging_enabled")) { + Emergency("Conflicting logging configuration: proxy.config.log.logging.mode=%d but proxy.config.log.logging_enabled=%d", + static_cast(logging_mode_config.value()), static_cast(logging_enabled_config.value())); + } + + int val = logging_mode_config.value_or(logging_enabled_config.value_or(LOG_MODE_FULL)); if (val < LOG_MODE_NONE || val > LOG_MODE_FULL) { logging_mode = LOG_MODE_FULL; - Warning("proxy.config.log.logging_enabled has an invalid " - "value setting it to %d", - logging_mode); + Warning("proxy.config.log.logging.mode has an invalid " + "value %d, setting it to %d", + val, logging_mode); } else { logging_mode = static_cast(val); } @@ -1080,13 +1090,24 @@ Log::init(int flags) config->read_configuration_variables(); preproc_threads = config->preproc_threads; - int val; - val = RecGetRecordInt("proxy.config.log.logging_enabled").value_or(0); + // Validate that new mode and deprecated enabled configs don't conflict (if both explicitly defined). + auto logging_mode_config = RecGetRecordInt("proxy.config.log.logging.mode"); + auto logging_enabled_config = RecGetRecordInt("proxy.config.log.logging_enabled"); + + if (logging_mode_config.has_value() && logging_enabled_config.has_value() && + logging_mode_config.value() != logging_enabled_config.value() && + !RecConfigIsUsingDefaultValue("proxy.config.log.logging_enabled")) { + Emergency("Conflicting logging configuration: proxy.config.log.logging.mode=%d but proxy.config.log.logging_enabled=%d", + static_cast(logging_mode_config.value()), static_cast(logging_enabled_config.value())); + } + + int val = logging_mode_config.value_or(logging_enabled_config.value_or(LOG_MODE_FULL)); + if (val < LOG_MODE_NONE || val > LOG_MODE_FULL) { logging_mode = LOG_MODE_FULL; - Warning("proxy.config.log.logging_enabled has an invalid " - "value, setting it to %d", - logging_mode); + Warning("proxy.config.log.logging.mode has an invalid " + "value %d, setting it to %d", + val, logging_mode); } else { logging_mode = static_cast(val); } @@ -1106,7 +1127,7 @@ Log::init(int flags) init_fields(); if (!(config_flags & LOGCAT)) { - RecRegisterConfigUpdateCb("proxy.config.log.logging_enabled", &Log::handle_logging_mode_change, nullptr); + RecRegisterConfigUpdateCb("proxy.config.log.logging.mode", &Log::handle_logging_mode_change, nullptr); Dbg(dbg_ctl_log_config, "Log::init(): logging_mode = %d init status = %d", logging_mode, init_status); config->init(); diff --git a/src/proxy/logging/LogConfig.cc b/src/proxy/logging/LogConfig.cc index b53e798cbb9..4660fc1257f 100644 --- a/src/proxy/logging/LogConfig.cc +++ b/src/proxy/logging/LogConfig.cc @@ -168,11 +168,24 @@ LogConfig::read_configuration_variables() rolling_offset_hr = RecGetRecordInt("proxy.config.log.rolling_offset_hr").value_or(0); rolling_size_mb = RecGetRecordInt("proxy.config.log.rolling_size_mb").value_or(0); rolling_min_count = RecGetRecordInt("proxy.config.log.rolling_min_count").value_or(0); - val = RecGetRecordInt("proxy.config.log.rolling_enabled").value_or(0); + + // Validate that new mode and deprecated enabled configs don't conflict (if both explicitly defined). + auto rolling_mode_config = RecGetRecordInt("proxy.config.log.rolling.mode"); + auto rolling_enabled_config = RecGetRecordInt("proxy.config.log.rolling_enabled"); + + if (rolling_mode_config.has_value() && rolling_enabled_config.has_value() && + rolling_mode_config.value() != rolling_enabled_config.value() && + !RecConfigIsUsingDefaultValue("proxy.config.log.rolling_enabled")) { + Emergency("Conflicting log rolling configuration: proxy.config.log.rolling.mode=%d but proxy.config.log.rolling_enabled=%d", + static_cast(rolling_mode_config.value()), static_cast(rolling_enabled_config.value())); + } + + val = rolling_mode_config.value_or(rolling_enabled_config.value_or(1)); + if (LogRollingEnabledIsValid(val)) { rolling_enabled = static_cast(val); } else { - Warning("invalid value '%d' for '%s', disabling log rolling", val, "proxy.config.log.rolling_enabled"); + Warning("invalid value '%d' for '%s', disabling log rolling", val, "proxy.config.log.rolling.mode"); rolling_enabled = Log::NO_ROLLING; } @@ -439,6 +452,7 @@ LogConfig::register_config_callbacks() "proxy.config.log.logfile_perm", "proxy.config.log.hostname", "proxy.config.log.logfile_dir", + "proxy.config.log.rolling.mode", "proxy.config.log.rolling_enabled", "proxy.config.log.rolling_interval_sec", "proxy.config.log.rolling_offset_hr", diff --git a/src/proxy/logging/YamlLogConfig.cc b/src/proxy/logging/YamlLogConfig.cc index e554e8f9666..d97f2519b4f 100644 --- a/src/proxy/logging/YamlLogConfig.cc +++ b/src/proxy/logging/YamlLogConfig.cc @@ -124,6 +124,7 @@ std::set valid_log_object_keys = {"filename", "mode", "header", "rolling_enabled", + "rolling_mode", "rolling_interval_sec", "rolling_offset_hr", "rolling_size_mb", @@ -187,15 +188,24 @@ YamlLogConfig::decodeLogObject(const YAML::Node &node) int obj_rolling_max_count = cfg->rolling_max_count; int obj_rolling_allow_empty = cfg->rolling_allow_empty; - if (node["rolling_enabled"]) { - auto value = node["rolling_enabled"].as(); + // Handle rolling configuration (rolling_mode preferred, rolling_enabled deprecated) + const char *rolling_param = nullptr; + if (node["rolling_mode"]) { + rolling_param = "rolling_mode"; + } else if (node["rolling_enabled"]) { + rolling_param = "rolling_enabled"; + } + + if (rolling_param) { + auto rolling_node = node[rolling_param]; + auto value = rolling_node.as(); obj_rolling_enabled = ROLLING_MODE_TEXT.get(value); if (obj_rolling_enabled < 0) { obj_rolling_enabled = ROLLING_MODE_LUA.get(value); if (obj_rolling_enabled < 0) { - obj_rolling_enabled = node["rolling_enabled"].as(); + obj_rolling_enabled = rolling_node.as(); if (obj_rolling_enabled < Log::NO_ROLLING || obj_rolling_enabled > Log::ROLL_ON_TIME_AND_SIZE) { - throw YAML::ParserException(node["rolling_enabled"].Mark(), "unknown value " + value); + throw YAML::ParserException(rolling_node.Mark(), "unknown value " + value); } } } diff --git a/src/proxy/shared/DiagsConfig.cc b/src/proxy/shared/DiagsConfig.cc index 9e29be3d6c3..45a058798e6 100644 --- a/src/proxy/shared/DiagsConfig.cc +++ b/src/proxy/shared/DiagsConfig.cc @@ -76,8 +76,19 @@ DiagsConfig::reconfigure_diags() // enabled if records.yaml set - auto e{RecGetRecordInt("proxy.config.diags.debug.enabled")}; - found = e.has_value(); + // Validate that new mode and deprecated enabled configs don't conflict (if both explicitly defined). + auto debug_mode = RecGetRecordInt("proxy.config.diags.debug.mode"); + auto debug_enabled = RecGetRecordInt("proxy.config.diags.debug.enabled"); + + // Check for conflicts, but only error if deprecated config was explicitly set (not default) + if (debug_mode.has_value() && debug_enabled.has_value() && debug_mode.value() != debug_enabled.value() && + !RecConfigIsUsingDefaultValue("proxy.config.diags.debug.enabled")) { + Emergency("Conflicting diags debug configuration: proxy.config.diags.debug.mode=%d but proxy.config.diags.debug.enabled=%d", + static_cast(debug_mode.value()), static_cast(debug_enabled.value())); + } + + auto e = debug_mode.has_value() ? debug_mode : debug_enabled; + found = e.has_value(); if (found && e.value()) { c.enabled(DiagsTagType_Debug, e.value()); // implement OR logic } @@ -295,13 +306,39 @@ DiagsConfig::DiagsConfig(std::string_view prefix_string, const char *filename, c int output_log_roll_size; output_log_roll_size = RecGetRecordInt("proxy.config.output.logfile.rolling_size_mb").value_or(0); int output_log_roll_enable; - output_log_roll_enable = RecGetRecordInt("proxy.config.output.logfile.rolling_enabled").value_or(0); + // Validate that new mode and deprecated enabled configs don't conflict (if both explicitly defined). + auto output_rolling_mode = RecGetRecordInt("proxy.config.output.logfile.rolling.mode"); + auto output_rolling_enabled = RecGetRecordInt("proxy.config.output.logfile.rolling_enabled"); + + if (output_rolling_mode.has_value() && output_rolling_enabled.has_value() && + output_rolling_mode.value() != output_rolling_enabled.value() && + !RecConfigIsUsingDefaultValue("proxy.config.output.logfile.rolling_enabled")) { + Emergency("Conflicting output rolling configuration: proxy.config.output.logfile.rolling.mode=%d but " + "proxy.config.output.logfile.rolling_enabled=%d", + static_cast(output_rolling_mode.value()), static_cast(output_rolling_enabled.value())); + } + + output_log_roll_enable = output_rolling_mode.value_or(output_rolling_enabled.value_or(0)); + int diags_log_roll_int; diags_log_roll_int = RecGetRecordInt("proxy.config.diags.logfile.rolling_interval_sec").value_or(0); int diags_log_roll_size; diags_log_roll_size = RecGetRecordInt("proxy.config.diags.logfile.rolling_size_mb").value_or(0); int diags_log_roll_enable; - diags_log_roll_enable = RecGetRecordInt("proxy.config.diags.logfile.rolling_enabled").value_or(0); + + // Validate that new mode and deprecated enabled configs don't conflict (if both explicitly defined). + auto diags_rolling_mode = RecGetRecordInt("proxy.config.diags.logfile.rolling.mode"); + auto diags_rolling_enabled = RecGetRecordInt("proxy.config.diags.logfile.rolling_enabled"); + + if (diags_rolling_mode.has_value() && diags_rolling_enabled.has_value() && + diags_rolling_mode.value() != diags_rolling_enabled.value() && + !RecConfigIsUsingDefaultValue("proxy.config.diags.logfile.rolling_enabled")) { + Emergency("Conflicting diags rolling configuration: proxy.config.diags.logfile.rolling.mode=%d but " + "proxy.config.diags.logfile.rolling_enabled=%d", + static_cast(diags_rolling_mode.value()), static_cast(diags_rolling_enabled.value())); + } + + diags_log_roll_enable = diags_rolling_mode.value_or(diags_rolling_enabled.value_or(0)); // Grab some perms for the actual files on disk { @@ -343,11 +380,14 @@ void DiagsConfig::register_diags_callbacks() { static const char *config_record_names[] = { - "proxy.config.diags.debug.enabled", "proxy.config.diags.debug.tags", "proxy.config.diags.action.enabled", - "proxy.config.diags.action.tags", "proxy.config.diags.show_location", "proxy.config.diags.output.diag", - "proxy.config.diags.output.debug", "proxy.config.diags.output.status", "proxy.config.diags.output.note", - "proxy.config.diags.output.warning", "proxy.config.diags.output.error", "proxy.config.diags.output.fatal", - "proxy.config.diags.output.alert", "proxy.config.diags.output.emergency", nullptr, + "proxy.config.diags.debug.mode", "proxy.config.diags.debug.enabled", + "proxy.config.diags.debug.tags", "proxy.config.diags.action.enabled", + "proxy.config.diags.action.tags", "proxy.config.diags.show_location", + "proxy.config.diags.output.diag", "proxy.config.diags.output.debug", + "proxy.config.diags.output.status", "proxy.config.diags.output.note", + "proxy.config.diags.output.warning", "proxy.config.diags.output.error", + "proxy.config.diags.output.fatal", "proxy.config.diags.output.alert", + "proxy.config.diags.output.emergency", nullptr, }; bool total_status = true; diff --git a/src/records/RecCore.cc b/src/records/RecCore.cc index a150f6bd75b..b4d07f4da87 100644 --- a/src/records/RecCore.cc +++ b/src/records/RecCore.cc @@ -709,6 +709,13 @@ RecGetRecordSource(const char *name, RecSourceT *source, bool lock) return err; } +bool +RecConfigIsUsingDefaultValue(char const *name) +{ + RecSourceT source = REC_SOURCE_NULL; + return (RecGetRecordSource(name, &source) == REC_ERR_OKAY && source == REC_SOURCE_DEFAULT); +} + //------------------------------------------------------------------------- // RecRegisterStat //------------------------------------------------------------------------- diff --git a/src/records/RecordsConfig.cc b/src/records/RecordsConfig.cc index d0bd3def340..c9817a49d02 100644 --- a/src/records/RecordsConfig.cc +++ b/src/records/RecordsConfig.cc @@ -66,6 +66,9 @@ static const RecordElement RecordsConfig[] = {RECT_CONFIG, "proxy.config.crash_log_helper", RECD_STRING, MGMT_CRASHLOG_HELPER, RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL} , // 0 - Disabled, 1 - enabled for important pages (e.g. cache directory), 2 - enabled for all pages + {RECT_CONFIG, "proxy.config.mlock.mode", RECD_INT, "0", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-2]", RECA_NULL} + , + // Provided for backwards compatibility. Use proxy.config.mlock.mode insead. {RECT_CONFIG, "proxy.config.mlock_enabled", RECD_INT, "0", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-2]", RECA_NULL} , //# 0 = disable (seconds) @@ -83,7 +86,9 @@ static const RecordElement RecordsConfig[] = , {RECT_CONFIG, "proxy.config.output.logfile_perm", RECD_STRING, "rw-r--r--", RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL} , - // traffic.out rotation, default is 0 (aka rolling turned off) to preserve compatibility + {RECT_CONFIG, "proxy.config.output.logfile.rolling.mode", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-3]", RECA_NULL} + , + // Provided for backwards compatibility. Use proxy.config.output.logfile.rolling.mode instead. {RECT_CONFIG, "proxy.config.output.logfile.rolling_enabled", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-3]", RECA_NULL} , {RECT_CONFIG, "proxy.config.output.logfile.rolling_interval_sec", RECD_INT, "3600", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL} @@ -192,15 +197,12 @@ static const RecordElement RecordsConfig[] = //# //# Diagnostics //# - //# Enable by setting proxy.config.diags.debug.enabled to 1 - //# Route each type of diagnostic with a string, each character representing: - //# O stdout - //# E stderr - //# S syslog - //# L diags.log - //# //############################################################################## - {RECT_CONFIG, "proxy.config.diags.debug.enabled", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_NULL, "[0-3]", RECA_NULL} + // Values: 0=disabled, 1=normal, 2=client_ip + {RECT_CONFIG, "proxy.config.diags.debug.mode", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-2]", RECA_NULL} + , + // Provided for backwards compatibility. Use proxy.config.diags.debug.mode instead. + {RECT_CONFIG, "proxy.config.diags.debug.enabled", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_NULL, "[0-2]", RECA_NULL} , {RECT_CONFIG, "proxy.config.diags.debug.tags", RECD_STRING, "http|dns", RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL} , @@ -208,7 +210,7 @@ static const RecordElement RecordsConfig[] = , {RECT_CONFIG, "proxy.config.diags.debug.client_ip", RECD_STRING, nullptr, RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL} , - {RECT_CONFIG, "proxy.config.diags.action.enabled", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL} + {RECT_CONFIG, "proxy.config.diags.action.enabled", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL} , {RECT_CONFIG, "proxy.config.diags.action.tags", RECD_STRING, "", RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL} , @@ -236,7 +238,9 @@ static const RecordElement RecordsConfig[] = , {RECT_CONFIG, "proxy.config.diags.logfile.filename", RECD_STRING, "diags.log", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[^[:space:]]+$", RECA_NULL} , - // diags.log rotation, default is 0 (aka rolling turned off) to preserve compatibility + {RECT_CONFIG, "proxy.config.diags.logfile.rolling.mode", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-3]", RECA_NULL} + , + // Provided for backwards compatibility. Use proxy.config.diags.logfile.rolling.mode instead. {RECT_CONFIG, "proxy.config.diags.logfile.rolling_enabled", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-3]", RECA_NULL} , {RECT_CONFIG, "proxy.config.diags.logfile.rolling_interval_sec", RECD_INT, "3600", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL} @@ -305,6 +309,9 @@ static const RecordElement RecordsConfig[] = , {RECT_CONFIG, "proxy.config.http.response_via_str", RECD_STRING, "ApacheTrafficServer/" PACKAGE_VERSION, RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL} , + {RECT_CONFIG, "proxy.config.http.response_server.mode", RECD_INT, "1", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-2]", RECA_NULL} + , + // Provided for backwards compatibility. Use proxy.config.http.response_server.mode instead. {RECT_CONFIG, "proxy.config.http.response_server_enabled", RECD_INT, "1", RECU_DYNAMIC, RR_NULL, RECC_NULL, "[0-2]", RECA_NULL} , {RECT_CONFIG, "proxy.config.http.response_server_str", RECD_STRING, "ATS/" PACKAGE_VERSION, RECU_DYNAMIC, RR_NULL, RECC_NULL, ".*", RECA_NULL} @@ -1022,11 +1029,10 @@ static const RecordElement RecordsConfig[] = //# New Logging Config //# //############################################################################## - //# possible values for logging_enabled - //# 0: no logging at all - //# 1: log errors only - //# 2: full logging - {RECT_CONFIG, "proxy.config.log.logging_enabled", RECD_INT, "3", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-4]", RECA_NULL} + {RECT_CONFIG, "proxy.config.log.logging.mode", RECD_INT, "3", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-3]", RECA_NULL} + , + // Provided for backwards compatibility. Use proxy.config.log.logging.mode instead. + {RECT_CONFIG, "proxy.config.log.logging_enabled", RECD_INT, "3", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-3]", RECA_NULL} , {RECT_CONFIG, "proxy.config.log.log_buffer_size", RECD_INT, "9216", RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL} , @@ -1048,6 +1054,9 @@ static const RecordElement RecordsConfig[] = , {RECT_CONFIG, "proxy.config.log.preproc_threads", RECD_INT, "1", RECU_RESTART_TS, RR_REQUIRED, RECC_INT, "[1-128]", RECA_NULL} , + {RECT_CONFIG, "proxy.config.log.rolling.mode", RECD_INT, "1", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-4]", RECA_NULL} + , + // Provided for backwards compatibility. Use proxy.config.log.rolling.mode instead. {RECT_CONFIG, "proxy.config.log.rolling_enabled", RECD_INT, "1", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-4]", RECA_NULL} , {RECT_CONFIG, "proxy.config.log.rolling_interval_sec", RECD_INT, "86400", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL} @@ -1189,11 +1198,17 @@ static const RecordElement RecordsConfig[] = , {RECT_CONFIG, "proxy.config.ssl.client.scheme_proto_mismatch_policy", RECD_INT, "2", RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL} , - {RECT_CONFIG, "proxy.config.ssl.origin_session_cache.enabled", RECD_INT, "1", RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL} + {RECT_CONFIG, "proxy.config.ssl.origin_session_cache.enabled", RECD_INT, "1", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-1]", RECA_NULL} , {RECT_CONFIG, "proxy.config.ssl.origin_session_cache.size", RECD_INT, "10240", RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL} , - {RECT_CONFIG, "proxy.config.ssl.session_cache.value", RECD_INT, "2", RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL} + {RECT_CONFIG, "proxy.config.ssl.session_cache.mode", RECD_INT, "2", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-2]", RECA_NULL} + , + // Provided for backwards compatibility. Use proxy.config.ssl.session_cache.mode instead. + {RECT_CONFIG, "proxy.config.ssl.session_cache.enabled", RECD_INT, "2", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-2]", RECA_NULL} + , + // Provided for backwards compatibility. Use proxy.config.ssl.session_cache.mode instead. + {RECT_CONFIG, "proxy.config.ssl.session_cache.value", RECD_INT, "2", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-2]", RECA_NULL} , {RECT_CONFIG, "proxy.config.ssl.session_cache.size", RECD_INT, "102400", RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL} , diff --git a/src/shared/overridable_txn_vars.cc b/src/shared/overridable_txn_vars.cc index 6550387ca8f..ed0df871267 100644 --- a/src/shared/overridable_txn_vars.cc +++ b/src/shared/overridable_txn_vars.cc @@ -71,6 +71,7 @@ const std::unordered_map(diags_rolling_mode.value()), static_cast(diags_rolling_enabled.value())); + } + + diags_log_roll_enable = diags_rolling_mode.value_or(diags_rolling_enabled.value_or(0)); + diags()->config_roll_diagslog(static_cast(diags_log_roll_enable), diags_log_roll_int, diags_log_roll_size); @@ -438,7 +452,21 @@ class DiagsLogContinuation : public Continuation int output_log_roll_size; output_log_roll_size = RecGetRecordInt("proxy.config.output.logfile.rolling_size_mb").value_or(0); int output_log_roll_enable; - output_log_roll_enable = RecGetRecordInt("proxy.config.output.logfile.rolling_enabled").value_or(0); + + // Validate that new mode and old enabled configs don't conflict (if both explicitly defined) + auto output_rolling_mode = RecGetRecordInt("proxy.config.output.logfile.rolling.mode"); + auto output_rolling_enabled = RecGetRecordInt("proxy.config.output.logfile.rolling_enabled"); + + if (output_rolling_mode.has_value() && output_rolling_enabled.has_value() && + output_rolling_mode.value() != output_rolling_enabled.value() && + !RecConfigIsUsingDefaultValue("proxy.config.output.logfile.rolling_enabled")) { + Emergency("Conflicting output rolling configuration: proxy.config.output.logfile.rolling.mode=%d but " + "proxy.config.output.logfile.rolling_enabled=%d", + static_cast(output_rolling_mode.value()), static_cast(output_rolling_enabled.value())); + } + + output_log_roll_enable = output_rolling_mode.value_or(output_rolling_enabled.value_or(0)); + diags()->config_roll_outputlog(static_cast(output_log_roll_enable), output_log_roll_int, output_log_roll_size); @@ -1971,7 +1999,18 @@ main(int /* argc ATS_UNUSED */, const char **argv) // Check if we should do mlockall() #if defined(MCL_FUTURE) int mlock_flags = 0; - mlock_flags = RecGetRecordInt("proxy.config.mlock_enabled").value_or(0); + + // Validate that new mode and old enabled configs don't conflict (if both explicitly defined) + auto mlock_mode = RecGetRecordInt("proxy.config.mlock.mode"); + auto mlock_enabled = RecGetRecordInt("proxy.config.mlock_enabled"); + + if (mlock_mode.has_value() && mlock_enabled.has_value() && mlock_mode.value() != mlock_enabled.value() && + !RecConfigIsUsingDefaultValue("proxy.config.mlock_enabled")) { + Emergency("Conflicting mlock configuration: proxy.config.mlock.mode=%d but proxy.config.mlock_enabled=%d", + static_cast(mlock_mode.value()), static_cast(mlock_enabled.value())); + } + + mlock_flags = mlock_mode.value_or(mlock_enabled.value_or(0)); if (mlock_flags == 2) { if (0 != mlockall(MCL_CURRENT | MCL_FUTURE)) { diff --git a/tests/gold_tests/ats_probe/ats_probe.test.py b/tests/gold_tests/ats_probe/ats_probe.test.py index be849d56db7..481addbbe19 100644 --- a/tests/gold_tests/ats_probe/ats_probe.test.py +++ b/tests/gold_tests/ats_probe/ats_probe.test.py @@ -71,7 +71,7 @@ def _configure_traffic_server(self, tr: 'TestRun') -> 'Process': ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.dns.nameservers': f"127.0.0.1:{self._dns.Variables.Port}", 'proxy.config.dns.resolv_conf': 'NULL' diff --git a/tests/gold_tests/bad_http_fmt/bad_http_fmt.test.py b/tests/gold_tests/bad_http_fmt/bad_http_fmt.test.py index 869894ea153..c000a8cf37a 100644 --- a/tests/gold_tests/bad_http_fmt/bad_http_fmt.test.py +++ b/tests/gold_tests/bad_http_fmt/bad_http_fmt.test.py @@ -84,7 +84,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns', 'proxy.config.url_remap.remap_required': 0, 'proxy.config.http.strict_uri_parsing': 1, diff --git a/tests/gold_tests/basic/deny0.test.py b/tests/gold_tests/basic/deny0.test.py index 84d3aca7429..8592d631ebe 100644 --- a/tests/gold_tests/basic/deny0.test.py +++ b/tests/gold_tests/basic/deny0.test.py @@ -36,7 +36,7 @@ ts = Test.MakeATSProcess("ts", enable_cache=False) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|redirect', 'proxy.config.http.number_of_redirections': 1, 'proxy.config.dns.nameservers': '127.0.0.1:{0}'.format(dns.Variables.Port), diff --git a/tests/gold_tests/bigobj/bigobj.test.py b/tests/gold_tests/bigobj/bigobj.test.py index 55bb5c7403d..8cb9674f58d 100644 --- a/tests/gold_tests/bigobj/bigobj.test.py +++ b/tests/gold_tests/bigobj/bigobj.test.py @@ -31,7 +31,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|cache', 'proxy.config.http.cache.required_headers': 0, # No required headers for caching 'proxy.config.http.push_method_enabled': 1, @@ -48,7 +48,7 @@ # Size of object to get. (NOTE: If you increase this significantly you may also have to increase cache # capacity in tests/gold_tests/autest-size/min_cfg/storage.config. Also, for very large objects, if -# proxy.config.diags.debug.enabled is 1, the PUSH request will timeout and fail.) +# proxy.config.diags.debug.mode is 1, the PUSH request will timeout and fail.) # obj_kilobytes = 10 * 1024 obj_bytes = obj_kilobytes * 10 @@ -111,7 +111,7 @@ def create_pushfile(): ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|cache', 'proxy.config.http.cache.required_headers': 0, # No required headers for caching 'proxy.config.proxy_name': 'Poxy_Proxy', # This will be the server name. diff --git a/tests/gold_tests/cache/alternate-caching.test.py b/tests/gold_tests/cache/alternate-caching.test.py index 21b7ef017a5..dbeaa717a5c 100644 --- a/tests/gold_tests/cache/alternate-caching.test.py +++ b/tests/gold_tests/cache/alternate-caching.test.py @@ -27,7 +27,7 @@ ts = Test.MakeATSProcess("ts-alternate-caching") ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|cache', 'proxy.config.http.cache.max_stale_age': 6, 'proxy.config.cache.select_alternate': 1, diff --git a/tests/gold_tests/cache/background_fill.test.py b/tests/gold_tests/cache/background_fill.test.py index 4c4fe2467d6..7b536616a0d 100644 --- a/tests/gold_tests/cache/background_fill.test.py +++ b/tests/gold_tests/cache/background_fill.test.py @@ -68,7 +68,7 @@ def __setupTS(self, ts_names=['default']): 'proxy.config.ssl.server.private_key.path': f"{self.ts[name].Variables.SSLDir}", 'proxy.config.ssl.client.alpn_protocols': 'h2,http/1.1', 'proxy.config.ssl.client.verify.server.policy': 'PERMISSIVE', - "proxy.config.diags.debug.enabled": 3, + "proxy.config.diags.debug.mode": 3, "proxy.config.diags.debug.tags": "http", }) diff --git a/tests/gold_tests/cache/cache-auth.test.py b/tests/gold_tests/cache/cache-auth.test.py index 8592f4fbf8a..b1855a6226b 100644 --- a/tests/gold_tests/cache/cache-auth.test.py +++ b/tests/gold_tests/cache/cache-auth.test.py @@ -42,7 +42,7 @@ def setupOriginServer(self): def setupTS(self): self.ts = Test.MakeATSProcess("ts-auth-default") self.ts.Disk.records_config.update({ - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http", }) self.ts.Disk.remap_config.AddLine(f"map / http://127.0.0.1:{self.server.Variables.http_port}/",) @@ -86,7 +86,7 @@ def setupTS(self): self.ts = Test.MakeATSProcess("ts-auth-ignored") self.ts.Disk.records_config.update( { - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http", # Configure ATS to ignore the WWW-Authenticate header in # response(allow caching of such response) diff --git a/tests/gold_tests/cache/cache-control.test.py b/tests/gold_tests/cache/cache-control.test.py index b9a9ea08ca7..c9985c86236 100644 --- a/tests/gold_tests/cache/cache-control.test.py +++ b/tests/gold_tests/cache/cache-control.test.py @@ -63,7 +63,7 @@ ts.Disk.plugin_config.AddLine('xdebug.so --enable=x-cache,x-cache-key,via') ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.response_via_str': 3, 'proxy.config.http.insert_age_in_response': 0, @@ -129,7 +129,7 @@ server = Test.MakeVerifierServerProcess("proxy-verifier-server", replay_file) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.insert_age_in_response': 0, @@ -151,7 +151,7 @@ server = Test.MakeVerifierServerProcess("s-maxage-server", replay_file) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.insert_age_in_response': 0, }) @@ -166,7 +166,7 @@ # ts = Test.MakeATSProcess("ts-cache-control-pragma") ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|cache', }) tr = Test.AddTestRun("Verify Pragma: no-cache does not conflict with Cache-Control headers") @@ -195,7 +195,7 @@ def setupOriginServer(self): def setupTS(self): self.ts = Test.MakeATSProcess("ts-request-cache-control-default") self.ts.Disk.records_config.update({ - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http", }) self.ts.Disk.remap_config.AddLine(f"map / http://127.0.0.1:{self.server.Variables.http_port}/",) @@ -236,7 +236,7 @@ def setupTS(self): self.ts = Test.MakeATSProcess("ts-request-cache-control-honor-client") self.ts.Disk.records_config.update( { - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http", # Configured to honor client requests to bypass the cache "proxy.config.http.cache.ignore_client_no_cache": 0 @@ -288,7 +288,7 @@ def setupOriginServer(self): def setupTS(self): self.ts = Test.MakeATSProcess("ts-response-cache-control-default") self.ts.Disk.records_config.update({ - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http", }) self.ts.Disk.remap_config.AddLine(f"map / http://127.0.0.1:{self.server.Variables.http_port}/",) @@ -337,7 +337,7 @@ def setupTS(self): self.ts = Test.MakeATSProcess("ts-response-cache-control-ignored") self.ts.Disk.records_config.update( { - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http", "proxy.config.http.cache.ignore_server_no_cache": 1 }) diff --git a/tests/gold_tests/cache/cache-cookie.test.py b/tests/gold_tests/cache/cache-cookie.test.py index 6d1575d6cef..6d8dd088140 100644 --- a/tests/gold_tests/cache/cache-cookie.test.py +++ b/tests/gold_tests/cache/cache-cookie.test.py @@ -41,7 +41,7 @@ def setupOriginServer(self): def setupTS(self): self.ts = Test.MakeATSProcess("ts-cookie-default") self.ts.Disk.records_config.update({ - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http", }) self.ts.Disk.remap_config.AddLine(f"map / http://127.0.0.1:{self.server.Variables.http_port}/",) @@ -81,7 +81,7 @@ def setupTS(self): self.ts = Test.MakeATSProcess("ts-cookie-bypass") self.ts.Disk.records_config.update( { - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http", # Bypass cache for any responses to cookies "proxy.config.http.cache.cache_responses_to_cookies": 0 @@ -121,7 +121,7 @@ def setupTS(self): self.ts = Test.MakeATSProcess("ts-cookie-img-only") self.ts.Disk.records_config.update( { - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http", # Cache only for image types "proxy.config.http.cache.cache_responses_to_cookies": 2 @@ -164,7 +164,7 @@ def setupTS(self): self.ts = Test.MakeATSProcess("ts-cookie-all-but-text") self.ts.Disk.records_config.update( { - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http", # Cache all content type except text "proxy.config.http.cache.cache_responses_to_cookies": 3 @@ -209,7 +209,7 @@ def setupTS(self): self.ts = Test.MakeATSProcess("ts-cookie-all-but-text-with-excp") self.ts.Disk.records_config.update( { - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http", # Cache all content type but text. Text type also gets cached for # server responses without Set-Cookie or with Cache-Control: public diff --git a/tests/gold_tests/cache/cache-range-response.test.py b/tests/gold_tests/cache/cache-range-response.test.py index 4202095f077..9aa60500c0a 100644 --- a/tests/gold_tests/cache/cache-range-response.test.py +++ b/tests/gold_tests/cache/cache-range-response.test.py @@ -26,7 +26,7 @@ server = Test.MakeVerifierServerProcess("server0", replay_file) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http.*|cache.*', 'proxy.config.http.cache.range.write': 1, 'proxy.config.http.cache.when_to_revalidate': 4, diff --git a/tests/gold_tests/cache/cache-request-method.test.py b/tests/gold_tests/cache/cache-request-method.test.py index 21fd65517dd..f5f51c57e91 100644 --- a/tests/gold_tests/cache/cache-request-method.test.py +++ b/tests/gold_tests/cache/cache-request-method.test.py @@ -29,7 +29,7 @@ server = tr.AddVerifierServerProcess("server0", replay_file) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http.*|cache.*', 'proxy.config.http.insert_age_in_response': 0, @@ -50,7 +50,7 @@ server = tr.AddVerifierServerProcess("server1", replay_file) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http.*|cache.*', 'proxy.config.http.insert_age_in_response': 0, 'proxy.config.http.cache.post_method': 1, @@ -68,7 +68,7 @@ server = tr.AddVerifierServerProcess("server2", replay_file) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http.*|cache.*', 'proxy.config.http.insert_age_in_response': 0, # Override the following in remap.config. @@ -88,7 +88,7 @@ server = tr.AddVerifierServerProcess("server3", replay_file) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http.*|cache.*', 'proxy.config.http.insert_age_in_response': 0, }) diff --git a/tests/gold_tests/cache/conditional-get-hit.test.py b/tests/gold_tests/cache/conditional-get-hit.test.py index f3df0a1f4ed..7564de24bb0 100644 --- a/tests/gold_tests/cache/conditional-get-hit.test.py +++ b/tests/gold_tests/cache/conditional-get-hit.test.py @@ -24,7 +24,7 @@ ts = Test.MakeATSProcess("ts-conditional-get-caching") ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|cache', 'proxy.config.http.cache.max_stale_age': 6, }) diff --git a/tests/gold_tests/cache/negative-caching.test.py b/tests/gold_tests/cache/negative-caching.test.py index 1c5cf2ac0ed..84bc121ec67 100644 --- a/tests/gold_tests/cache/negative-caching.test.py +++ b/tests/gold_tests/cache/negative-caching.test.py @@ -29,7 +29,7 @@ server = Test.MakeVerifierServerProcess("server-disabled", replay_file) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.insert_age_in_response': 0, 'proxy.config.http.negative_caching_enabled': 0 @@ -48,7 +48,7 @@ server = Test.MakeVerifierServerProcess("server-default", replay_file) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.insert_age_in_response': 0, 'proxy.config.http.negative_caching_enabled': 1 @@ -67,7 +67,7 @@ server = Test.MakeVerifierServerProcess("server-customized", replay_file) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.insert_age_in_response': 0, 'proxy.config.http.negative_caching_enabled': 1, @@ -85,7 +85,7 @@ ts = Test.MakeATSProcess("ts-lifetime") ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.insert_age_in_response': 0, 'proxy.config.http.negative_caching_enabled': 1, @@ -122,7 +122,7 @@ ts = Test.MakeATSProcess("ts-lifetime-2") ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.insert_age_in_response': 0, 'proxy.config.http.negative_caching_enabled': 1, diff --git a/tests/gold_tests/cache/negative-revalidating.test.py b/tests/gold_tests/cache/negative-revalidating.test.py index e80c577827a..a599ee817c1 100644 --- a/tests/gold_tests/cache/negative-revalidating.test.py +++ b/tests/gold_tests/cache/negative-revalidating.test.py @@ -57,7 +57,7 @@ def run(self): # NegativeRevalidatingTest( "Verify negative revalidating disabled", { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|cache', 'proxy.config.http.insert_age_in_response': 0, 'proxy.config.http.insert_response_via_str': 2, @@ -71,7 +71,7 @@ def run(self): NegativeRevalidatingTest( "Verify negative revalidating enabled", { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|cache', 'proxy.config.http.insert_age_in_response': 0, 'proxy.config.http.insert_response_via_str': 2, @@ -88,7 +88,7 @@ def run(self): # NegativeRevalidatingTest( "Verify negative_revalidating_list behavior", { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|cache', 'proxy.config.http.insert_age_in_response': 0, 'proxy.config.http.insert_response_via_str': 2, diff --git a/tests/gold_tests/cache/proxy_serve_stale.test.py b/tests/gold_tests/cache/proxy_serve_stale.test.py index 252a50a958e..b5e2dee44ec 100644 --- a/tests/gold_tests/cache/proxy_serve_stale.test.py +++ b/tests/gold_tests/cache/proxy_serve_stale.test.py @@ -46,7 +46,7 @@ def _configure_ts(self): 'proxy.config.http.parent_proxy.total_connect_attempts': 1, 'proxy.config.http.cache.max_stale_age': 10, 'proxy.config.http.parent_proxy.self_detect': 0, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cache|http|dns|hostdb|parent_proxy', 'proxy.config.dns.nameservers': f"127.0.0.1:{self.nameserver.Variables.Port}", }) diff --git a/tests/gold_tests/cache/storage-metrics.test.py b/tests/gold_tests/cache/storage-metrics.test.py index 27a293f3790..d0f2d168d52 100644 --- a/tests/gold_tests/cache/storage-metrics.test.py +++ b/tests/gold_tests/cache/storage-metrics.test.py @@ -79,7 +79,7 @@ def run(self): if "hosting" in config: ts.Disk.hosting_config.AddLine(config["hosting"]) ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cache', }) diff --git a/tests/gold_tests/cache/vary-handling.test.py b/tests/gold_tests/cache/vary-handling.test.py index 45b51414254..9f8b7bd7516 100644 --- a/tests/gold_tests/cache/vary-handling.test.py +++ b/tests/gold_tests/cache/vary-handling.test.py @@ -26,7 +26,7 @@ server = Test.MakeVerifierServerProcess("server", replay_file) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.insert_age_in_response': 0, 'proxy.config.cache.limits.http.max_alts': 4, diff --git a/tests/gold_tests/chunked_encoding/bad_chunked_encoding.test.py b/tests/gold_tests/chunked_encoding/bad_chunked_encoding.test.py index 6073d2607d5..41213230dfc 100644 --- a/tests/gold_tests/chunked_encoding/bad_chunked_encoding.test.py +++ b/tests/gold_tests/chunked_encoding/bad_chunked_encoding.test.py @@ -42,7 +42,7 @@ server.addResponse("sessionlog.json", request_header, response_header) -ts.Disk.records_config.update({'proxy.config.diags.debug.enabled': 0, 'proxy.config.diags.debug.tags': 'http'}) +ts.Disk.records_config.update({'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'http'}) ts.Disk.remap_config.AddLine('map / http://127.0.0.1:{0}'.format(server.Variables.Port)) @@ -90,7 +90,7 @@ def setupTS(self): self.ts.addDefaultSSLFiles() self.ts.Disk.records_config.update( { - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http", "proxy.config.ssl.server.cert.path": f'{self.ts.Variables.SSLDir}', "proxy.config.ssl.server.private_key.path": f'{self.ts.Variables.SSLDir}', @@ -148,7 +148,7 @@ def setupTS(self): self.ts.addDefaultSSLFiles() self.ts.Disk.records_config.update( { - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http", "proxy.config.ssl.server.cert.path": f'{self.ts.Variables.SSLDir}', "proxy.config.ssl.server.private_key.path": f'{self.ts.Variables.SSLDir}', diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py index ab47b5e12e5..5fce5be36c6 100644 --- a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py +++ b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py @@ -77,7 +77,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), @@ -221,7 +221,7 @@ def _configure_ts(self, tr: 'TestRun') -> 'Process': ts.Disk.remap_config.AddLine(f'map / http://backend.example.com:{port}/') ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.dns.nameservers': f'127.0.0.1:{self._dns.Variables.Port}', 'proxy.config.dns.resolv_conf': 'NULL' diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding_disabled.test.py b/tests/gold_tests/chunked_encoding/chunked_encoding_disabled.test.py index 8b7dc7cfed7..c7c0c17e847 100644 --- a/tests/gold_tests/chunked_encoding/chunked_encoding_disabled.test.py +++ b/tests/gold_tests/chunked_encoding/chunked_encoding_disabled.test.py @@ -35,7 +35,7 @@ def setupTS(self): self.ts.addDefaultSSLFiles() self.ts.Disk.records_config.update( { - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http", "proxy.config.ssl.server.cert.path": f'{self.ts.Variables.SSLDir}', "proxy.config.ssl.server.private_key.path": f'{self.ts.Variables.SSLDir}', diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py index 004267c2d60..38fa62c5e12 100644 --- a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py +++ b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py @@ -45,7 +45,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/client_connection/per_client_connection_max.test.py b/tests/gold_tests/client_connection/per_client_connection_max.test.py index 02548cfe5c9..32af051cfcf 100644 --- a/tests/gold_tests/client_connection/per_client_connection_max.test.py +++ b/tests/gold_tests/client_connection/per_client_connection_max.test.py @@ -125,7 +125,7 @@ def _configure_trafficserver(self) -> None: 'proxy.config.ssl.client.verify.server.policy': 'PERMISSIVE', 'proxy.config.dns.nameservers': f"127.0.0.1:{self._dns.Variables.Port}", 'proxy.config.dns.resolv_conf': 'NULL', - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'socket|http|net_queue|iocore_net|conn_track', 'proxy.config.net.per_client.max_connections_in': self._max_client_connections, # Disable keep-alive so we close the client connections when the diff --git a/tests/gold_tests/connect/connect.test.py b/tests/gold_tests/connect/connect.test.py index a49a9a33e7a..75024e9ebb3 100644 --- a/tests/gold_tests/connect/connect.test.py +++ b/tests/gold_tests/connect/connect.test.py @@ -46,7 +46,7 @@ def __setupTS(self): self.ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.server_ports': f"{self.ts.Variables.port} {self.ts.Variables.uds_path}", 'proxy.config.http.connect_ports': f"{self.httpbin.Variables.Port}", @@ -135,7 +135,7 @@ def setupTS(self): self.ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|iocore_net|rec', 'proxy.config.http.server_ports': f"{self.ts.Variables.port}", 'proxy.config.http.connect_ports': f"{self.server.Variables.http_port}", @@ -216,7 +216,7 @@ def setupTS(self): self.ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|hpack', 'proxy.config.ssl.server.cert.path': f'{self.ts.Variables.SSLDir}', 'proxy.config.ssl.server.private_key.path': f'{self.ts.Variables.SSLDir}', diff --git a/tests/gold_tests/cont_schedule/schedule_every_on_entire_pool.test.py b/tests/gold_tests/cont_schedule/schedule_every_on_entire_pool.test.py index a63a3f3817c..3e398019869 100644 --- a/tests/gold_tests/cont_schedule/schedule_every_on_entire_pool.test.py +++ b/tests/gold_tests/cont_schedule/schedule_every_on_entire_pool.test.py @@ -34,7 +34,7 @@ 'proxy.config.exec_thread.limit': 32, 'proxy.config.accept_threads': 1, 'proxy.config.task_threads': 2, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'TSContSchedule_test' }) diff --git a/tests/gold_tests/cont_schedule/schedule_every_on_pool.test.py b/tests/gold_tests/cont_schedule/schedule_every_on_pool.test.py index d0db9097339..ba9f4199fe8 100644 --- a/tests/gold_tests/cont_schedule/schedule_every_on_pool.test.py +++ b/tests/gold_tests/cont_schedule/schedule_every_on_pool.test.py @@ -33,7 +33,7 @@ 'proxy.config.exec_thread.limit': 32, 'proxy.config.accept_threads': 1, 'proxy.config.task_threads': 2, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'TSContSchedule_test' }) diff --git a/tests/gold_tests/cont_schedule/schedule_every_on_thread.test.py b/tests/gold_tests/cont_schedule/schedule_every_on_thread.test.py index 659a0710735..c0767f6f8bf 100644 --- a/tests/gold_tests/cont_schedule/schedule_every_on_thread.test.py +++ b/tests/gold_tests/cont_schedule/schedule_every_on_thread.test.py @@ -33,7 +33,7 @@ 'proxy.config.exec_thread.limit': 32, 'proxy.config.accept_threads': 1, 'proxy.config.task_threads': 2, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'TSContSchedule_test' }) diff --git a/tests/gold_tests/cont_schedule/schedule_on_entire_pool.test.py b/tests/gold_tests/cont_schedule/schedule_on_entire_pool.test.py index c199db600d6..c51da823c89 100644 --- a/tests/gold_tests/cont_schedule/schedule_on_entire_pool.test.py +++ b/tests/gold_tests/cont_schedule/schedule_on_entire_pool.test.py @@ -34,7 +34,7 @@ 'proxy.config.exec_thread.limit': 32, 'proxy.config.accept_threads': 1, 'proxy.config.task_threads': 2, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'TSContSchedule_test' }) diff --git a/tests/gold_tests/cont_schedule/schedule_on_pool.test.py b/tests/gold_tests/cont_schedule/schedule_on_pool.test.py index 8e1d849f697..0478a7b407b 100644 --- a/tests/gold_tests/cont_schedule/schedule_on_pool.test.py +++ b/tests/gold_tests/cont_schedule/schedule_on_pool.test.py @@ -33,7 +33,7 @@ 'proxy.config.exec_thread.limit': 32, 'proxy.config.accept_threads': 1, 'proxy.config.task_threads': 2, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'TSContSchedule_test' }) diff --git a/tests/gold_tests/cont_schedule/schedule_on_thread.test.py b/tests/gold_tests/cont_schedule/schedule_on_thread.test.py index 2ee59815f33..f935fe90475 100644 --- a/tests/gold_tests/cont_schedule/schedule_on_thread.test.py +++ b/tests/gold_tests/cont_schedule/schedule_on_thread.test.py @@ -33,7 +33,7 @@ 'proxy.config.exec_thread.limit': 32, 'proxy.config.accept_threads': 1, 'proxy.config.task_threads': 2, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'TSContSchedule_test' }) diff --git a/tests/gold_tests/cont_schedule/thread_affinity.test.py b/tests/gold_tests/cont_schedule/thread_affinity.test.py index d8919d4d4f5..be09946b44b 100644 --- a/tests/gold_tests/cont_schedule/thread_affinity.test.py +++ b/tests/gold_tests/cont_schedule/thread_affinity.test.py @@ -33,7 +33,7 @@ 'proxy.config.exec_thread.limit': 32, 'proxy.config.accept_threads': 1, 'proxy.config.task_threads': 2, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'TSContSchedule_test' }) diff --git a/tests/gold_tests/continuations/double.test.py b/tests/gold_tests/continuations/double.test.py index 24053fd1706..3a1de2c2308 100644 --- a/tests/gold_tests/continuations/double.test.py +++ b/tests/gold_tests/continuations/double.test.py @@ -44,7 +44,7 @@ ts.Disk.remap_config.AddLine('map / http://127.0.0.1:{0}'.format(server.Variables.Port)) ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'continuations_verify.*', }) diff --git a/tests/gold_tests/continuations/double_h2.test.py b/tests/gold_tests/continuations/double_h2.test.py index cb81c2d83a7..d4a8c744d0a 100644 --- a/tests/gold_tests/continuations/double_h2.test.py +++ b/tests/gold_tests/continuations/double_h2.test.py @@ -52,7 +52,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'continuations_verify', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/continuations/openclose.test.py b/tests/gold_tests/continuations/openclose.test.py index df7ce0bbdb2..c6210dba5f2 100644 --- a/tests/gold_tests/continuations/openclose.test.py +++ b/tests/gold_tests/continuations/openclose.test.py @@ -44,7 +44,7 @@ server.addResponse("sessionfile.log", request_header, response_header) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'ssntxnorder_verify.*', 'proxy.config.cache.enable_read_while_writer': 0 }) diff --git a/tests/gold_tests/continuations/openclose_h2.test.py b/tests/gold_tests/continuations/openclose_h2.test.py index 8cbeb010553..a9a2a58e1f3 100644 --- a/tests/gold_tests/continuations/openclose_h2.test.py +++ b/tests/gold_tests/continuations/openclose_h2.test.py @@ -51,7 +51,7 @@ ts.Disk.records_config.update( { 'proxy.config.http2.zombie_debug_timeout_in': 10, - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'ssntxnorder_verify', 'proxy.config.cache.enable_read_while_writer': 0, 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/continuations/session_id.test.py b/tests/gold_tests/continuations/session_id.test.py index 5c20d025587..a2151bcf86c 100644 --- a/tests/gold_tests/continuations/session_id.test.py +++ b/tests/gold_tests/continuations/session_id.test.py @@ -44,7 +44,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'session_id_verify', 'proxy.config.cache.enable_read_while_writer': 0, 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/dns/dns_down_nameserver.test.py b/tests/gold_tests/dns/dns_down_nameserver.test.py index 495b190a7b6..a8423fce0d8 100644 --- a/tests/gold_tests/dns/dns_down_nameserver.test.py +++ b/tests/gold_tests/dns/dns_down_nameserver.test.py @@ -68,7 +68,7 @@ def _configure_traffic_server(self): self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'hostdb|dns', 'proxy.config.dns.nameservers': f'127.0.0.1:{self._dns_port}', 'proxy.config.dns.resolv_conf': 'NULL' diff --git a/tests/gold_tests/dns/dns_host_down.test.py b/tests/gold_tests/dns/dns_host_down.test.py index 74930c75443..769ffcc15f6 100644 --- a/tests/gold_tests/dns/dns_host_down.test.py +++ b/tests/gold_tests/dns/dns_host_down.test.py @@ -40,7 +40,7 @@ def _configure_trafficserver(self): self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'hostdb|dns|http|socket', 'proxy.config.http.connect_attempts_max_retries': 0, 'proxy.config.http.connect_attempts_rr_retries': 0, diff --git a/tests/gold_tests/dns/dns_reverse_lookup.test.py b/tests/gold_tests/dns/dns_reverse_lookup.test.py index e56937c6415..11994507f1a 100644 --- a/tests/gold_tests/dns/dns_reverse_lookup.test.py +++ b/tests/gold_tests/dns/dns_reverse_lookup.test.py @@ -56,7 +56,7 @@ def _configure_trafficserver(self): self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'hostdb|dns|http', 'proxy.config.http.connect_attempts_max_retries': 0, 'proxy.config.http.connect_attempts_rr_retries': 0, diff --git a/tests/gold_tests/dns/dns_ttl.test.py b/tests/gold_tests/dns/dns_ttl.test.py index f6c32462a9c..be99bc4ead2 100644 --- a/tests/gold_tests/dns/dns_ttl.test.py +++ b/tests/gold_tests/dns/dns_ttl.test.py @@ -70,7 +70,7 @@ def setupTS(self): self.dns_port = ports.get_port(self.ts, 'dns_port') self.ts.Disk.records_config.update( { - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "dns", 'proxy.config.dns.nameservers': f'127.0.0.1:{self.dns_port}', 'proxy.config.dns.resolv_conf': 'NULL', diff --git a/tests/gold_tests/dns/splitdns.test.py b/tests/gold_tests/dns/splitdns.test.py index c6f20311763..4bc7a49ff57 100644 --- a/tests/gold_tests/dns/splitdns.test.py +++ b/tests/gold_tests/dns/splitdns.test.py @@ -41,7 +41,7 @@ def setupTS(self): self.ts.Disk.records_config.update( { "proxy.config.dns.splitDNS.enabled": 1, - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "dns|splitdns", }) self.ts.Disk.splitdns_config.AddLine(f"dest_domain=foo.ts.a.o named=127.0.0.1:{self.dns.Variables.Port}") diff --git a/tests/gold_tests/early_hints/early_hints.test.py b/tests/gold_tests/early_hints/early_hints.test.py index 84c7a760edf..98a03b88922 100644 --- a/tests/gold_tests/early_hints/early_hints.test.py +++ b/tests/gold_tests/early_hints/early_hints.test.py @@ -98,7 +98,7 @@ def _configure_ts(self, tr: 'TestRun'): 'proxy.config.ssl.server.private_key.path': ts.Variables.SSLDir, 'proxy.config.dns.nameservers': f'127.0.0.1:{self._dns.Variables.Port}', 'proxy.config.dns.resolv_conf': 'NULL', - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', }) return ts diff --git a/tests/gold_tests/forward_proxy/forward_proxy.test.py b/tests/gold_tests/forward_proxy/forward_proxy.test.py index 49dd714bed8..6fb60eba060 100644 --- a/tests/gold_tests/forward_proxy/forward_proxy.test.py +++ b/tests/gold_tests/forward_proxy/forward_proxy.test.py @@ -67,7 +67,7 @@ def setupTS(self): 'proxy.config.ssl.server.cert.path': self.ts.Variables.SSLDir, 'proxy.config.ssl.server.private_key.path': self.ts.Variables.SSLDir, 'proxy.config.ssl.client.verify.server.policy': 'PERMISSIVE', - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': "http", }) diff --git a/tests/gold_tests/h2/grpc/grpc.test.py b/tests/gold_tests/h2/grpc/grpc.test.py index 72c52498102..c0e28e0e5dd 100644 --- a/tests/gold_tests/h2/grpc/grpc.test.py +++ b/tests/gold_tests/h2/grpc/grpc.test.py @@ -69,7 +69,7 @@ def _configure_traffic_server(self, tr: 'TestRun', dns_port: int, server_port: i # Disable debug logging to avoid excessive log file size. I keep # it here for convenience of use during manual debugging. - "proxy.config.diags.debug.enabled": 0, + "proxy.config.diags.debug.mode": 0, "proxy.config.diags.debug.tags": "http", # The Python gRPC module uses many WINDO_UPDATE frames of small diff --git a/tests/gold_tests/h2/h2disable.test.py b/tests/gold_tests/h2/h2disable.test.py index 9e645419e08..531725e103d 100644 --- a/tests/gold_tests/h2/h2disable.test.py +++ b/tests/gold_tests/h2/h2disable.test.py @@ -41,7 +41,7 @@ # override for foo.com policy=enforced properties=all ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'http|ssl', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/h2/h2disable_no_accept_threads.test.py b/tests/gold_tests/h2/h2disable_no_accept_threads.test.py index 3fc0a1d5020..e7226baee8c 100644 --- a/tests/gold_tests/h2/h2disable_no_accept_threads.test.py +++ b/tests/gold_tests/h2/h2disable_no_accept_threads.test.py @@ -41,7 +41,7 @@ # override for foo.com policy=enforced properties=all ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'http|ssl', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/h2/h2enable.test.py b/tests/gold_tests/h2/h2enable.test.py index 36eb2fc7618..a2376fec349 100644 --- a/tests/gold_tests/h2/h2enable.test.py +++ b/tests/gold_tests/h2/h2enable.test.py @@ -40,7 +40,7 @@ # Set up port 4444 with HTTP1 only, no HTTP/2 ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'http|ssl', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/h2/h2enable_no_accept_threads.test.py b/tests/gold_tests/h2/h2enable_no_accept_threads.test.py index c07aceec66b..14e67b348bc 100644 --- a/tests/gold_tests/h2/h2enable_no_accept_threads.test.py +++ b/tests/gold_tests/h2/h2enable_no_accept_threads.test.py @@ -40,7 +40,7 @@ # Set up port 4444 with HTTP1 only, no HTTP/2 ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'http|ssl', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/h2/h2get_with_body.test.py b/tests/gold_tests/h2/h2get_with_body.test.py index 365be4b5278..f43a8dd8a88 100644 --- a/tests/gold_tests/h2/h2get_with_body.test.py +++ b/tests/gold_tests/h2/h2get_with_body.test.py @@ -45,7 +45,7 @@ 'proxy.config.ssl.server.private_key.path': f"{ts.Variables.SSLDir}", 'proxy.config.ssl.client.alpn_protocols': 'h2,http/1.1', 'proxy.config.ssl.client.verify.server.policy': 'PERMISSIVE', - "proxy.config.diags.debug.enabled": 3, + "proxy.config.diags.debug.mode": 3, "proxy.config.diags.debug.tags": "http", }) diff --git a/tests/gold_tests/h2/h2origin.test.py b/tests/gold_tests/h2/h2origin.test.py index 24e92b553e9..ba4ce9f7af3 100644 --- a/tests/gold_tests/h2/h2origin.test.py +++ b/tests/gold_tests/h2/h2origin.test.py @@ -37,7 +37,7 @@ { 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.exec_thread.autoconfig.enabled': 0, # Allow for more parallelism diff --git a/tests/gold_tests/h2/h2origin_single_thread.test.py b/tests/gold_tests/h2/h2origin_single_thread.test.py index d8d5e468570..a1f6608b729 100644 --- a/tests/gold_tests/h2/h2origin_single_thread.test.py +++ b/tests/gold_tests/h2/h2origin_single_thread.test.py @@ -36,7 +36,7 @@ { 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.exec_thread.autoconfig.enabled': 0, # Limiting ourselves to 1 thread to exercise origin reuse diff --git a/tests/gold_tests/h2/h2spec.test.py b/tests/gold_tests/h2/h2spec.test.py index 58031233628..3345ed173f1 100644 --- a/tests/gold_tests/h2/h2spec.test.py +++ b/tests/gold_tests/h2/h2spec.test.py @@ -45,7 +45,7 @@ 'proxy.config.http.insert_response_via_str': 1, 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', }) diff --git a/tests/gold_tests/h2/http2.test.py b/tests/gold_tests/h2/http2.test.py index 1635615ddaa..d68e63ee1c9 100644 --- a/tests/gold_tests/h2/http2.test.py +++ b/tests/gold_tests/h2/http2.test.py @@ -142,7 +142,7 @@ ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key') ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/h2/http2_close_connection.test.py b/tests/gold_tests/h2/http2_close_connection.test.py index fd69360a32f..71718816ec3 100644 --- a/tests/gold_tests/h2/http2_close_connection.test.py +++ b/tests/gold_tests/h2/http2_close_connection.test.py @@ -34,7 +34,7 @@ 'proxy.config.ssl.server.cert.path': f'{ts.Variables.SSLDir}', 'proxy.config.ssl.server.private_key.path': f'{ts.Variables.SSLDir}', 'proxy.config.ssl.client.verify.server.policy': 'PERMISSIVE', - 'proxy.config.diags.debug.enabled': 3, + 'proxy.config.diags.debug.mode': 3, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.exec_thread.autoconfig.enabled': 0, 'proxy.config.exec_thread.limit': 4, diff --git a/tests/gold_tests/h2/http2_empty_data_frame.test.py b/tests/gold_tests/h2/http2_empty_data_frame.test.py index d0e90389116..36526786c84 100644 --- a/tests/gold_tests/h2/http2_empty_data_frame.test.py +++ b/tests/gold_tests/h2/http2_empty_data_frame.test.py @@ -36,7 +36,7 @@ def __setupTS(self): self._ts.addDefaultSSLFiles() self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http2', 'proxy.config.ssl.server.cert.path': f"{self._ts.Variables.SSLDir}", 'proxy.config.ssl.server.private_key.path': f"{self._ts.Variables.SSLDir}", diff --git a/tests/gold_tests/h2/http2_flow_control.test.py b/tests/gold_tests/h2/http2_flow_control.test.py index 1d000c85509..0d7616bfe7a 100644 --- a/tests/gold_tests/h2/http2_flow_control.test.py +++ b/tests/gold_tests/h2/http2_flow_control.test.py @@ -128,7 +128,7 @@ def _configure_trafficserver(self, tr: 'TestRun', is_outbound: bool, server_type 'proxy.config.dns.nameservers': '127.0.0.1:{0}'.format(self._dns.Variables.Port), 'proxy.config.dns.resolv_conf': 'NULL', 'proxy.config.http.insert_age_in_response': 0, - 'proxy.config.diags.debug.enabled': 3, + 'proxy.config.diags.debug.mode': 3, 'proxy.config.diags.debug.tags': 'http', }) diff --git a/tests/gold_tests/h2/http2_priority.test.py b/tests/gold_tests/h2/http2_priority.test.py index 64b58c3fdb8..1431220f3b8 100644 --- a/tests/gold_tests/h2/http2_priority.test.py +++ b/tests/gold_tests/h2/http2_priority.test.py @@ -59,7 +59,7 @@ 'proxy.config.http2.no_activity_timeout_in': 3, 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http2', }) diff --git a/tests/gold_tests/h2/http2_rst_stream.test.py b/tests/gold_tests/h2/http2_rst_stream.test.py index caf2a711412..e4fb63db4fe 100644 --- a/tests/gold_tests/h2/http2_rst_stream.test.py +++ b/tests/gold_tests/h2/http2_rst_stream.test.py @@ -36,7 +36,7 @@ 'proxy.config.ssl.server.cert.path': f'{ts.Variables.SSLDir}', 'proxy.config.ssl.server.private_key.path': f'{ts.Variables.SSLDir}', 'proxy.config.ssl.client.verify.server.policy': 'PERMISSIVE', - 'proxy.config.diags.debug.enabled': 3, + 'proxy.config.diags.debug.mode': 3, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.exec_thread.autoconfig.enabled': 0, 'proxy.config.exec_thread.limit': 4, @@ -80,7 +80,7 @@ 'proxy.config.ssl.server.cert.path': f'{ts.Variables.SSLDir}', 'proxy.config.ssl.server.private_key.path': f'{ts.Variables.SSLDir}', 'proxy.config.ssl.client.verify.server.policy': 'PERMISSIVE', - 'proxy.config.diags.debug.enabled': 3, + 'proxy.config.diags.debug.mode': 3, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.exec_thread.autoconfig.enabled': 0, 'proxy.config.exec_thread.limit': 4, @@ -124,7 +124,7 @@ 'proxy.config.ssl.server.cert.path': f'{ts.Variables.SSLDir}', 'proxy.config.ssl.server.private_key.path': f'{ts.Variables.SSLDir}', 'proxy.config.ssl.client.verify.server.policy': 'PERMISSIVE', - 'proxy.config.diags.debug.enabled': 3, + 'proxy.config.diags.debug.mode': 3, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.exec_thread.autoconfig.enabled': 0, 'proxy.config.exec_thread.limit': 1, diff --git a/tests/gold_tests/h2/http2_write_threshold.test.py b/tests/gold_tests/h2/http2_write_threshold.test.py index 694037a7a56..1841336d194 100644 --- a/tests/gold_tests/h2/http2_write_threshold.test.py +++ b/tests/gold_tests/h2/http2_write_threshold.test.py @@ -108,7 +108,7 @@ def _configure_traffic_server( # Only enable debug logging during manual exectution. All the # DATA frames get multiple logs and it makes the traffic.out too # unwieldy. - "proxy.config.diags.debug.enabled": 0, + "proxy.config.diags.debug.mode": 0, "proxy.config.diags.debug.tags": "http", }) return self._ts diff --git a/tests/gold_tests/h2/httpbin.test.py b/tests/gold_tests/h2/httpbin.test.py index f567efa2413..858b4ea3a03 100644 --- a/tests/gold_tests/h2/httpbin.test.py +++ b/tests/gold_tests/h2/httpbin.test.py @@ -53,7 +53,7 @@ 'proxy.config.http.insert_response_via_str': 1, 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', }) ts.Disk.logging_yaml.AddLines( diff --git a/tests/gold_tests/h2/nghttp.test.py b/tests/gold_tests/h2/nghttp.test.py index 7abae7e80de..4282d16beeb 100644 --- a/tests/gold_tests/h2/nghttp.test.py +++ b/tests/gold_tests/h2/nghttp.test.py @@ -56,7 +56,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http2_cs', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir) diff --git a/tests/gold_tests/h3/h3_sni_check.test.py b/tests/gold_tests/h3/h3_sni_check.test.py index 4ac57c66206..a425f5b7720 100644 --- a/tests/gold_tests/h3/h3_sni_check.test.py +++ b/tests/gold_tests/h3/h3_sni_check.test.py @@ -70,7 +70,7 @@ def _configure_traffic_server(self, tr: 'TestRun'): self._ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key') self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.quic.no_activity_timeout_in': 0, diff --git a/tests/gold_tests/headers/accept_webp.test.py b/tests/gold_tests/headers/accept_webp.test.py index 249534a1d12..1503fe77c44 100644 --- a/tests/gold_tests/headers/accept_webp.test.py +++ b/tests/gold_tests/headers/accept_webp.test.py @@ -45,7 +45,7 @@ # ATS Configuration ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http_match', 'proxy.config.http.cache.ignore_accept_mismatch': 0, 'proxy.config.http.insert_response_via_str': 3, diff --git a/tests/gold_tests/headers/cache_and_req_body.test.py b/tests/gold_tests/headers/cache_and_req_body.test.py index b7102056b5e..f809f4edbd7 100644 --- a/tests/gold_tests/headers/cache_and_req_body.test.py +++ b/tests/gold_tests/headers/cache_and_req_body.test.py @@ -42,7 +42,7 @@ ts.Disk.plugin_config.AddLine('xdebug.so --enable=x-cache,x-cache-key,via') ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.response_via_str': 3, }) diff --git a/tests/gold_tests/headers/cachedDuplicateHeaders.test.py b/tests/gold_tests/headers/cachedDuplicateHeaders.test.py index c3c6be98d7f..b06df7b8ef1 100644 --- a/tests/gold_tests/headers/cachedDuplicateHeaders.test.py +++ b/tests/gold_tests/headers/cachedDuplicateHeaders.test.py @@ -39,7 +39,7 @@ def setupTS(self): self.ts.Disk.plugin_config.AddLine('xdebug.so --enable=x-cache,x-cache-key,via') self.ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.response_via_str': 3, }) diff --git a/tests/gold_tests/headers/cachedIMSRange.test.py b/tests/gold_tests/headers/cachedIMSRange.test.py index 64af159c9f1..e37bdc1b7b4 100644 --- a/tests/gold_tests/headers/cachedIMSRange.test.py +++ b/tests/gold_tests/headers/cachedIMSRange.test.py @@ -112,7 +112,7 @@ ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key') ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.response_via_str': 3, 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/headers/domain-blacklist-30x.test.py b/tests/gold_tests/headers/domain-blacklist-30x.test.py index d46bdf39588..320b706924d 100644 --- a/tests/gold_tests/headers/domain-blacklist-30x.test.py +++ b/tests/gold_tests/headers/domain-blacklist-30x.test.py @@ -36,7 +36,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'header_rewrite|dbg_header_rewrite', 'proxy.config.body_factory.enable_logging': 1, }) diff --git a/tests/gold_tests/headers/forwarded.test.py b/tests/gold_tests/headers/forwarded.test.py index 8add15e404a..8f5237d574b 100644 --- a/tests/gold_tests/headers/forwarded.test.py +++ b/tests/gold_tests/headers/forwarded.test.py @@ -92,7 +92,7 @@ def baselineTsSetup(ts): ts.Disk.records_config.update( { - # 'proxy.config.diags.debug.enabled': 1, + # 'proxy.config.diags.debug.mode': 1, 'proxy.config.url_remap.pristine_host_hdr': 1, # Retain Host header in original incoming client request. 'proxy.config.proxy_name': 'Poxy_Proxy', # This will be the server name. 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), @@ -189,7 +189,7 @@ def TestHttp1_1(host): ts2.Disk.records_config.update( { - # 'proxy.config.diags.debug.enabled': 1, + # 'proxy.config.diags.debug.mode': 1, 'proxy.config.url_remap.pristine_host_hdr': 1, # Retain Host header in original incoming client request. 'proxy.config.http.insert_forwarded': 'by=uuid' }) diff --git a/tests/gold_tests/headers/good_request_after_bad.test.py b/tests/gold_tests/headers/good_request_after_bad.test.py index 44aeb4e2855..1a3f436376e 100644 --- a/tests/gold_tests/headers/good_request_after_bad.test.py +++ b/tests/gold_tests/headers/good_request_after_bad.test.py @@ -28,7 +28,7 @@ ts.Disk.records_config.update( { 'proxy.config.diags.debug.tags': 'http', - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.http.strict_uri_parsing': 1 }) @@ -37,7 +37,7 @@ ts2.Disk.records_config.update( { 'proxy.config.diags.debug.tags': 'http', - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.http.strict_uri_parsing': 2 }) diff --git a/tests/gold_tests/headers/hsts.test.py b/tests/gold_tests/headers/hsts.test.py index e5438325165..a8a126f245d 100644 --- a/tests/gold_tests/headers/hsts.test.py +++ b/tests/gold_tests/headers/hsts.test.py @@ -38,7 +38,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/headers/invalid_range_header.test.py b/tests/gold_tests/headers/invalid_range_header.test.py index 50ec09d9bae..c3820d6f2c8 100644 --- a/tests/gold_tests/headers/invalid_range_header.test.py +++ b/tests/gold_tests/headers/invalid_range_header.test.py @@ -38,7 +38,7 @@ def setupTS(self): self.ts = Test.MakeATSProcess("ts1") self.ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.cache.http': 1, 'proxy.config.http.cache.range.write': 1, diff --git a/tests/gold_tests/headers/normalize_ae.test.py b/tests/gold_tests/headers/normalize_ae.test.py index 313023150d6..dec81924199 100644 --- a/tests/gold_tests/headers/normalize_ae.test.py +++ b/tests/gold_tests/headers/normalize_ae.test.py @@ -49,7 +49,7 @@ def baselineTsSetup(ts): ts.Disk.records_config.update({ - # 'proxy.config.diags.debug.enabled': 1, + # 'proxy.config.diags.debug.mode': 1, }) ts.Disk.remap_config.AddLine('map http://www.no-oride.com http://127.0.0.1:{0}'.format(server.Variables.Port)) diff --git a/tests/gold_tests/headers/normalized_ae_match_vary_cache.test.py b/tests/gold_tests/headers/normalized_ae_match_vary_cache.test.py index 991d2fda32b..96be8247058 100644 --- a/tests/gold_tests/headers/normalized_ae_match_vary_cache.test.py +++ b/tests/gold_tests/headers/normalized_ae_match_vary_cache.test.py @@ -48,7 +48,7 @@ ts.Disk.plugin_config.AddLine('xdebug.so --enable=x-cache') ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.response_via_str': 3, # the following variables could affect the results of alternate cache matching, diff --git a/tests/gold_tests/headers/range.test.py b/tests/gold_tests/headers/range.test.py index 32b94c66645..758d539c5fd 100644 --- a/tests/gold_tests/headers/range.test.py +++ b/tests/gold_tests/headers/range.test.py @@ -99,7 +99,7 @@ def curl_range(ts, path="", ifrange=None, start=1, end=5): "proxy.config.http.insert_age_in_response": 0, "proxy.config.http.request_via_str": 0, "proxy.config.http.response_via_str": 0, - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http", }) @@ -123,7 +123,7 @@ def curl_range(ts, path="", ifrange=None, start=1, end=5): "proxy.config.http.cache.range.write": 1, "proxy.config.http.response_via_str": 3, "proxy.config.http.wait_for_cache": 1, - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http", }) # ---- diff --git a/tests/gold_tests/ip_allow/ip_allow.test.py b/tests/gold_tests/ip_allow/ip_allow.test.py index c6e7c7c4fec..6416235761b 100644 --- a/tests/gold_tests/ip_allow/ip_allow.test.py +++ b/tests/gold_tests/ip_allow/ip_allow.test.py @@ -84,7 +84,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ip_allow', 'proxy.config.http.push_method_enabled': 1, 'proxy.config.http.connect_ports': '{0}'.format(server.Variables.SSL_Port), @@ -251,7 +251,7 @@ def _configure_traffic_server(self, tr: 'TestRun'): self._ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key') self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'v_quic|quic|http|ip_allow|proxyprotocol', 'proxy.config.http.push_method_enabled': 1, 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/ip_allow/ip_allow_pp_uds.test.py b/tests/gold_tests/ip_allow/ip_allow_pp_uds.test.py index 9bea8b10c93..5821045c124 100644 --- a/tests/gold_tests/ip_allow/ip_allow_pp_uds.test.py +++ b/tests/gold_tests/ip_allow/ip_allow_pp_uds.test.py @@ -84,7 +84,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ip_allow', 'proxy.config.http.push_method_enabled': 1, 'proxy.config.http.connect_ports': '{0}'.format(server.Variables.SSL_Port), @@ -192,7 +192,7 @@ def _configure_traffic_server(self, tr: 'TestRun'): self._ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key') self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'v_quic|quic|http|proxyprotocol|ip_allow', 'proxy.config.http.push_method_enabled': 1, 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/ip_allow/ip_category.test.py b/tests/gold_tests/ip_allow/ip_category.test.py index 76a8c1b7735..b7049bfda8b 100644 --- a/tests/gold_tests/ip_allow/ip_category.test.py +++ b/tests/gold_tests/ip_allow/ip_category.test.py @@ -221,7 +221,7 @@ def _configure_traffic_server(self) -> None: ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key') ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|ip_allow', 'proxy.config.cache.ip_categories.filename': Test_ip_category._categories_filename, 'proxy.config.http.push_method_enabled': 1, diff --git a/tests/gold_tests/jsonrpc/basic_plugin_handler.test.py b/tests/gold_tests/jsonrpc/basic_plugin_handler.test.py index 222dbfa3c92..3d27e25df8b 100644 --- a/tests/gold_tests/jsonrpc/basic_plugin_handler.test.py +++ b/tests/gold_tests/jsonrpc/basic_plugin_handler.test.py @@ -29,7 +29,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'rpc|jsonrpc_plugin_handler_test' }) diff --git a/tests/gold_tests/jsonrpc/jsonrpc_api_schema.test.py b/tests/gold_tests/jsonrpc/jsonrpc_api_schema.test.py index e6532e59478..33b954a49c4 100644 --- a/tests/gold_tests/jsonrpc/jsonrpc_api_schema.test.py +++ b/tests/gold_tests/jsonrpc/jsonrpc_api_schema.test.py @@ -92,7 +92,7 @@ def add_testrun_for_jsonrpc_request( ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'rpc|filemanager|http|cache', 'proxy.config.jsonrpc.filename': "jsonrpc.yaml", # We will be using this record to tests some RPC API. }) diff --git a/tests/gold_tests/logging/all_headers.test.py b/tests/gold_tests/logging/all_headers.test.py index d6f6fff74fc..377e9f16d19 100644 --- a/tests/gold_tests/logging/all_headers.test.py +++ b/tests/gold_tests/logging/all_headers.test.py @@ -42,13 +42,13 @@ if Condition.CurlUsingUnixDomainSocket(): ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'http|dns', 'proxy.config.http.insert_forwarded': 'for', }) else: ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'http|dns', }) diff --git a/tests/gold_tests/logging/log-debug-client-ip.test.py b/tests/gold_tests/logging/log-debug-client-ip.test.py index 4516fb893c5..260feccac03 100644 --- a/tests/gold_tests/logging/log-debug-client-ip.test.py +++ b/tests/gold_tests/logging/log-debug-client-ip.test.py @@ -29,7 +29,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 2, + 'proxy.config.diags.debug.mode': 2, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.diags.debug.client_ip': '127.0.0.1', 'proxy.config.dns.nameservers': f"127.0.0.1:{nameserver.Variables.Port}", diff --git a/tests/gold_tests/logging/log-filenames.test.py b/tests/gold_tests/logging/log-filenames.test.py index a4fdbc73b38..c5d797c3a21 100644 --- a/tests/gold_tests/logging/log-filenames.test.py +++ b/tests/gold_tests/logging/log-filenames.test.py @@ -65,7 +65,7 @@ def __configure_traffic_server(self, log_data): self.ts = Test.MakeATSProcess(self._ts_name, use_traffic_out=False, log_data=log_data) self.ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'log', 'proxy.config.log.periodic_tasks_interval': 1, }) diff --git a/tests/gold_tests/logging/log-filter.test.py b/tests/gold_tests/logging/log-filter.test.py index 9de7d74146a..b2ef71de44f 100644 --- a/tests/gold_tests/logging/log-filter.test.py +++ b/tests/gold_tests/logging/log-filter.test.py @@ -29,7 +29,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'log', 'proxy.config.net.connections_throttle': 100, 'proxy.config.dns.nameservers': f"127.0.0.1:{nameserver.Variables.Port}", diff --git a/tests/gold_tests/logging/log_pipe.test.py b/tests/gold_tests/logging/log_pipe.test.py index e550b75b5e3..84561821631 100644 --- a/tests/gold_tests/logging/log_pipe.test.py +++ b/tests/gold_tests/logging/log_pipe.test.py @@ -37,7 +37,7 @@ def get_ts(logging_config): ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'log-file', 'proxy.config.log.max_secs_per_buffer': 1, }) diff --git a/tests/gold_tests/logging/log_retention.test.py b/tests/gold_tests/logging/log_retention.test.py index 1ac46931bd5..4c81d25be66 100644 --- a/tests/gold_tests/logging/log_retention.test.py +++ b/tests/gold_tests/logging/log_retention.test.py @@ -34,11 +34,11 @@ class TestLogRetention: __base_records_config = { # Do not accept connections from clients until cache subsystem is operational. - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'logspace', # Enable log rotation and auto-deletion, the subjects of this test. - 'proxy.config.log.rolling_enabled': 3, + 'proxy.config.log.rolling.mode': 3, 'proxy.config.log.auto_delete_rolled_files': 1, # 10 MB is the minimum rolling size. diff --git a/tests/gold_tests/logging/new_log_flds.test.py b/tests/gold_tests/logging/new_log_flds.test.py index 7cc9eb338e4..0dbfe07b38b 100644 --- a/tests/gold_tests/logging/new_log_flds.test.py +++ b/tests/gold_tests/logging/new_log_flds.test.py @@ -39,7 +39,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'snowflake|http', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/logging/sigusr2.test.py b/tests/gold_tests/logging/sigusr2.test.py index 397119ab2b5..e126778efc7 100644 --- a/tests/gold_tests/logging/sigusr2.test.py +++ b/tests/gold_tests/logging/sigusr2.test.py @@ -42,12 +42,12 @@ def __configure_traffic_server(self): self.ts.Disk.records_config.update( { 'proxy.config.http.wait_for_cache': 1, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'log', 'proxy.config.log.periodic_tasks_interval': 1, # All log rotation should be handled externally. - 'proxy.config.log.rolling_enabled': 0, + 'proxy.config.log.rolling.mode': 0, 'proxy.config.log.auto_delete_rolled_files': 0, }) diff --git a/tests/gold_tests/next_hop/parent_config/parent_config_dest_ip.test.py b/tests/gold_tests/next_hop/parent_config/parent_config_dest_ip.test.py index 8359ded6018..ba38b37450d 100644 --- a/tests/gold_tests/next_hop/parent_config/parent_config_dest_ip.test.py +++ b/tests/gold_tests/next_hop/parent_config/parent_config_dest_ip.test.py @@ -71,7 +71,7 @@ ts1.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|hostdb|parent', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", 'proxy.config.dns.resolv_conf': "NULL", @@ -88,7 +88,7 @@ ts0.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|hostdb|parent', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", 'proxy.config.dns.resolv_conf': "NULL", diff --git a/tests/gold_tests/next_hop/strategies_ch/strategies_ch.test.py b/tests/gold_tests/next_hop/strategies_ch/strategies_ch.test.py index a20bef02ef2..63b14334e6f 100644 --- a/tests/gold_tests/next_hop/strategies_ch/strategies_ch.test.py +++ b/tests/gold_tests/next_hop/strategies_ch/strategies_ch.test.py @@ -53,7 +53,7 @@ ts = Test.MakeATSProcess(f"ts_nh{i}", use_traffic_out=False, command=f"traffic_server 2>nh_trace{i}.log") ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", 'proxy.config.dns.resolv_conf': "NULL", @@ -66,7 +66,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|parent|next_hop|host_statuses|hostdb', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", # Only nameservers if resolv_conf NULL. 'proxy.config.dns.resolv_conf': "NULL", # This defaults to /etc/resvolv.conf (OS namesevers) if not NULL. diff --git a/tests/gold_tests/next_hop/strategies_ch2/strategies_ch2.test.py b/tests/gold_tests/next_hop/strategies_ch2/strategies_ch2.test.py index 62615a5f411..5fa181f739f 100644 --- a/tests/gold_tests/next_hop/strategies_ch2/strategies_ch2.test.py +++ b/tests/gold_tests/next_hop/strategies_ch2/strategies_ch2.test.py @@ -53,7 +53,7 @@ ts = Test.MakeATSProcess(f"ts_nh{i}") ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", 'proxy.config.dns.resolv_conf': "NULL", @@ -66,7 +66,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|parent|next_hop|host_statuses|hostdb', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", # Only nameservers if resolv_conf NULL. 'proxy.config.dns.resolv_conf': "NULL", # This defaults to /etc/resvolv.conf (OS namesevers) if not NULL. diff --git a/tests/gold_tests/next_hop/strategies_stale/strategies_stale.test.py b/tests/gold_tests/next_hop/strategies_stale/strategies_stale.test.py index b5d52ea3441..acb8d389752 100644 --- a/tests/gold_tests/next_hop/strategies_stale/strategies_stale.test.py +++ b/tests/gold_tests/next_hop/strategies_stale/strategies_stale.test.py @@ -49,7 +49,7 @@ ts_nh = Test.MakeATSProcess(f"ts_nh0", use_traffic_out=False, command=f"traffic_server 2>nh_trace.log") ts_nh.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", 'proxy.config.dns.resolv_conf': "NULL", @@ -61,7 +61,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|parent|next_hop|host_statuses|hostdb', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", # Only nameservers if resolv_conf NULL. 'proxy.config.dns.resolv_conf': "NULL", # This defaults to /etc/resvolv.conf (OS namesevers) if not NULL. diff --git a/tests/gold_tests/next_hop/zzz_strategies_peer/zzz_strategies_peer.test.py b/tests/gold_tests/next_hop/zzz_strategies_peer/zzz_strategies_peer.test.py index 8e58908857c..2c44f8b84fc 100644 --- a/tests/gold_tests/next_hop/zzz_strategies_peer/zzz_strategies_peer.test.py +++ b/tests/gold_tests/next_hop/zzz_strategies_peer/zzz_strategies_peer.test.py @@ -57,7 +57,7 @@ dns.addRecords(records={f"ts_upstream{i}": ["127.0.0.1"]}) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", 'proxy.config.dns.resolv_conf': "NULL", @@ -79,7 +79,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|parent|next_hop|host_statuses|hostdb|cachekey', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", # Only nameservers if resolv_conf NULL. 'proxy.config.dns.resolv_conf': "NULL", # This defaults to /etc/resvolv.conf (OS namesevers) if not NULL. diff --git a/tests/gold_tests/next_hop/zzz_strategies_peer2/zzz_strategies_peer2.test.py b/tests/gold_tests/next_hop/zzz_strategies_peer2/zzz_strategies_peer2.test.py index 8aad4e61027..cc1520730d3 100644 --- a/tests/gold_tests/next_hop/zzz_strategies_peer2/zzz_strategies_peer2.test.py +++ b/tests/gold_tests/next_hop/zzz_strategies_peer2/zzz_strategies_peer2.test.py @@ -57,7 +57,7 @@ dns.addRecords(records={f"ts_upstream{i}": ["127.0.0.1"]}) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", 'proxy.config.dns.resolv_conf': "NULL", @@ -79,7 +79,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|parent|next_hop|host_statuses|hostdb', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", # Only nameservers if resolv_conf NULL. 'proxy.config.dns.resolv_conf': "NULL", # This defaults to /etc/resvolv.conf (OS namesevers) if not NULL. diff --git a/tests/gold_tests/null_transform/null_transform.test.py b/tests/gold_tests/null_transform/null_transform.test.py index ea1df92abef..52ec20ac69e 100644 --- a/tests/gold_tests/null_transform/null_transform.test.py +++ b/tests/gold_tests/null_transform/null_transform.test.py @@ -41,7 +41,7 @@ server.addResponse("sessionfile.log", request_header, response_header) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'null_transform' }) diff --git a/tests/gold_tests/origin_connection/per_server_connection_max.test.py b/tests/gold_tests/origin_connection/per_server_connection_max.test.py index 0a49a0df534..91193a535b0 100644 --- a/tests/gold_tests/origin_connection/per_server_connection_max.test.py +++ b/tests/gold_tests/origin_connection/per_server_connection_max.test.py @@ -49,7 +49,7 @@ def _configure_trafficserver(self) -> None: { 'proxy.config.dns.nameservers': f"127.0.0.1:{self._dns.Variables.Port}", 'proxy.config.dns.resolv_conf': 'NULL', - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|conn_track', 'proxy.config.http.per_server.connection.max': self._origin_max_connections, 'proxy.config.http.per_server.connection.metric_enabled': 1, @@ -113,7 +113,7 @@ def _configure_trafficserver(self, max_conn) -> None: { 'proxy.config.dns.nameservers': f"127.0.0.1:{self._dns.Variables.Port}", 'proxy.config.dns.resolv_conf': 'NULL', - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|hostdb|conn_track', 'proxy.config.http.server_ports': f"{self._ts.Variables.port} {self._ts.Variables.uds_path}", 'proxy.config.http.connect_ports': f"{self._server.Variables.Port}", diff --git a/tests/gold_tests/pipeline/pipeline.test.py b/tests/gold_tests/pipeline/pipeline.test.py index dea95511fb4..50df63f3844 100644 --- a/tests/gold_tests/pipeline/pipeline.test.py +++ b/tests/gold_tests/pipeline/pipeline.test.py @@ -101,7 +101,7 @@ def _configure_traffic_server(self, tr: 'TestRun', buffer_requests: bool) -> 'Pr ts.Disk.remap_config.AddLine(f'map / http://backend.server.com:{self._server.Variables.http_port}') ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|ip_allow', 'proxy.config.dns.nameservers': f'127.0.0.1:{self._dns.Variables.Port}', 'proxy.config.dns.resolv_conf': 'NULL', diff --git a/tests/gold_tests/pluginTest/TSVConnFd/TSVConnFd.test.py b/tests/gold_tests/pluginTest/TSVConnFd/TSVConnFd.test.py index 3913d8fa343..8a7fbfaf192 100644 --- a/tests/gold_tests/pluginTest/TSVConnFd/TSVConnFd.test.py +++ b/tests/gold_tests/pluginTest/TSVConnFd/TSVConnFd.test.py @@ -38,7 +38,7 @@ { 'proxy.config.proxy_name': 'Poxy_Proxy', # This will be the server name. 'proxy.config.url_remap.remap_required': 1, - 'proxy.config.diags.debug.enabled': 3, + 'proxy.config.diags.debug.mode': 3, 'proxy.config.diags.debug.tags': f'{plugin_name}', }) diff --git a/tests/gold_tests/pluginTest/access_control/access_control.test.py b/tests/gold_tests/pluginTest/access_control/access_control.test.py index 89d5d246f92..68efaaf36f0 100644 --- a/tests/gold_tests/pluginTest/access_control/access_control.test.py +++ b/tests/gold_tests/pluginTest/access_control/access_control.test.py @@ -42,7 +42,7 @@ def setupTS(self): self.ts.Disk.ssl_multicert_config.AddLine("dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key") self.ts.Disk.records_config.update( { - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http|access_control", "proxy.config.http.insert_response_via_str": 2, 'proxy.config.ssl.server.cert.path': f"{self.ts.Variables.SSLDir}", diff --git a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests.test.py b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests.test.py index bf2a88c57bc..7064f458844 100644 --- a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests.test.py +++ b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests.test.py @@ -179,11 +179,10 @@ ts.Disk.plugin_config.AddLine('xdebug.so --enable=x-cache,x-parentselection-key') # minimal configuration -ts.Disk.records_config.update( - { - 'proxy.config.diags.debug.enabled': 1, - 'proxy.config.diags.debug.tags': 'cache_range_requests|http', - }) +ts.Disk.records_config.update({ + 'proxy.config.diags.debug.mode': 1, + 'proxy.config.diags.debug.tags': 'cache_range_requests|http', +}) curl_and_args = '-s -D /dev/stdout -o /dev/stderr -x localhost:{} -H "x-debug: x-cache"'.format(ts.Variables.port) diff --git a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cache_complete_responses.test.py b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cache_complete_responses.test.py index e36f4f2d730..e16dcaf0c56 100644 --- a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cache_complete_responses.test.py +++ b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cache_complete_responses.test.py @@ -191,7 +191,7 @@ # enable debug ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cachekey|cache_range_requests|slice', }) diff --git a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cachekey.test.py b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cachekey.test.py index b67a8a54f05..5ded93599f8 100644 --- a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cachekey.test.py +++ b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cachekey.test.py @@ -125,7 +125,7 @@ # minimal configuration ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cache_range_requests', }) diff --git a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cachekey_global.test.py b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cachekey_global.test.py index 748b28633b3..6763bfaa862 100644 --- a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cachekey_global.test.py +++ b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cachekey_global.test.py @@ -127,7 +127,7 @@ # minimal configuration ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cachekey|cache_range_requests', }) diff --git a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_ident.test.py b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_ident.test.py index e08ffa4d459..575869ec0da 100644 --- a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_ident.test.py +++ b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_ident.test.py @@ -105,7 +105,7 @@ # minimal configuration ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cache_range_requests', }) diff --git a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_ims.test.py b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_ims.test.py index bb8e4cdd8be..509e7ab411c 100644 --- a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_ims.test.py +++ b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_ims.test.py @@ -84,7 +84,7 @@ # minimal configuration ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cache_range_requests', }) diff --git a/tests/gold_tests/pluginTest/cert_update/cert_update.test.py b/tests/gold_tests/pluginTest/cert_update/cert_update.test.py index 3d2766a4add..f6672cb784c 100644 --- a/tests/gold_tests/pluginTest/cert_update/cert_update.test.py +++ b/tests/gold_tests/pluginTest/cert_update/cert_update.test.py @@ -48,7 +48,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cert_update', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/pluginTest/certifier/certifier.test.py b/tests/gold_tests/pluginTest/certifier/certifier.test.py index f50fda3dfae..d54b620d4ec 100644 --- a/tests/gold_tests/pluginTest/certifier/certifier.test.py +++ b/tests/gold_tests/pluginTest/certifier/certifier.test.py @@ -48,7 +48,7 @@ def setupTS(self): Setup.MakeDir(os.path.join(self.certPathDest, 'store')) self.ts.Disk.records_config.update( { - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http|certifier|ssl", "proxy.config.ssl.server.cert.path": f'{self.ts.Variables.SSLDir}', "proxy.config.ssl.server.private_key.path": f'{self.ts.Variables.SSLDir}', @@ -127,7 +127,7 @@ def setupTS(self): Setup.MakeDir(os.path.join(self.certPathDest, 'store')) self.ts.Disk.records_config.update( { - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http|certifier|ssl", "proxy.config.ssl.server.cert.path": f'{self.ts.Variables.SSLDir}', "proxy.config.ssl.server.private_key.path": f'{self.ts.Variables.SSLDir}', diff --git a/tests/gold_tests/pluginTest/client_context_dump/client_context_dump.test.py b/tests/gold_tests/pluginTest/client_context_dump/client_context_dump.test.py index 195caf5679b..186ac8b8ff6 100644 --- a/tests/gold_tests/pluginTest/client_context_dump/client_context_dump.test.py +++ b/tests/gold_tests/pluginTest/client_context_dump/client_context_dump.test.py @@ -32,7 +32,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'client_context_dump', 'proxy.config.ssl.server.cert.path': '{}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/pluginTest/combo_handler/combo_handler.test.py b/tests/gold_tests/pluginTest/combo_handler/combo_handler.test.py index 6cdcc5be7f9..50feae21507 100644 --- a/tests/gold_tests/pluginTest/combo_handler/combo_handler.test.py +++ b/tests/gold_tests/pluginTest/combo_handler/combo_handler.test.py @@ -87,7 +87,7 @@ def add_server_obj(content_type, path): ts = Test.MakeATSProcess("ts") ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|combo_handler', }) diff --git a/tests/gold_tests/pluginTest/compress/compress-range.test.py b/tests/gold_tests/pluginTest/compress/compress-range.test.py index 0b4b874758b..6e5434490cb 100644 --- a/tests/gold_tests/pluginTest/compress/compress-range.test.py +++ b/tests/gold_tests/pluginTest/compress/compress-range.test.py @@ -37,7 +37,7 @@ def setupTS(self): self.ts = Test.MakeATSProcess("ts") self.ts.Disk.records_config.update( { - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http|compress", "proxy.config.http.insert_response_via_str": 2, }) diff --git a/tests/gold_tests/pluginTest/compress/compress.test.py b/tests/gold_tests/pluginTest/compress/compress.test.py index fd34c6f7524..d331a486eba 100644 --- a/tests/gold_tests/pluginTest/compress/compress.test.py +++ b/tests/gold_tests/pluginTest/compress/compress.test.py @@ -82,7 +82,7 @@ def curl_post(ts, idx, encodingList, out_path): ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'compress', 'proxy.config.http.normalize_ae': 0, }) diff --git a/tests/gold_tests/pluginTest/conf_remap/conf_remap.test.py b/tests/gold_tests/pluginTest/conf_remap/conf_remap.test.py index 9559a91ec63..aebac6d3b33 100644 --- a/tests/gold_tests/pluginTest/conf_remap/conf_remap.test.py +++ b/tests/gold_tests/pluginTest/conf_remap/conf_remap.test.py @@ -43,7 +43,7 @@ def __setupTS(self): self._ts = Test.MakeATSProcess("ts", enable_cache=True) self._ts.Disk.records_config.update( { - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http|conf_remap", "proxy.config.http.insert_response_via_str": 2, "proxy.config.http.negative_caching_enabled": 0 diff --git a/tests/gold_tests/pluginTest/cookie_remap/bucketcookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/bucketcookie.test.py index 98350d61602..4341bc2b3f9 100644 --- a/tests/gold_tests/pluginTest/cookie_remap/bucketcookie.test.py +++ b/tests/gold_tests/pluginTest/cookie_remap/bucketcookie.test.py @@ -62,7 +62,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cookie_remap.*|http.*|dns.*', }) diff --git a/tests/gold_tests/pluginTest/cookie_remap/collapseslashes.test.py b/tests/gold_tests/pluginTest/cookie_remap/collapseslashes.test.py index 27eab2b8f3c..72dc596387a 100644 --- a/tests/gold_tests/pluginTest/cookie_remap/collapseslashes.test.py +++ b/tests/gold_tests/pluginTest/cookie_remap/collapseslashes.test.py @@ -50,7 +50,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cookie_remap.*|http.*|dns.*', }) diff --git a/tests/gold_tests/pluginTest/cookie_remap/connector.test.py b/tests/gold_tests/pluginTest/cookie_remap/connector.test.py index fdd1f163e96..72b7b769bc9 100644 --- a/tests/gold_tests/pluginTest/cookie_remap/connector.test.py +++ b/tests/gold_tests/pluginTest/cookie_remap/connector.test.py @@ -62,7 +62,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cookie_remap.*|http.*|dns.*', }) diff --git a/tests/gold_tests/pluginTest/cookie_remap/existscookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/existscookie.test.py index 915960f7574..c6bcde70cb6 100644 --- a/tests/gold_tests/pluginTest/cookie_remap/existscookie.test.py +++ b/tests/gold_tests/pluginTest/cookie_remap/existscookie.test.py @@ -62,7 +62,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cookie_remap.*|http.*|dns.*', }) diff --git a/tests/gold_tests/pluginTest/cookie_remap/matchcookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/matchcookie.test.py index 44d938c8218..3b0bf5f0dca 100644 --- a/tests/gold_tests/pluginTest/cookie_remap/matchcookie.test.py +++ b/tests/gold_tests/pluginTest/cookie_remap/matchcookie.test.py @@ -62,7 +62,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cookie_remap.*|http.*|dns.*', }) diff --git a/tests/gold_tests/pluginTest/cookie_remap/matchuri.test.py b/tests/gold_tests/pluginTest/cookie_remap/matchuri.test.py index d2060862587..d2527cda4dc 100644 --- a/tests/gold_tests/pluginTest/cookie_remap/matchuri.test.py +++ b/tests/gold_tests/pluginTest/cookie_remap/matchuri.test.py @@ -62,7 +62,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cookie_remap.*|http.*|dns.*', }) diff --git a/tests/gold_tests/pluginTest/cookie_remap/notexistscookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/notexistscookie.test.py index e3fb69c7811..17ac145e522 100644 --- a/tests/gold_tests/pluginTest/cookie_remap/notexistscookie.test.py +++ b/tests/gold_tests/pluginTest/cookie_remap/notexistscookie.test.py @@ -62,7 +62,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cookie_remap.*|http.*|dns.*', }) diff --git a/tests/gold_tests/pluginTest/cookie_remap/pcollapseslashes.test.py b/tests/gold_tests/pluginTest/cookie_remap/pcollapseslashes.test.py index fcf949780b5..294b05d4d84 100644 --- a/tests/gold_tests/pluginTest/cookie_remap/pcollapseslashes.test.py +++ b/tests/gold_tests/pluginTest/cookie_remap/pcollapseslashes.test.py @@ -50,7 +50,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cookie_remap.*|http.*|dns.*', }) diff --git a/tests/gold_tests/pluginTest/cookie_remap/psubstitute.test.py b/tests/gold_tests/pluginTest/cookie_remap/psubstitute.test.py index e353d721d99..26f114affb2 100644 --- a/tests/gold_tests/pluginTest/cookie_remap/psubstitute.test.py +++ b/tests/gold_tests/pluginTest/cookie_remap/psubstitute.test.py @@ -74,7 +74,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cookie_remap.*|http.*|dns.*', }) diff --git a/tests/gold_tests/pluginTest/cookie_remap/regexcookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/regexcookie.test.py index c5a39d7d614..4876597b13e 100644 --- a/tests/gold_tests/pluginTest/cookie_remap/regexcookie.test.py +++ b/tests/gold_tests/pluginTest/cookie_remap/regexcookie.test.py @@ -62,7 +62,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cookie_remap.*|http.*|dns.*', }) diff --git a/tests/gold_tests/pluginTest/cookie_remap/setstatus.test.py b/tests/gold_tests/pluginTest/cookie_remap/setstatus.test.py index 55b30a26491..1dbb1986300 100644 --- a/tests/gold_tests/pluginTest/cookie_remap/setstatus.test.py +++ b/tests/gold_tests/pluginTest/cookie_remap/setstatus.test.py @@ -35,7 +35,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cookie_remap.*|http.*|dns.*', }) diff --git a/tests/gold_tests/pluginTest/cookie_remap/subcookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/subcookie.test.py index 3ef426f076d..124e67f9cfe 100644 --- a/tests/gold_tests/pluginTest/cookie_remap/subcookie.test.py +++ b/tests/gold_tests/pluginTest/cookie_remap/subcookie.test.py @@ -62,7 +62,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cookie_remap.*|http.*|dns.*', }) diff --git a/tests/gold_tests/pluginTest/cookie_remap/substitute.test.py b/tests/gold_tests/pluginTest/cookie_remap/substitute.test.py index 346a7544ed2..77e919d97d9 100644 --- a/tests/gold_tests/pluginTest/cookie_remap/substitute.test.py +++ b/tests/gold_tests/pluginTest/cookie_remap/substitute.test.py @@ -64,7 +64,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cookie_remap.*|http.*|dns.*', }) diff --git a/tests/gold_tests/pluginTest/escalate/escalate.test.py b/tests/gold_tests/pluginTest/escalate/escalate.test.py index 68c4e7a9151..06258fe94b9 100644 --- a/tests/gold_tests/pluginTest/escalate/escalate.test.py +++ b/tests/gold_tests/pluginTest/escalate/escalate.test.py @@ -88,7 +88,7 @@ def _setup_ts(self, tr: 'Process') -> None: dead_port = get_port(self._ts, "dead_port") self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|escalate', 'proxy.config.dns.nameservers': f'127.0.0.1:{self._dns.Variables.Port}', 'proxy.config.dns.resolv_conf': 'NULL', diff --git a/tests/gold_tests/pluginTest/esi/esi.test.py b/tests/gold_tests/pluginTest/esi/esi.test.py index 0d83a8e5ee4..28b60385147 100644 --- a/tests/gold_tests/pluginTest/esi/esi.test.py +++ b/tests/gold_tests/pluginTest/esi/esi.test.py @@ -167,7 +167,7 @@ def _create_ats(self, plugin_config): # Configure ATS with a vanilla ESI plugin configuration. ts = Test.MakeATSProcess("ts{}".format(EsiTest._ts_counter)) ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|plugin_esi', }) ts.Disk.remap_config.AddLine(f'map http://www.example.com/ http://127.0.0.1:{EsiTest._server.Variables.Port}') diff --git a/tests/gold_tests/pluginTest/esi/esi_304.test.py b/tests/gold_tests/pluginTest/esi/esi_304.test.py index 62b60bf79e0..9621139e163 100644 --- a/tests/gold_tests/pluginTest/esi/esi_304.test.py +++ b/tests/gold_tests/pluginTest/esi/esi_304.test.py @@ -133,7 +133,7 @@ def _create_ats(self, plugin_config): # Configure ATS with a vanilla ESI plugin configuration. ts = Test.MakeATSProcess("ts{}".format(EsiTest._ts_counter)) ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|plugin_esi', }) ts.Disk.remap_config.AddLine('map http://www.example.com/ http://127.0.0.1:{0}'.format(EsiTest._server.Variables.Port)) diff --git a/tests/gold_tests/pluginTest/esi/esi_nested_include.test.py b/tests/gold_tests/pluginTest/esi/esi_nested_include.test.py index d9ea49442db..34c2351bee2 100644 --- a/tests/gold_tests/pluginTest/esi/esi_nested_include.test.py +++ b/tests/gold_tests/pluginTest/esi/esi_nested_include.test.py @@ -97,7 +97,7 @@ def _create_ats(self, plugin_config): # Configure ATS with a vanilla ESI plugin configuration. ts = Test.MakeATSProcess("ts{}".format(EsiTest._ts_counter)) ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|plugin_esi', }) ts.Disk.remap_config.AddLine(f'map http://www.example.com/ http://127.0.0.1:{EsiTest._server.Variables.Port}') diff --git a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite.test.py b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite.test.py index db5babf3da2..afa46c67f75 100644 --- a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite.test.py +++ b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite.test.py @@ -34,7 +34,7 @@ server.addResponse("sessionfile.log", request_header, response_header) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'header.*', }) diff --git a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_cache.test.py b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_cache.test.py index 28d29b3a567..0f47e87d749 100644 --- a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_cache.test.py +++ b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_cache.test.py @@ -34,7 +34,7 @@ # add request/response server.addResponse("sessionlog.log", request_header, response_header) ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', }) diff --git a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_method.test.py b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_method.test.py index a3e3babce23..4acc51681f8 100644 --- a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_method.test.py +++ b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_method.test.py @@ -37,7 +37,7 @@ server.addResponse(session_file, request_delete, response) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'header.*', 'proxy.config.http.insert_response_via_str': 0, diff --git a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_ssn_txn_count.test.py b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_ssn_txn_count.test.py index 363ae29796a..c392f79dcea 100644 --- a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_ssn_txn_count.test.py +++ b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_ssn_txn_count.test.py @@ -54,7 +54,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'header.*', 'proxy.config.http.auth_server_session_private': 1, 'proxy.config.http.server_session_sharing.pool': 'global', diff --git a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_l_value.test.py b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_l_value.test.py index 5c04f72570f..b165f548914 100644 --- a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_l_value.test.py +++ b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_l_value.test.py @@ -36,7 +36,7 @@ server.addResponse("sessionfile.log", request_header, response_header) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'header.*', }) diff --git a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_url.test.py b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_url.test.py index b4bbf900cb1..181ff88939f 100644 --- a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_url.test.py +++ b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_url.test.py @@ -46,7 +46,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'header.*', }) diff --git a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_url_glob.test.py b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_url_glob.test.py index a2f9aa5ab88..65a3b327031 100644 --- a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_url_glob.test.py +++ b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_url_glob.test.py @@ -35,7 +35,7 @@ ts.Disk.records_config.update( { 'proxy.config.url_remap.remap_required': 0, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'header', }) diff --git a/tests/gold_tests/pluginTest/healthchecks/healthchecks.test.py b/tests/gold_tests/pluginTest/healthchecks/healthchecks.test.py index fb36c1d9548..98dd084e761 100644 --- a/tests/gold_tests/pluginTest/healthchecks/healthchecks.test.py +++ b/tests/gold_tests/pluginTest/healthchecks/healthchecks.test.py @@ -76,7 +76,7 @@ def _configure_global_ts(self) -> None: # Other configuration. ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'healthchecks', }) return ts diff --git a/tests/gold_tests/pluginTest/ja3_fingerprint/ja3_fingerprint.test.py b/tests/gold_tests/pluginTest/ja3_fingerprint/ja3_fingerprint.test.py index ffd1187f0da..d810e601c6c 100644 --- a/tests/gold_tests/pluginTest/ja3_fingerprint/ja3_fingerprint.test.py +++ b/tests/gold_tests/pluginTest/ja3_fingerprint/ja3_fingerprint.test.py @@ -119,7 +119,7 @@ def _configure_trafficserver(self) -> None: 'proxy.config.dns.nameservers': f"127.0.0.1:{self._dns.Variables.Port}", 'proxy.config.dns.resolv_conf': 'NULL', 'proxy.config.proxy_name': 'test.proxy.com', - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|ja3_fingerprint', }) diff --git a/tests/gold_tests/pluginTest/ja4_fingerprint/ja4_fingerprint.test.py b/tests/gold_tests/pluginTest/ja4_fingerprint/ja4_fingerprint.test.py index f1e7e0f4dd5..a318d226285 100644 --- a/tests/gold_tests/pluginTest/ja4_fingerprint/ja4_fingerprint.test.py +++ b/tests/gold_tests/pluginTest/ja4_fingerprint/ja4_fingerprint.test.py @@ -118,7 +118,7 @@ def _configure_traffic_server(self, server_one: 'Process'): 'proxy.config.ssl.server.private_key.path': f'{ts.Variables.SSLDir}', 'proxy.config.http.server_ports': f'{self._port_one}:ssl', 'proxy.config.proxy_name': 'test.proxy.com', - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ja4_fingerprint|http', }) diff --git a/tests/gold_tests/pluginTest/lua/lua_client_hook.test.py b/tests/gold_tests/pluginTest/lua/lua_client_hook.test.py index 74b8678979f..92524809e99 100644 --- a/tests/gold_tests/pluginTest/lua/lua_client_hook.test.py +++ b/tests/gold_tests/pluginTest/lua/lua_client_hook.test.py @@ -43,7 +43,7 @@ # Configure the tslua's configuration file. ts.Setup.Copy("client_hook.lua", ts.Variables.CONFIGDIR) -ts.Disk.records_config.update({'proxy.config.diags.debug.enabled': 1, 'proxy.config.diags.debug.tags': 'ts_lua'}) +ts.Disk.records_config.update({'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ts_lua'}) # Test for watermark debug output ts.Disk.traffic_out.Content = Testers.ContainsExpression(r"AAAA", "Response is properly captured") diff --git a/tests/gold_tests/pluginTest/lua/lua_debug_tags.test.py b/tests/gold_tests/pluginTest/lua/lua_debug_tags.test.py index 1d4bd3812d7..f8c5179daf7 100644 --- a/tests/gold_tests/pluginTest/lua/lua_debug_tags.test.py +++ b/tests/gold_tests/pluginTest/lua/lua_debug_tags.test.py @@ -35,7 +35,7 @@ ts.Setup.Copy("tags.sh") ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'foo|ts_lua', }) diff --git a/tests/gold_tests/pluginTest/lua/lua_set_error_response.test.py b/tests/gold_tests/pluginTest/lua/lua_set_error_response.test.py index 7408566dedf..2cfe5eff0be 100644 --- a/tests/gold_tests/pluginTest/lua/lua_set_error_response.test.py +++ b/tests/gold_tests/pluginTest/lua/lua_set_error_response.test.py @@ -70,7 +70,7 @@ def _configure_ts(self, tr: 'TestRun') -> 'Process': ts.Disk.remap_config.AddLine(f'map / http://backend.example.com:{port}/ @plugin=tslua.so @pparam={self.lua_script}') ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ts_lua|http', 'proxy.config.dns.nameservers': f"127.0.0.1:{self._dns.Variables.Port}", 'proxy.config.dns.resolv_conf': 'NULL' diff --git a/tests/gold_tests/pluginTest/lua/lua_states_stats.test.py b/tests/gold_tests/pluginTest/lua/lua_states_stats.test.py index f4a1713e077..29abfeca886 100644 --- a/tests/gold_tests/pluginTest/lua/lua_states_stats.test.py +++ b/tests/gold_tests/pluginTest/lua/lua_states_stats.test.py @@ -53,7 +53,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ts_lua', 'proxy.config.plugin.lua.max_states': 4, }) diff --git a/tests/gold_tests/pluginTest/lua/lua_watermark.test.py b/tests/gold_tests/pluginTest/lua/lua_watermark.test.py index d2c1bddc242..94e5b47a5a1 100644 --- a/tests/gold_tests/pluginTest/lua/lua_watermark.test.py +++ b/tests/gold_tests/pluginTest/lua/lua_watermark.test.py @@ -42,7 +42,7 @@ # Configure the tslua's configuration file. ts.Setup.Copy("watermark.lua", ts.Variables.CONFIGDIR) -ts.Disk.records_config.update({'proxy.config.diags.debug.enabled': 1, 'proxy.config.diags.debug.tags': 'ts_lua'}) +ts.Disk.records_config.update({'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ts_lua'}) # Test for watermark debug output ts.Disk.traffic_out.Content = Testers.ContainsExpression(r"WMbytes\(31337\)", "Upstream watermark should be properly set") diff --git a/tests/gold_tests/pluginTest/money_trace/money_trace.test.py b/tests/gold_tests/pluginTest/money_trace/money_trace.test.py index 25bca70dd1b..d11b9a328bb 100644 --- a/tests/gold_tests/pluginTest/money_trace/money_trace.test.py +++ b/tests/gold_tests/pluginTest/money_trace/money_trace.test.py @@ -54,7 +54,7 @@ # minimal configuration ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'money_trace', }) diff --git a/tests/gold_tests/pluginTest/money_trace/money_trace_global.test.py b/tests/gold_tests/pluginTest/money_trace/money_trace_global.test.py index 7f91c29d061..ae83d41ccbc 100644 --- a/tests/gold_tests/pluginTest/money_trace/money_trace_global.test.py +++ b/tests/gold_tests/pluginTest/money_trace/money_trace_global.test.py @@ -51,7 +51,7 @@ # minimal configuration ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'money_trace', }) diff --git a/tests/gold_tests/pluginTest/multiplexer/multiplexer.test.py b/tests/gold_tests/pluginTest/multiplexer/multiplexer.test.py index c4ffe1d4797..a18b0b835df 100644 --- a/tests/gold_tests/pluginTest/multiplexer/multiplexer.test.py +++ b/tests/gold_tests/pluginTest/multiplexer/multiplexer.test.py @@ -125,7 +125,7 @@ def setupTS(self, skip_post): "proxy.config.ssl.server.cert.path": f'{self.ts.Variables.SSLDir}', "proxy.config.ssl.server.private_key.path": f'{self.ts.Variables.SSLDir}', "proxy.config.ssl.client.verify.server.policy": 'PERMISSIVE', - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|multiplexer', 'proxy.config.dns.nameservers': f'127.0.0.1:{self.dns.Variables.Port}', 'proxy.config.dns.resolv_conf': 'NULL', diff --git a/tests/gold_tests/pluginTest/origin_server_auth/origin_server_auth.test.py b/tests/gold_tests/pluginTest/origin_server_auth/origin_server_auth.test.py index 5e6231f5855..267c76d973e 100644 --- a/tests/gold_tests/pluginTest/origin_server_auth/origin_server_auth.test.py +++ b/tests/gold_tests/pluginTest/origin_server_auth/origin_server_auth.test.py @@ -73,7 +73,7 @@ def setUpTS(self): self.ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'origin_server_auth', }) diff --git a/tests/gold_tests/pluginTest/polite_hook_wait/polite_hook_wait.test.py b/tests/gold_tests/pluginTest/polite_hook_wait/polite_hook_wait.test.py index c43ce842fdd..c778e583abf 100644 --- a/tests/gold_tests/pluginTest/polite_hook_wait/polite_hook_wait.test.py +++ b/tests/gold_tests/pluginTest/polite_hook_wait/polite_hook_wait.test.py @@ -36,7 +36,7 @@ { 'proxy.config.proxy_name': 'Poxy_Proxy', # This will be the server name. 'proxy.config.url_remap.remap_required': 1, - 'proxy.config.diags.debug.enabled': 3, + 'proxy.config.diags.debug.mode': 3, 'proxy.config.diags.debug.tags': f'{plugin_name}', }) diff --git a/tests/gold_tests/pluginTest/prefetch/prefetch_bignum.test.py b/tests/gold_tests/pluginTest/prefetch/prefetch_bignum.test.py index bd4cd2bf742..39a72f4291f 100644 --- a/tests/gold_tests/pluginTest/prefetch/prefetch_bignum.test.py +++ b/tests/gold_tests/pluginTest/prefetch/prefetch_bignum.test.py @@ -48,7 +48,7 @@ ts = Test.MakeATSProcess("ts") ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|prefetch', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", 'proxy.config.dns.resolv_conf': "NULL", diff --git a/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd.test.py b/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd.test.py index cca600daadc..2a497044c1d 100644 --- a/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd.test.py +++ b/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd.test.py @@ -168,7 +168,7 @@ ts1 = Test.MakeATSProcess("ts1", enable_uds=False) ts1.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'prefetch|http', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", 'proxy.config.dns.resolv_conf': "NULL", @@ -193,7 +193,7 @@ ts0 = Test.MakeATSProcess("ts0") ts0.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'prefetch|http', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", 'proxy.config.dns.resolv_conf': "NULL", diff --git a/tests/gold_tests/pluginTest/prefetch/prefetch_overflow.test.py b/tests/gold_tests/pluginTest/prefetch/prefetch_overflow.test.py index a3c45380230..94b439d6c64 100644 --- a/tests/gold_tests/pluginTest/prefetch/prefetch_overflow.test.py +++ b/tests/gold_tests/pluginTest/prefetch/prefetch_overflow.test.py @@ -45,7 +45,7 @@ ts = Test.MakeATSProcess("ts") ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|prefetch', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", 'proxy.config.dns.resolv_conf': "NULL", diff --git a/tests/gold_tests/pluginTest/prefetch/prefetch_simple.test.py b/tests/gold_tests/pluginTest/prefetch/prefetch_simple.test.py index a171c65db7f..9ce6bced9a7 100644 --- a/tests/gold_tests/pluginTest/prefetch/prefetch_simple.test.py +++ b/tests/gold_tests/pluginTest/prefetch/prefetch_simple.test.py @@ -45,7 +45,7 @@ ts = Test.MakeATSProcess("ts") ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|prefetch', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", 'proxy.config.dns.resolv_conf': "NULL", diff --git a/tests/gold_tests/pluginTest/regex_remap/regex_remap.test.py b/tests/gold_tests/pluginTest/regex_remap/regex_remap.test.py index 12e3b9867e8..27df804cc61 100644 --- a/tests/gold_tests/pluginTest/regex_remap/regex_remap.test.py +++ b/tests/gold_tests/pluginTest/regex_remap/regex_remap.test.py @@ -81,7 +81,7 @@ # minimal configuration ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|regex_remap', 'proxy.config.dns.nameservers': f"127.0.0.1:{nameserver.Variables.Port}", 'proxy.config.dns.resolv_conf': 'NULL' diff --git a/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate.test.py b/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate.test.py index d497ecfc205..dcfbacf718c 100644 --- a/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate.test.py +++ b/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate.test.py @@ -123,9 +123,9 @@ # minimal configuration ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'regex_revalidate', - # 'proxy.config.diags.debug.enabled': 0, + # 'proxy.config.diags.debug.mode': 0, 'proxy.config.http.insert_age_in_response': 0, 'proxy.config.http.response_via_str': 3, }) diff --git a/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate_miss.test.py b/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate_miss.test.py index 96ba108f14b..fad0614de60 100644 --- a/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate_miss.test.py +++ b/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate_miss.test.py @@ -86,7 +86,7 @@ # minimal configuration ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'regex_revalidate', 'proxy.config.http.insert_age_in_response': 0, 'proxy.config.http.response_via_str': 3, diff --git a/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate_state.test.py b/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate_state.test.py index f71e854b35b..83b3a7a9786 100644 --- a/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate_state.test.py +++ b/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate_state.test.py @@ -114,7 +114,7 @@ # minimal configuration ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'regex_revalidate', 'proxy.config.http.wait_for_cache': 1, }) diff --git a/tests/gold_tests/pluginTest/server_push_preload/server_push_preload.test.py b/tests/gold_tests/pluginTest/server_push_preload/server_push_preload.test.py index af8dc4d940f..817d4649607 100644 --- a/tests/gold_tests/pluginTest/server_push_preload/server_push_preload.test.py +++ b/tests/gold_tests/pluginTest/server_push_preload/server_push_preload.test.py @@ -77,7 +77,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http2|server_push_preload', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/pluginTest/slice/slice.test.py b/tests/gold_tests/pluginTest/slice/slice.test.py index 03d0079b818..215150167dd 100644 --- a/tests/gold_tests/pluginTest/slice/slice.test.py +++ b/tests/gold_tests/pluginTest/slice/slice.test.py @@ -80,7 +80,7 @@ ]) ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'slice', }) diff --git a/tests/gold_tests/pluginTest/slice/slice_conditional.test.py b/tests/gold_tests/pluginTest/slice/slice_conditional.test.py index 27f4c0a64f9..07329a5869e 100644 --- a/tests/gold_tests/pluginTest/slice/slice_conditional.test.py +++ b/tests/gold_tests/pluginTest/slice/slice_conditional.test.py @@ -93,7 +93,7 @@ ts.Disk.plugin_config.AddLine('xdebug.so --enable=x-cache') ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': '0', + 'proxy.config.diags.debug.mode': '0', 'proxy.config.diags.debug.tags': 'http|cache|slice|xdebug|cache_range_requests', }) diff --git a/tests/gold_tests/pluginTest/slice/slice_crr_ident.test.py b/tests/gold_tests/pluginTest/slice/slice_crr_ident.test.py index 1dfaeb278df..5d80fe86015 100644 --- a/tests/gold_tests/pluginTest/slice/slice_crr_ident.test.py +++ b/tests/gold_tests/pluginTest/slice/slice_crr_ident.test.py @@ -80,7 +80,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'cache_range_requests|header_rewrite|slice|log', }) diff --git a/tests/gold_tests/pluginTest/slice/slice_error.test.py b/tests/gold_tests/pluginTest/slice/slice_error.test.py index a99bff794c3..7c005aeb378 100644 --- a/tests/gold_tests/pluginTest/slice/slice_error.test.py +++ b/tests/gold_tests/pluginTest/slice/slice_error.test.py @@ -240,7 +240,7 @@ # minimal configuration ts.Disk.records_config.update({ - # 'proxy.config.diags.debug.enabled': 1, + # 'proxy.config.diags.debug.mode': 1, # 'proxy.config.diags.debug.tags': 'slice', }) diff --git a/tests/gold_tests/pluginTest/slice/slice_ident.test.py b/tests/gold_tests/pluginTest/slice/slice_ident.test.py index 7c7784a27d1..8fa91db5779 100644 --- a/tests/gold_tests/pluginTest/slice/slice_ident.test.py +++ b/tests/gold_tests/pluginTest/slice/slice_ident.test.py @@ -91,7 +91,7 @@ # Define ATS and configure ts = Test.MakeATSProcess("ts") ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'slice', }) diff --git a/tests/gold_tests/pluginTest/slice/slice_prefetch.test.py b/tests/gold_tests/pluginTest/slice/slice_prefetch.test.py index 5b544e9d091..22d2522f945 100644 --- a/tests/gold_tests/pluginTest/slice/slice_prefetch.test.py +++ b/tests/gold_tests/pluginTest/slice/slice_prefetch.test.py @@ -105,7 +105,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'slice|cache_range_requests|xdebug', }) diff --git a/tests/gold_tests/pluginTest/slice/slice_purge.test.py b/tests/gold_tests/pluginTest/slice/slice_purge.test.py index 888aeda1914..29012b03608 100644 --- a/tests/gold_tests/pluginTest/slice/slice_purge.test.py +++ b/tests/gold_tests/pluginTest/slice/slice_purge.test.py @@ -59,7 +59,7 @@ def _configure_trafficserver(self): self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|slice|cache_range_requests', }) diff --git a/tests/gold_tests/pluginTest/slice/slice_regex.test.py b/tests/gold_tests/pluginTest/slice/slice_regex.test.py index abc0d40dded..24e272822c5 100644 --- a/tests/gold_tests/pluginTest/slice/slice_regex.test.py +++ b/tests/gold_tests/pluginTest/slice/slice_regex.test.py @@ -104,7 +104,7 @@ # minimal configuration ts.Disk.records_config.update( { - # 'proxy.config.diags.debug.enabled': 1, + # 'proxy.config.diags.debug.mode': 1, # 'proxy.config.diags.debug.tags': 'slice', 'proxy.config.http.insert_age_in_response': 0, 'proxy.config.http.response_via_str': 0, diff --git a/tests/gold_tests/pluginTest/slice/slice_rm_range.test.py b/tests/gold_tests/pluginTest/slice/slice_rm_range.test.py index 7c122fac390..ebc3e08669e 100644 --- a/tests/gold_tests/pluginTest/slice/slice_rm_range.test.py +++ b/tests/gold_tests/pluginTest/slice/slice_rm_range.test.py @@ -50,7 +50,7 @@ def _configure_trafficserver(self): self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|slice|cache_range_requests', }) diff --git a/tests/gold_tests/pluginTest/slice/slice_selfhealing.test.py b/tests/gold_tests/pluginTest/slice/slice_selfhealing.test.py index 2bced732d89..8747c1566d2 100644 --- a/tests/gold_tests/pluginTest/slice/slice_selfhealing.test.py +++ b/tests/gold_tests/pluginTest/slice/slice_selfhealing.test.py @@ -78,11 +78,10 @@ def to_httpdate(dt): ts.Disk.plugin_config.AddLine('xdebug.so --enable=x-cache') -ts.Disk.records_config.update( - { - 'proxy.config.diags.debug.enabled': 1, - 'proxy.config.diags.debug.tags': 'cache_range_requests|slice', - }) +ts.Disk.records_config.update({ + 'proxy.config.diags.debug.mode': 1, + 'proxy.config.diags.debug.tags': 'cache_range_requests|slice', +}) curl_and_args = '-s -D /dev/stdout -o /dev/stderr -x localhost:{}'.format(ts.Variables.port) + ' -H "x-debug: x-cache"' diff --git a/tests/gold_tests/pluginTest/sslheaders/sslheaders.test.py b/tests/gold_tests/pluginTest/sslheaders/sslheaders.test.py index 85c12b8c5d1..d482161dfff 100644 --- a/tests/gold_tests/pluginTest/sslheaders/sslheaders.test.py +++ b/tests/gold_tests/pluginTest/sslheaders/sslheaders.test.py @@ -44,7 +44,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.proxy_name': 'Poxy_Proxy', # This will be the server name. 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/pluginTest/stale_response/stale_response.test.py b/tests/gold_tests/pluginTest/stale_response/stale_response.test.py index 3d458b2f951..d6e406c5bd0 100644 --- a/tests/gold_tests/pluginTest/stale_response/stale_response.test.py +++ b/tests/gold_tests/pluginTest/stale_response/stale_response.test.py @@ -118,7 +118,7 @@ def setupTS(self) -> None: ts.Disk.records_config.update( { - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http|stale_response", "proxy.config.http.server_session_sharing.pool": "global", # Turn off negative revalidating so that we can test stale-if-error. diff --git a/tests/gold_tests/pluginTest/statichit/statichit.test.py b/tests/gold_tests/pluginTest/statichit/statichit.test.py index c82d498907e..7ee71dca9f5 100644 --- a/tests/gold_tests/pluginTest/statichit/statichit.test.py +++ b/tests/gold_tests/pluginTest/statichit/statichit.test.py @@ -83,7 +83,7 @@ def dir(self): ts = Test.MakeATSProcess('ts') ts.Disk.records_config.update({ - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http|statichit", }) diff --git a/tests/gold_tests/pluginTest/stats_over_http/stats_over_http.test.py b/tests/gold_tests/pluginTest/stats_over_http/stats_over_http.test.py index e70cdbf64ef..f7c6ebd8352 100644 --- a/tests/gold_tests/pluginTest/stats_over_http/stats_over_http.test.py +++ b/tests/gold_tests/pluginTest/stats_over_http/stats_over_http.test.py @@ -48,7 +48,7 @@ def __setupTS(self): self.ts.Disk.records_config.update( { "proxy.config.http.server_ports": f"{self.ts.Variables.port}", - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "stats_over_http" }) diff --git a/tests/gold_tests/pluginTest/stek_share/stek_share.test.py b/tests/gold_tests/pluginTest/stek_share/stek_share.test.py index de320d64b01..23b80cad5e6 100644 --- a/tests/gold_tests/pluginTest/stek_share/stek_share.test.py +++ b/tests/gold_tests/pluginTest/stek_share/stek_share.test.py @@ -158,7 +158,7 @@ ts1.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'stek_share', 'proxy.config.exec_thread.autoconfig.enabled': 0, 'proxy.config.exec_thread.limit': 4, @@ -178,7 +178,7 @@ ts2.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'stek_share', 'proxy.config.exec_thread.autoconfig.enabled': 0, 'proxy.config.exec_thread.limit': 4, @@ -198,7 +198,7 @@ ts3.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'stek_share', 'proxy.config.exec_thread.autoconfig.enabled': 0, 'proxy.config.exec_thread.limit': 4, @@ -218,7 +218,7 @@ ts4.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'stek_share', 'proxy.config.exec_thread.autoconfig.enabled': 0, 'proxy.config.exec_thread.limit': 4, @@ -238,7 +238,7 @@ ts5.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'stek_share', 'proxy.config.exec_thread.autoconfig.enabled': 0, 'proxy.config.exec_thread.limit': 4, diff --git a/tests/gold_tests/pluginTest/test_hooks/body_buffer.test.py b/tests/gold_tests/pluginTest/test_hooks/body_buffer.test.py index 07e19343417..af06b4420e6 100644 --- a/tests/gold_tests/pluginTest/test_hooks/body_buffer.test.py +++ b/tests/gold_tests/pluginTest/test_hooks/body_buffer.test.py @@ -105,7 +105,7 @@ def setupTS(self): Test.PrepareInstalledPlugin('request_buffer.so', self._ts) self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'request_buffer', 'proxy.config.http.server_ports': str(self._ts.Variables.port) + f" {self._ts.Variables.uds_path}", }) diff --git a/tests/gold_tests/pluginTest/test_hooks/hook_add.test.py b/tests/gold_tests/pluginTest/test_hooks/hook_add.test.py index 595e37e311e..05d2d6d6ba1 100644 --- a/tests/gold_tests/pluginTest/test_hooks/hook_add.test.py +++ b/tests/gold_tests/pluginTest/test_hooks/hook_add.test.py @@ -34,7 +34,7 @@ { 'proxy.config.diags.debug.tags': 'test', 'proxy.config.diags.show_location': 0, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.url_remap.remap_required': 0, }) diff --git a/tests/gold_tests/pluginTest/test_hooks/ssn_start_delay_hook.test.py b/tests/gold_tests/pluginTest/test_hooks/ssn_start_delay_hook.test.py index 7a10b9a2993..2184cd193e8 100644 --- a/tests/gold_tests/pluginTest/test_hooks/ssn_start_delay_hook.test.py +++ b/tests/gold_tests/pluginTest/test_hooks/ssn_start_delay_hook.test.py @@ -34,7 +34,7 @@ { 'proxy.config.diags.debug.tags': 'test', 'proxy.config.diags.show_location': 0, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.http.cache.http': 0, 'proxy.config.url_remap.remap_required': 0, }) diff --git a/tests/gold_tests/pluginTest/test_hooks/test_hooks.test.py b/tests/gold_tests/pluginTest/test_hooks/test_hooks.test.py index 20ca7fbb1d3..4c7570a2b8b 100644 --- a/tests/gold_tests/pluginTest/test_hooks/test_hooks.test.py +++ b/tests/gold_tests/pluginTest/test_hooks/test_hooks.test.py @@ -45,7 +45,7 @@ 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.url_remap.remap_required': 0, - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'http|test_hooks', }) diff --git a/tests/gold_tests/pluginTest/traffic_dump/traffic_dump.test.py b/tests/gold_tests/pluginTest/traffic_dump/traffic_dump.test.py index c5ab27a6cc4..771defde2ad 100644 --- a/tests/gold_tests/pluginTest/traffic_dump/traffic_dump.test.py +++ b/tests/gold_tests/pluginTest/traffic_dump/traffic_dump.test.py @@ -45,7 +45,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'traffic_dump|http', 'proxy.config.http.insert_age_in_response': 0, 'proxy.config.ssl.server.cert.path': ts.Variables.SSLDir, diff --git a/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_http3.test.py b/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_http3.test.py index 3af56a8707c..49efdca336b 100644 --- a/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_http3.test.py +++ b/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_http3.test.py @@ -47,7 +47,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'traffic_dump|quic', 'proxy.config.http.insert_age_in_response': 0, 'proxy.config.quic.qlog.file_base': qlog_dir, diff --git a/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_ip_filter.test.py b/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_ip_filter.test.py index 5aa7e6851dc..acc0192b1d3 100644 --- a/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_ip_filter.test.py +++ b/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_ip_filter.test.py @@ -46,7 +46,7 @@ def get_common_ats_process(name, plugin_command, replay_exists): ts = Test.MakeATSProcess(name) replay_dir = os.path.join(ts.RunDirectory, name, "log") ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'traffic_dump', }) ts.Disk.remap_config.AddLine(f'map / http://127.0.0.1:{server.Variables.http_port}') diff --git a/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_response_body.test.py b/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_response_body.test.py index a68127a9291..489f4935e82 100644 --- a/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_response_body.test.py +++ b/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_response_body.test.py @@ -40,7 +40,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'traffic_dump', 'proxy.config.ssl.server.cert.path': ts.Variables.SSLDir, 'proxy.config.ssl.server.private_key.path': ts.Variables.SSLDir, diff --git a/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_sni_filter.test.py b/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_sni_filter.test.py index 710d2c9742d..aaca0fbbd49 100644 --- a/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_sni_filter.test.py +++ b/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_sni_filter.test.py @@ -41,7 +41,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'traffic_dump', 'proxy.config.ssl.server.cert.path': ts.Variables.SSLDir, 'proxy.config.ssl.server.private_key.path': ts.Variables.SSLDir, diff --git a/tests/gold_tests/pluginTest/transform/transaction_data_sink.test.py b/tests/gold_tests/pluginTest/transform/transaction_data_sink.test.py index fe59ca5f2af..1ea8b1a63a8 100644 --- a/tests/gold_tests/pluginTest/transform/transaction_data_sink.test.py +++ b/tests/gold_tests/pluginTest/transform/transaction_data_sink.test.py @@ -46,7 +46,7 @@ def _setupTS(self): "proxy.config.ssl.server.private_key.path": f'{self.ts.Variables.SSLDir}', "proxy.config.ssl.client.verify.server.policy": 'PERMISSIVE', "proxy.config.dns.nameservers": f"127.0.0.1:{self.nameserver.Variables.Port}", - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|txn_data_sink', }) self.ts.addDefaultSSLFiles() diff --git a/tests/gold_tests/pluginTest/tsapi/test_TSHttpSsnInfo.test.py b/tests/gold_tests/pluginTest/tsapi/test_TSHttpSsnInfo.test.py index e6f19c123ce..0f28a5419cb 100644 --- a/tests/gold_tests/pluginTest/tsapi/test_TSHttpSsnInfo.test.py +++ b/tests/gold_tests/pluginTest/tsapi/test_TSHttpSsnInfo.test.py @@ -56,7 +56,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http2|http3|quic|test_TSHttpSsnInfo', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir) diff --git a/tests/gold_tests/pluginTest/tsapi/test_TSHttpTxnServerAddrSet.test.py b/tests/gold_tests/pluginTest/tsapi/test_TSHttpTxnServerAddrSet.test.py index 4f0d85eca29..7317ec38376 100644 --- a/tests/gold_tests/pluginTest/tsapi/test_TSHttpTxnServerAddrSet.test.py +++ b/tests/gold_tests/pluginTest/tsapi/test_TSHttpTxnServerAddrSet.test.py @@ -61,7 +61,7 @@ def _configure_traffic_server(self, tr: 'TestRun') -> 'Process': { 'proxy.config.dns.nameservers': f'127.0.0.1:{self._dns.Variables.Port}', 'proxy.config.dns.resolv_conf': 'NULL', - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|hostdb|test_plugin', }) diff --git a/tests/gold_tests/pluginTest/tsapi/test_TSVConnPPInfo.test.py b/tests/gold_tests/pluginTest/tsapi/test_TSVConnPPInfo.test.py index 5daf5abb474..7fce0076767 100644 --- a/tests/gold_tests/pluginTest/tsapi/test_TSVConnPPInfo.test.py +++ b/tests/gold_tests/pluginTest/tsapi/test_TSVConnPPInfo.test.py @@ -56,7 +56,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|proxyprotocol|test_TSVConnPPInfo', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir) diff --git a/tests/gold_tests/pluginTest/tsapi/tsapi.test.py b/tests/gold_tests/pluginTest/tsapi/tsapi.test.py index 84b5ba4be6e..4eb82af0bcb 100644 --- a/tests/gold_tests/pluginTest/tsapi/tsapi.test.py +++ b/tests/gold_tests/pluginTest/tsapi/tsapi.test.py @@ -51,7 +51,7 @@ 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.url_remap.remap_required': 1, - 'proxy.config.diags.debug.enabled': 3, + 'proxy.config.diags.debug.mode': 3, 'proxy.config.diags.debug.tags': f'http|{plugin_name}', }) diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_basic.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_basic.test.py index 99653afa528..a7db602d0d0 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_basic.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_basic.test.py @@ -39,6 +39,6 @@ 'proxy.config.log.max_secs_per_buffer': 1, 'proxy.config.http.per_server.connection.max': 500, 'proxy.config.http.background_fill_completed_threshold': 0.4, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box' }) diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_cmp.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_cmp.test.py index df0f08671e9..053d1da508c 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_cmp.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_cmp.test.py @@ -23,4 +23,4 @@ tr = Test.TxnBoxTestAndRun("Test comparisons", "cmp.replay.yaml", config_path='Auto', config_key="meta.txn_box.global") ts = tr.Variables.TS -ts.Disk.records_config.update({'proxy.config.diags.debug.enabled': 1, 'proxy.config.diags.debug.tags': 'txn_box'}) +ts.Disk.records_config.update({'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box'}) diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_ip-addr.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_ip-addr.test.py index 3686ec001c3..d4f6c1daa6f 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_ip-addr.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_ip-addr.test.py @@ -28,7 +28,7 @@ ts = tr.Variables.TS ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box', 'proxy.config.http.insert_request_via_str': 0 }) diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_mod.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_mod.test.py index 24103d49d93..543cf62dad0 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_mod.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_mod.test.py @@ -37,6 +37,6 @@ ts.Disk.records_config.update( { 'proxy.config.http.cache.http': 0, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box' }) diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_multi-cfg.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_multi-cfg.test.py index 87b3059e14f..937569a28eb 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_multi-cfg.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_multi-cfg.test.py @@ -38,6 +38,6 @@ ts.Disk.records_config.update( { 'proxy.config.log.max_secs_per_buffer': 1, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box' }) diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_redirect.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_redirect.test.py index dc80a718dea..1603a4db091 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_redirect.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_redirect.test.py @@ -46,7 +46,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box', 'proxy.config.http.cache.http': 0 }) diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_reply.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_reply.test.py index 9bf2dc8bdf5..20953b5fa18 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_reply.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_reply.test.py @@ -41,7 +41,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box|http', 'proxy.config.http.cache.http': 0 }) diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_rxp.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_rxp.test.py index 0394777574a..21ceb5e7ec0 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_rxp.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_rxp.test.py @@ -34,4 +34,4 @@ ['http://one.ex/path/', 'http://two.ex/path/'], ['http://one.ex'] ]) ts = tr.Variables.TS -ts.Disk.records_config.update({'proxy.config.diags.debug.enabled': 1, 'proxy.config.diags.debug.tags': 'txn_box'}) +ts.Disk.records_config.update({'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box'}) diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_stat.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_stat.test.py index 030113f13ed..fd8e99c091b 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_stat.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_stat.test.py @@ -40,7 +40,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box', 'proxy.config.http.cache.http': 0, 'proxy.config.http.server_ports': '{0}'.format(ts.Variables.port) diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_tls-cert.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_tls-cert.test.py index 00181e4da68..36cb21a1864 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_tls-cert.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_tls-cert.test.py @@ -45,7 +45,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box|http|ssl', 'proxy.config.http.cache.http': 0, 'proxy.config.ssl.server.cert.path': ts.Variables.SSLDir, diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_tls.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_tls.test.py index 080753460e8..098b88cac36 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_tls.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_tls.test.py @@ -43,7 +43,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box|http|ssl', 'proxy.config.http.cache.http': 0, 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_tuple.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_tuple.test.py index 4b640751560..c62e998d260 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_tuple.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_tuple.test.py @@ -26,4 +26,4 @@ tr = Test.TxnBoxTestAndRun("Tuples and such", "tuple.replay.yaml", config_path='Auto', config_key="meta.txn_box.global") ts = tr.Variables.TS -ts.Disk.records_config.update({'proxy.config.diags.debug.enabled': 1, 'proxy.config.diags.debug.tags': 'txn_box'}) +ts.Disk.records_config.update({'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box'}) diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn-debug.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn-debug.test.py index 96ac0e17bf5..036ccfffbfd 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn-debug.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn-debug.test.py @@ -38,7 +38,7 @@ ts = tr.Variables.TS ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box', 'proxy.config.crash_log_helper': '/home/dmeden/code/git/trafficserver/build/_sandbox/txn-debug/ts-debug-enabled/bin/traffic_crashlog' @@ -56,7 +56,7 @@ ts = tr.Variables.TS ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box', 'proxy.config.crash_log_helper': '/home/dmeden/code/git/trafficserver/build/_sandbox/txn-debug/ts-debug-disabled/bin/traffic_crashlog' diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn-error.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn-error.test.py index d1b7e6e1b7b..566811ee2a8 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn-error.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn-error.test.py @@ -26,7 +26,7 @@ Test.SkipIf(Condition.true("This needs to be revisit. TS not finishing up gracefully.")) replay_file = "txn-error.replay.yaml" -records_config_tweaks = {'proxy.config.diags.debug.enabled': 1, 'proxy.config.diags.debug.tags': 'txn_box|http'} +records_config_tweaks = {'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box|http'} suffix = "-err" err_run = Test.TxnBoxTestAndRun( diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_1.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_1.test.py index d1a6f456bac..efd832c29a4 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_1.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_1.test.py @@ -36,6 +36,6 @@ 'proxy.config.http.transaction_no_activity_timeout_out': 120, 'proxy.config.http.per_server.connection.max': 500, 'proxy.config.http.background_fill_completed_threshold': 0.4, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box' }) diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_2.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_2.test.py index 9d05c476580..a6acd1a5f30 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_2.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_2.test.py @@ -37,6 +37,6 @@ 'proxy.config.http.transaction_no_activity_timeout_out': 120, 'proxy.config.http.per_server.connection.max': 500, 'proxy.config.http.background_fill_completed_threshold': 0.4, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box' }) diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_3.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_3.test.py index ead339c42c6..12d432f378e 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_3.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_txn_open_3.test.py @@ -36,6 +36,6 @@ 'proxy.config.http.transaction_no_activity_timeout_out': 120, 'proxy.config.http.per_server.connection.max': 500, 'proxy.config.http.background_fill_completed_threshold': 0.4, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box' }) diff --git a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_with.test.py b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_with.test.py index 102f0a011fe..e23f1ac5b96 100644 --- a/tests/gold_tests/pluginTest/txn_box/basic/txn_box_with.test.py +++ b/tests/gold_tests/pluginTest/txn_box/basic/txn_box_with.test.py @@ -32,6 +32,6 @@ ts.Disk.records_config.update( { 'proxy.config.log.max_secs_per_buffer': 1, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box' }) diff --git a/tests/gold_tests/pluginTest/txn_box/ct_header/txn_box_ct_header.test.py b/tests/gold_tests/pluginTest/txn_box/ct_header/txn_box_ct_header.test.py index c5fc5e9762e..833c08b2a65 100644 --- a/tests/gold_tests/pluginTest/txn_box/ct_header/txn_box_ct_header.test.py +++ b/tests/gold_tests/pluginTest/txn_box/ct_header/txn_box_ct_header.test.py @@ -44,7 +44,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1 + 'proxy.config.diags.debug.mode': 1 # , 'proxy.config.diags.debug.tags': 'txn_box|http|ssl' , 'proxy.config.diags.debug.tags': 'txn_box', diff --git a/tests/gold_tests/pluginTest/txn_box/example/txn_box_accept-encoding.test.py b/tests/gold_tests/pluginTest/txn_box/example/txn_box_accept-encoding.test.py index d590f6f6394..fb3091076d2 100644 --- a/tests/gold_tests/pluginTest/txn_box/example/txn_box_accept-encoding.test.py +++ b/tests/gold_tests/pluginTest/txn_box/example/txn_box_accept-encoding.test.py @@ -31,7 +31,7 @@ tr.Variables.TS.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box', 'proxy.config.http.cache.http': 0, 'proxy.config.http.normalize_ae': 0, diff --git a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_cors-origin.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_cors-origin.test.py index 6d85252a330..5c56bdfe6bd 100644 --- a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_cors-origin.test.py +++ b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_cors-origin.test.py @@ -38,7 +38,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box', 'proxy.config.http.cache.http': 0, 'proxy.config.url_remap.remap_required': 0 diff --git a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_cors-referrer.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_cors-referrer.test.py index 7cdce515b8c..dbe48bd4ba8 100644 --- a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_cors-referrer.test.py +++ b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_cors-referrer.test.py @@ -38,7 +38,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box', 'proxy.config.http.cache.http': 0, 'proxy.config.url_remap.remap_required': 0 diff --git a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_ip-acl.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_ip-acl.test.py index 8e31eac0f43..4cce60b970e 100644 --- a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_ip-acl.test.py +++ b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_ip-acl.test.py @@ -44,7 +44,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box', 'proxy.config.http.cache.http': 0 }) diff --git a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_mTLS.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_mTLS.test.py index c76d0fab7e1..06ef00bfe91 100644 --- a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_mTLS.test.py +++ b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_mTLS.test.py @@ -57,7 +57,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box|ssl', 'proxy.config.http.cache.http': 0, 'proxy.config.ssl.server.cert.path': ts.Variables.SSLDir, diff --git a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_query-delete-filter.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_query-delete-filter.test.py index e2377e965b6..98a700d0a4d 100644 --- a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_query-delete-filter.test.py +++ b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_query-delete-filter.test.py @@ -40,7 +40,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box', 'proxy.config.http.cache.http': 0 }) diff --git a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_query-delete-regex.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_query-delete-regex.test.py index 3773b798533..ba3f156d639 100644 --- a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_query-delete-regex.test.py +++ b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_query-delete-regex.test.py @@ -40,7 +40,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box', 'proxy.config.http.cache.http': 0 }) diff --git a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_query.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_query.test.py index 2d1d5d7aad3..fe6dc0e5f6d 100644 --- a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_query.test.py +++ b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_query.test.py @@ -45,7 +45,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box', 'proxy.config.http.cache.http': 0 }) diff --git a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_stanley.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_stanley.test.py index 20fe64f2f92..9b69d0d6fdc 100644 --- a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_stanley.test.py +++ b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_stanley.test.py @@ -45,7 +45,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box', 'proxy.config.http.cache.http': 0 }) diff --git a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_vznith-1.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_vznith-1.test.py index 958c6d190bb..8d5cb30d16f 100644 --- a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_vznith-1.test.py +++ b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_vznith-1.test.py @@ -41,7 +41,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box', 'proxy.config.http.cache.http': 0 }) diff --git a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_yts-3489.test.py b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_yts-3489.test.py index a157f8b9743..9bc13fea863 100644 --- a/tests/gold_tests/pluginTest/txn_box/prod/txn_box_yts-3489.test.py +++ b/tests/gold_tests/pluginTest/txn_box/prod/txn_box_yts-3489.test.py @@ -46,7 +46,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box', 'proxy.config.http.cache.http': 0 }) diff --git a/tests/gold_tests/pluginTest/txn_box/ramp/multi_ramp_common.py b/tests/gold_tests/pluginTest/txn_box/ramp/multi_ramp_common.py index b7322dc8e88..2a3d3adc97c 100644 --- a/tests/gold_tests/pluginTest/txn_box/ramp/multi_ramp_common.py +++ b/tests/gold_tests/pluginTest/txn_box/ramp/multi_ramp_common.py @@ -85,7 +85,7 @@ def ramp_test_fixup(tr): ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box', 'proxy.config.http.cache.http': 0, 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/pluginTest/txn_box/remap/txn_box_remap-base.test.py b/tests/gold_tests/pluginTest/txn_box/remap/txn_box_remap-base.test.py index 04b08f7dcb4..28f3b850092 100644 --- a/tests/gold_tests/pluginTest/txn_box/remap/txn_box_remap-base.test.py +++ b/tests/gold_tests/pluginTest/txn_box/remap/txn_box_remap-base.test.py @@ -48,7 +48,7 @@ ts = tr.Variables.TS ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box', 'proxy.config.reverse_proxy.enabled': 1 diff --git a/tests/gold_tests/pluginTest/txn_box/static_file/txn_box_static_file.test.py b/tests/gold_tests/pluginTest/txn_box/static_file/txn_box_static_file.test.py index 07419910819..d07ae5aa162 100644 --- a/tests/gold_tests/pluginTest/txn_box/static_file/txn_box_static_file.test.py +++ b/tests/gold_tests/pluginTest/txn_box/static_file/txn_box_static_file.test.py @@ -36,4 +36,4 @@ remap=[['http://base.ex', ['--key=meta.txn-box.remap', 'static_file.replay.yaml']]]) ts = r.Variables.TS ts.Setup.Copy("static_file.txt", ts.Variables.CONFIGDIR) -ts.Disk.records_config.update({'proxy.config.diags.debug.enabled': 1, 'proxy.config.diags.debug.tags': 'txn_box|http'}) +ts.Disk.records_config.update({'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'txn_box|http'}) diff --git a/tests/gold_tests/pluginTest/uri_signing/uri_signing.test.py b/tests/gold_tests/pluginTest/uri_signing/uri_signing.test.py index 2cf47f7621d..efcc707e9ad 100644 --- a/tests/gold_tests/pluginTest/uri_signing/uri_signing.test.py +++ b/tests/gold_tests/pluginTest/uri_signing/uri_signing.test.py @@ -78,7 +78,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'uri_signing|http', # 'proxy.config.plugin.dynamic_reload_mode': 0, # 'proxy.config.diags.debug.tags': 'uri_signing', diff --git a/tests/gold_tests/pluginTest/url_sig/url_sig.test.py b/tests/gold_tests/pluginTest/url_sig/url_sig.test.py index c104c11cd4d..72e8fddc50b 100644 --- a/tests/gold_tests/pluginTest/url_sig/url_sig.test.py +++ b/tests/gold_tests/pluginTest/url_sig/url_sig.test.py @@ -53,7 +53,7 @@ ts.Disk.records_config.update( { - # 'proxy.config.diags.debug.enabled': 1, + # 'proxy.config.diags.debug.mode': 1, # 'proxy.config.diags.debug.tags': 'http|url_sig', 'proxy.config.proxy_name': 'Poxy_Proxy', # This will be the server name. 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/pluginTest/xdebug/x_cache_info/x_cache_info.test.py b/tests/gold_tests/pluginTest/xdebug/x_cache_info/x_cache_info.test.py index c69c65936af..8f8ad55d427 100644 --- a/tests/gold_tests/pluginTest/xdebug/x_cache_info/x_cache_info.test.py +++ b/tests/gold_tests/pluginTest/xdebug/x_cache_info/x_cache_info.test.py @@ -32,7 +32,7 @@ ts.Disk.records_config.update( { 'proxy.config.url_remap.remap_required': 0, - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'http' }) diff --git a/tests/gold_tests/pluginTest/xdebug/x_effective_url/x_effective_url.test.py b/tests/gold_tests/pluginTest/xdebug/x_effective_url/x_effective_url.test.py index 9db0aa28163..1811970b4f5 100644 --- a/tests/gold_tests/pluginTest/xdebug/x_effective_url/x_effective_url.test.py +++ b/tests/gold_tests/pluginTest/xdebug/x_effective_url/x_effective_url.test.py @@ -42,7 +42,7 @@ ts.Disk.records_config.update({ 'proxy.config.url_remap.remap_required': 0, - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, }) ts.Disk.plugin_config.AddLine('xdebug.so --enable=x-effective-url') diff --git a/tests/gold_tests/pluginTest/xdebug/x_remap/x_remap.test.py b/tests/gold_tests/pluginTest/xdebug/x_remap/x_remap.test.py index 332f8601b45..146222f40fc 100644 --- a/tests/gold_tests/pluginTest/xdebug/x_remap/x_remap.test.py +++ b/tests/gold_tests/pluginTest/xdebug/x_remap/x_remap.test.py @@ -31,7 +31,7 @@ ts.Disk.records_config.update( { 'proxy.config.url_remap.remap_required': 0, - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, # 'proxy.config.diags.debug.tags': 'http|xdebug' # 'proxy.config.diags.debug.tags': 'xdebug' }) diff --git a/tests/gold_tests/post/expect_tests.test.py b/tests/gold_tests/post/expect_tests.test.py index e6f85cd660c..4b385a60a0e 100644 --- a/tests/gold_tests/post/expect_tests.test.py +++ b/tests/gold_tests/post/expect_tests.test.py @@ -58,7 +58,7 @@ def _setup_trafficserver(self, tr: 'TestRun') -> None: ts.Disk.remap_config.AddLine(f'map / http://backend.example.com:{self._server.Variables.http_port}') ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.dns.nameservers': f"127.0.0.1:{self._dns.Variables.Port}", 'proxy.config.dns.resolv_conf': 'NULL', diff --git a/tests/gold_tests/post/post-continue.test.py b/tests/gold_tests/post/post-continue.test.py index 5dfd75044c1..f7f9dd9a6c2 100644 --- a/tests/gold_tests/post/post-continue.test.py +++ b/tests/gold_tests/post/post-continue.test.py @@ -52,7 +52,7 @@ { 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', }) ts2.Disk.remap_config.AddLine('map / http://127.0.0.1:{0}'.format(server.Variables.http_port)) @@ -61,7 +61,7 @@ { 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.send_100_continue_response': 1 }) diff --git a/tests/gold_tests/post/post-early-return.test.py b/tests/gold_tests/post/post-early-return.test.py index 82879eb4015..80955714b7f 100644 --- a/tests/gold_tests/post/post-early-return.test.py +++ b/tests/gold_tests/post/post-early-return.test.py @@ -56,7 +56,7 @@ { 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, # 'proxy.config.http2.initial_window_size_in': 2*16384, # Make a ludacrisly small window 'proxy.config.diags.debug.tags': 'http', }) diff --git a/tests/gold_tests/post_slow_server/post_slow_server.test.py b/tests/gold_tests/post_slow_server/post_slow_server.test.py index 4447eb938bc..73bda233015 100644 --- a/tests/gold_tests/post_slow_server/post_slow_server.test.py +++ b/tests/gold_tests/post_slow_server/post_slow_server.test.py @@ -32,7 +32,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.proxy_name': 'Poxy_Proxy', # This will be the server name. 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/post_slow_server/post_slow_server_max_requests_in.test.py b/tests/gold_tests/post_slow_server/post_slow_server_max_requests_in.test.py index 5397e23d6a2..49d7dfa63a4 100644 --- a/tests/gold_tests/post_slow_server/post_slow_server_max_requests_in.test.py +++ b/tests/gold_tests/post_slow_server/post_slow_server_max_requests_in.test.py @@ -44,7 +44,7 @@ def __setupTS(self): "proxy.config.http.server_ports": f"{self.ts.Variables.port} {self.ts.Variables.uds_path}", "proxy.config.net.max_requests_in": 1000, 'proxy.config.http.connect_attempts_timeout': 1, - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http|socket|v_net_queue", }) diff --git a/tests/gold_tests/proxy_protocol/proxy_protocol.test.py b/tests/gold_tests/proxy_protocol/proxy_protocol.test.py index a88220f5e3b..20e8952cee3 100644 --- a/tests/gold_tests/proxy_protocol/proxy_protocol.test.py +++ b/tests/gold_tests/proxy_protocol/proxy_protocol.test.py @@ -48,7 +48,7 @@ def setupTS(self): "proxy.config.http.insert_forwarded": "for|by=ip|proto", "proxy.config.ssl.server.cert.path": f"{self.ts.Variables.SSLDir}", "proxy.config.ssl.server.private_key.path": f"{self.ts.Variables.SSLDir}", - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "proxyprotocol", }) @@ -150,7 +150,7 @@ def setupTS(self, tr: 'TestRun') -> None: { "proxy.config.ssl.server.cert.path": f"{self._ts.Variables.SSLDir}", "proxy.config.ssl.server.private_key.path": f"{self._ts.Variables.SSLDir}", - "proxy.config.diags.debug.enabled": 1, + "proxy.config.diags.debug.mode": 1, "proxy.config.diags.debug.tags": "http|proxyprotocol", "proxy.config.http.proxy_protocol_out": self._pp_version, "proxy.config.dns.nameservers": f"127.0.0.1:{self._dns.Variables.Port}", diff --git a/tests/gold_tests/records/legacy_config/full_records.config b/tests/gold_tests/records/legacy_config/full_records.config index 8b1d13c822b..43767e90471 100644 --- a/tests/gold_tests/records/legacy_config/full_records.config +++ b/tests/gold_tests/records/legacy_config/full_records.config @@ -3,12 +3,12 @@ CONFIG proxy.config.product_vendor STRING Apache CONFIG proxy.config.product_name STRING Traffic Server CONFIG proxy.config.proxy_name STRING traffic_server CONFIG proxy.config.core_limit INT -1 -CONFIG proxy.config.mlock_enabled INT 0 +CONFIG proxy.config.mlock.mode INT 0 CONFIG proxy.config.dump_mem_info_frequency INT 0 CONFIG proxy.config.cache.max_disk_errors INT 5 CONFIG proxy.config.output.logfile STRING traffic.out CONFIG proxy.config.output.logfile_perm STRING rw-r--r-- -CONFIG proxy.config.output.logfile.rolling_enabled INT 0 +CONFIG proxy.config.output.logfile.rolling.mode INT 0 CONFIG proxy.config.output.logfile.rolling_interval_sec INT 3600 CONFIG proxy.config.output.logfile.rolling_size_mb INT 100 CONFIG proxy.config.output.logfile.rolling_min_count INT 0 @@ -38,7 +38,7 @@ CONFIG proxy.config.http.redirect_use_orig_cache_key INT 0 CONFIG proxy.config.http.redirect_host_no_port INT 1 CONFIG proxy.config.http.post_copy_size INT 2048 CONFIG proxy.config.http.redirect.actions STRING routable:follow -CONFIG proxy.config.diags.debug.enabled INT 0 +CONFIG proxy.config.diags.debug.mode INT 0 CONFIG proxy.config.diags.debug.tags STRING http|dns CONFIG proxy.config.diags.debug.throttling_interval_msec INT 0 CONFIG proxy.config.diags.action.enabled INT 0 @@ -54,6 +54,7 @@ CONFIG proxy.config.diags.output.alert STRING L CONFIG proxy.config.diags.output.emergency STRING L CONFIG proxy.config.diags.logfile_perm STRING rw-r--r-- CONFIG proxy.config.diags.logfile.filename STRING diags.log +CONFIG proxy.config.diags.logfile.rolling.mode INT 0 CONFIG proxy.config.diags.logfile.rolling_enabled INT 0 CONFIG proxy.config.diags.logfile.rolling_interval_sec INT 3600 CONFIG proxy.config.diags.logfile.rolling_size_mb INT 10 @@ -72,7 +73,7 @@ CONFIG proxy.config.http.insert_request_via_str INT 1 CONFIG proxy.config.http.insert_response_via_str INT 0 CONFIG proxy.config.http.request_via_str STRING ApacheTrafficServer CONFIG proxy.config.http.response_via_str STRING ApacheTrafficServer -CONFIG proxy.config.http.response_server_enabled INT 1 +CONFIG proxy.config.http.response_server.mode INT 1 CONFIG proxy.config.http.response_server_str STRING ATS/ CONFIG proxy.config.http.no_dns_just_forward_to_parent INT 0 CONFIG proxy.config.http.uncacheable_requests_bypass_parent INT 1 @@ -310,6 +311,7 @@ CONFIG proxy.config.http.connect_ports STRING 443 CONFIG proxy.config.config_update_interval_ms INT 3000 CONFIG proxy.config.raw_stat_sync_interval_ms INT 5000 CONFIG proxy.config.remote_sync_interval_ms INT 5000 +CONFIG proxy.config.log.logging.mode INT 3 CONFIG proxy.config.log.logging_enabled INT 3 CONFIG proxy.config.log.log_buffer_size INT 9216 CONFIG proxy.config.log.log_fast_buffer INT 0 @@ -319,6 +321,7 @@ CONFIG proxy.config.log.max_space_mb_headroom INT 1000 CONFIG proxy.config.log.hostname STRING localhost CONFIG proxy.config.log.logfile_perm STRING rw-r--r-- CONFIG proxy.config.log.preproc_threads INT 1 +CONFIG proxy.config.log.rolling.mode INT 1 CONFIG proxy.config.log.rolling_enabled INT 1 CONFIG proxy.config.log.rolling_interval_sec INT 86400 CONFIG proxy.config.log.rolling_offset_hr INT 0 diff --git a/tests/gold_tests/records/records_yaml.test.py b/tests/gold_tests/records/records_yaml.test.py index 95fd59b4298..136b3bcceb9 100644 --- a/tests/gold_tests/records/records_yaml.test.py +++ b/tests/gold_tests/records/records_yaml.test.py @@ -141,13 +141,13 @@ def check_response(resp: Response): tr.Processes.StillRunningAfter = ts2 tr2 = Test.AddTestRun("Test multiple docs from the same file") -tr2.Processes.Default.Command = 'traffic_ctl config get proxy.config.diags.debug.enabled proxy.config.diags.debug.tags' +tr2.Processes.Default.Command = 'traffic_ctl config get proxy.config.diags.debug.mode proxy.config.diags.debug.tags' tr2.Processes.Default.Env = ts2.Env tr2.Processes.Default.ReturnCode = 0 # Make sure it's what we want. tr2.Processes.Default.Streams.stdout += Testers.ContainsExpression( - 'proxy.config.diags.debug.enabled: 0', 'Config should show debug disabled') + 'proxy.config.diags.debug.mode: 0', 'Config should show debug disabled') tr2.Processes.Default.Streams.stdout += Testers.ContainsExpression( 'proxy.config.diags.debug.tags: filemanager', 'Config should show a different tag') diff --git a/tests/gold_tests/redirect/number_of_redirects.test.py b/tests/gold_tests/redirect/number_of_redirects.test.py index e948dc62060..80612677447 100644 --- a/tests/gold_tests/redirect/number_of_redirects.test.py +++ b/tests/gold_tests/redirect/number_of_redirects.test.py @@ -62,7 +62,7 @@ def setup_dns(self): def add_config(self): self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|redirect|http_redirect', 'proxy.config.http.number_of_redirections': self._numberOfRedirections, 'proxy.config.dns.nameservers': f'127.0.0.1:{self._dns.Variables.Port}', diff --git a/tests/gold_tests/redirect/redirect.test.py b/tests/gold_tests/redirect/redirect.test.py index 6e9d92aaf3f..8ca64a620d1 100644 --- a/tests/gold_tests/redirect/redirect.test.py +++ b/tests/gold_tests/redirect/redirect.test.py @@ -33,7 +33,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|redirect', 'proxy.config.http.number_of_redirections': 1, 'proxy.config.dns.nameservers': '127.0.0.1:{0}'.format(dns.Variables.Port), diff --git a/tests/gold_tests/redirect/redirect_actions.test.py b/tests/gold_tests/redirect/redirect_actions.test.py index 52a036bd61f..32a9b03e8e9 100644 --- a/tests/gold_tests/redirect/redirect_actions.test.py +++ b/tests/gold_tests/redirect/redirect_actions.test.py @@ -133,7 +133,7 @@ def makeTestCase(redirectTarget, expectedAction, scenario): trafficservers[config] = Test.MakeATSProcess('ts_{0}'.format(normConfig), enable_cache=False) trafficservers[config].Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|redirect', 'proxy.config.http.number_of_redirections': 1, 'proxy.config.dns.nameservers': '127.0.0.1:{0}'.format(dns.Variables.Port), diff --git a/tests/gold_tests/redirect/redirect_post.test.py b/tests/gold_tests/redirect/redirect_post.test.py index 8d1d3d545c3..bdd3d4ecb90 100644 --- a/tests/gold_tests/redirect/redirect_post.test.py +++ b/tests/gold_tests/redirect/redirect_post.test.py @@ -37,7 +37,7 @@ 'proxy.config.http.number_of_redirections': MAX_REDIRECT, 'proxy.config.http.post_copy_size': 919430601, 'proxy.config.http.redirect.actions': 'self:follow', # redirects to self are not followed by default - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', }) diff --git a/tests/gold_tests/redirect/redirect_stale.test.py b/tests/gold_tests/redirect/redirect_stale.test.py index 7d9cae55378..6a1e59e0b77 100644 --- a/tests/gold_tests/redirect/redirect_stale.test.py +++ b/tests/gold_tests/redirect/redirect_stale.test.py @@ -59,7 +59,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|cache|redirect', 'proxy.config.http.cache.required_headers': 0, # Only Content-Length header required for caching. 'proxy.config.http.push_method_enabled': 1, diff --git a/tests/gold_tests/redirect/redirect_to_same_origin_on_cache.test.py b/tests/gold_tests/redirect/redirect_to_same_origin_on_cache.test.py index 4ca60e1926d..2147368b58b 100644 --- a/tests/gold_tests/redirect/redirect_to_same_origin_on_cache.test.py +++ b/tests/gold_tests/redirect/redirect_to_same_origin_on_cache.test.py @@ -112,7 +112,7 @@ def _configure_traffic_server(self, tr: "TestRun", server_one: "Process"): ts.Disk.records_config.update( { 'proxy.config.http.server_ports': f"{self._port_one}", - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': "cache|dns|http|redirect|remap", 'proxy.config.dns.nameservers': f"127.0.0.1:{self._dns_port}", 'proxy.config.dns.resolv_conf': 'NULL', diff --git a/tests/gold_tests/remap/regex_map.test.py b/tests/gold_tests/remap/regex_map.test.py index 64b70bbb159..05a7bee0bc5 100644 --- a/tests/gold_tests/remap/regex_map.test.py +++ b/tests/gold_tests/remap/regex_map.test.py @@ -33,7 +33,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http.*|dns|conf_remap', 'proxy.config.http.referer_filter': 1, 'proxy.config.dns.nameservers': '127.0.0.1:{0}'.format(dns.Variables.Port), diff --git a/tests/gold_tests/remap/remap_acl.test.py b/tests/gold_tests/remap/remap_acl.test.py index e6d6027ce48..0f3b069e8a5 100644 --- a/tests/gold_tests/remap/remap_acl.test.py +++ b/tests/gold_tests/remap/remap_acl.test.py @@ -85,7 +85,7 @@ def _configure_traffic_server(self, tr: 'TestRun', proxy_protocol: bool) -> None ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|url|remap|ip_allow|proxyprotocol', 'proxy.config.http.push_method_enabled': 1, 'proxy.config.http.connect_ports': self._server.Variables.http_port, @@ -164,7 +164,7 @@ def _configure_traffic_server(self, tr: 'TestRun', acl_filter: str, ip_allow_con ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|url|remap|ip_allow', 'proxy.config.url_remap.acl_behavior_policy': 1, }) diff --git a/tests/gold_tests/remap/remap_http.test.py b/tests/gold_tests/remap/remap_http.test.py index 446071fa87d..ceecb29a335 100644 --- a/tests/gold_tests/remap/remap_http.test.py +++ b/tests/gold_tests/remap/remap_http.test.py @@ -41,7 +41,7 @@ server2.addResponse("sessionfile.log", request_header2, response_header2) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http.*|dns|conf_remap', 'proxy.config.http.referer_filter': 1, 'proxy.config.dns.nameservers': '127.0.0.1:{0}'.format(dns.Variables.Port), diff --git a/tests/gold_tests/remap/remap_https.test.py b/tests/gold_tests/remap/remap_https.test.py index 19f74ae8309..712bb47ad23 100644 --- a/tests/gold_tests/remap/remap_https.test.py +++ b/tests/gold_tests/remap/remap_https.test.py @@ -40,7 +40,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'lm|ssl', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/remap/remap_ip_resolve.test.py b/tests/gold_tests/remap/remap_ip_resolve.test.py index a8e1a1c8188..8fd0b583527 100644 --- a/tests/gold_tests/remap/remap_ip_resolve.test.py +++ b/tests/gold_tests/remap/remap_ip_resolve.test.py @@ -38,7 +38,7 @@ server_v6.addResponse("sessionfile.log", request_header, response_header) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http.*|dns|conf_remap', 'proxy.config.http.referer_filter': 1, 'proxy.config.dns.nameservers': '127.0.0.1:{0}'.format(dns.Variables.Port), diff --git a/tests/gold_tests/session_sharing/session_match.test.py b/tests/gold_tests/session_sharing/session_match.test.py index 5844502a5f5..91b77e81939 100644 --- a/tests/gold_tests/session_sharing/session_match.test.py +++ b/tests/gold_tests/session_sharing/session_match.test.py @@ -78,7 +78,7 @@ def setupTS(self): self._ts.Disk.remap_config.AddLine('map / http://127.0.0.1:{0}'.format(self._server.Variables.Port)) self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.auth_server_session_private': 1, 'proxy.config.http.server_session_sharing.pool': 'global', diff --git a/tests/gold_tests/shutdown/emergency.test.py b/tests/gold_tests/shutdown/emergency.test.py index 6a0dff5fa79..9a5e519bb51 100644 --- a/tests/gold_tests/shutdown/emergency.test.py +++ b/tests/gold_tests/shutdown/emergency.test.py @@ -33,7 +33,7 @@ 'proxy.config.exec_thread.limit': 16, 'proxy.config.accept_threads': 1, 'proxy.config.task_threads': 2, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'TSEmergency_test' }) diff --git a/tests/gold_tests/shutdown/fatal.test.py b/tests/gold_tests/shutdown/fatal.test.py index cff3c9fefbf..72355eab165 100644 --- a/tests/gold_tests/shutdown/fatal.test.py +++ b/tests/gold_tests/shutdown/fatal.test.py @@ -33,7 +33,7 @@ 'proxy.config.exec_thread.limit': 16, 'proxy.config.accept_threads': 1, 'proxy.config.task_threads': 2, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'TSFatal_test' }) diff --git a/tests/gold_tests/slow_post/quick_server.test.py b/tests/gold_tests/slow_post/quick_server.test.py index fe250407987..d2a27a5bb00 100644 --- a/tests/gold_tests/slow_post/quick_server.test.py +++ b/tests/gold_tests/slow_post/quick_server.test.py @@ -84,7 +84,7 @@ def _configure_traffic_server(self, tr: 'TestRun'): self._ts.Disk.remap_config.AddLine(f'map / http://quick.server.com:{self._server.Variables.http_port}') self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|dns|hostdb', 'proxy.config.dns.nameservers': f'127.0.0.1:{self._dns.Variables.Port}', 'proxy.config.dns.resolv_conf': 'NULL', diff --git a/tests/gold_tests/slow_post/server_abort.test.py b/tests/gold_tests/slow_post/server_abort.test.py index 1004bcdb6a3..064c9f77798 100644 --- a/tests/gold_tests/slow_post/server_abort.test.py +++ b/tests/gold_tests/slow_post/server_abort.test.py @@ -34,7 +34,7 @@ ts.Disk.records_config.update( { 'proxy.config.diags.debug.tags': 'http|dns', - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.ssl.server.cert.path': f'{Test.TestDirectory}/test_secrets', 'proxy.config.ssl.server.private_key.path': f'{Test.TestDirectory}/test_secrets', }) diff --git a/tests/gold_tests/slow_post/slow_post.test.py b/tests/gold_tests/slow_post/slow_post.test.py index aa57dfd3b78..090f13e0db4 100644 --- a/tests/gold_tests/slow_post/slow_post.test.py +++ b/tests/gold_tests/slow_post/slow_post.test.py @@ -59,7 +59,7 @@ def setupTS(self): Test.PrepareInstalledPlugin('request_buffer.so', self._ts) self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.http.per_server.connection.max': self._origin_max_connections, }) diff --git a/tests/gold_tests/thread_config/thread_config.test.py b/tests/gold_tests/thread_config/thread_config.test.py index 8adc59814bf..7fd73a04b09 100644 --- a/tests/gold_tests/thread_config/thread_config.test.py +++ b/tests/gold_tests/thread_config/thread_config.test.py @@ -30,7 +30,7 @@ 'proxy.config.accept_threads': 0, 'proxy.config.task_threads': 1, 'proxy.config.cache.threads_per_disk': 1, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'iocore_thread_start|iocore_net_accept_start' }) ts.Setup.CopyAs('check_threads.py', Test.RunDirectory) @@ -50,7 +50,7 @@ 'proxy.config.accept_threads': 1, 'proxy.config.task_threads': 2, 'proxy.config.cache.threads_per_disk': 8, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'iocore_thread_start|iocore_net_accept_start' }) @@ -69,7 +69,7 @@ 'proxy.config.accept_threads': 10, 'proxy.config.task_threads': 10, 'proxy.config.cache.threads_per_disk': 32, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'iocore_thread_start|iocore_net_accept_start' }) @@ -88,7 +88,7 @@ 'proxy.config.accept_threads': 0, 'proxy.config.task_threads': 1, 'proxy.config.cache.threads_per_disk': 1, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'iocore_thread_start|iocore_net_accept_start' }) @@ -107,7 +107,7 @@ 'proxy.config.accept_threads': 1, 'proxy.config.task_threads': 2, 'proxy.config.cache.threads_per_disk': 8, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'iocore_thread_start|iocore_net_accept_start' }) @@ -126,7 +126,7 @@ 'proxy.config.accept_threads': 10, 'proxy.config.task_threads': 10, 'proxy.config.cache.threads_per_disk': 32, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'iocore_thread_start|iocore_net_accept_start' }) @@ -145,7 +145,7 @@ 'proxy.config.accept_threads': 0, 'proxy.config.task_threads': 1, 'proxy.config.cache.threads_per_disk': 1, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'iocore_thread_start|iocore_net_accept_start' }) @@ -164,7 +164,7 @@ 'proxy.config.accept_threads': 1, 'proxy.config.task_threads': 2, 'proxy.config.cache.threads_per_disk': 8, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'iocore_thread_start|iocore_net_accept_start' }) @@ -183,7 +183,7 @@ 'proxy.config.accept_threads': 10, 'proxy.config.task_threads': 10, 'proxy.config.cache.threads_per_disk': 32, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'iocore_thread_start|iocore_net_accept_start' }) @@ -202,7 +202,7 @@ 'proxy.config.accept_threads': 0, 'proxy.config.task_threads': 1, 'proxy.config.cache.threads_per_disk': 1, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'iocore_thread_start|iocore_net_accept_start' }) @@ -221,7 +221,7 @@ 'proxy.config.accept_threads': 1, 'proxy.config.task_threads': 2, 'proxy.config.cache.threads_per_disk': 8, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'iocore_thread_start|iocore_net_accept_start' }) @@ -240,7 +240,7 @@ 'proxy.config.accept_threads': 10, 'proxy.config.task_threads': 10, 'proxy.config.cache.threads_per_disk': 32, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'iocore_thread_start|iocore_net_accept_start' }) diff --git a/tests/gold_tests/timeout/conn_timeout.test.py b/tests/gold_tests/timeout/conn_timeout.test.py index 125b06465b6..8f68cdd2f42 100644 --- a/tests/gold_tests/timeout/conn_timeout.test.py +++ b/tests/gold_tests/timeout/conn_timeout.test.py @@ -36,7 +36,7 @@ 'proxy.config.http.connect_attempts_timeout': 2, 'proxy.config.http.connect_attempts_max_retries': 0, 'proxy.config.http.transaction_no_activity_timeout_out': 5, - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'http', }) diff --git a/tests/gold_tests/timeout/default_inactivity_timeout.test.py b/tests/gold_tests/timeout/default_inactivity_timeout.test.py index a56bdd604a1..3999efd9b50 100644 --- a/tests/gold_tests/timeout/default_inactivity_timeout.test.py +++ b/tests/gold_tests/timeout/default_inactivity_timeout.test.py @@ -60,7 +60,7 @@ def _configure_traffic_server(self, tr: 'TestRun') -> None: debug_tags = 'http|cache|socket|net_queue|inactivity_cop|conf_remap' ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': debug_tags, }) diff --git a/tests/gold_tests/timeout/http2_no_activity_timeout.test.py b/tests/gold_tests/timeout/http2_no_activity_timeout.test.py index bab22021048..58fbdc44040 100644 --- a/tests/gold_tests/timeout/http2_no_activity_timeout.test.py +++ b/tests/gold_tests/timeout/http2_no_activity_timeout.test.py @@ -81,7 +81,7 @@ def _configure_traffic_server(self, tr: 'TestRun'): self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|socket|inactivity_cop', 'proxy.config.ssl.server.cert.path': self._ts.Variables.SSLDir, 'proxy.config.ssl.server.private_key.path': self._ts.Variables.SSLDir, diff --git a/tests/gold_tests/timeout/inactive_client_timeout.test.py b/tests/gold_tests/timeout/inactive_client_timeout.test.py index 6c0a06f3f2c..683ad963afc 100644 --- a/tests/gold_tests/timeout/inactive_client_timeout.test.py +++ b/tests/gold_tests/timeout/inactive_client_timeout.test.py @@ -31,7 +31,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/timeout/quic_no_activity_timeout.test.py b/tests/gold_tests/timeout/quic_no_activity_timeout.test.py index 0b688c8b0a5..5d9445f21cd 100644 --- a/tests/gold_tests/timeout/quic_no_activity_timeout.test.py +++ b/tests/gold_tests/timeout/quic_no_activity_timeout.test.py @@ -64,7 +64,7 @@ def _configure_traffic_server(self, tr: 'TestRun'): self._ts.addSSLfile("ssl/private-key.key") self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl|net|v_quic|quic|http|socket|inactivity_cop', 'proxy.config.quic.no_activity_timeout_in': self.no_activity_timeout_in, 'proxy.config.quic.qlog.file_base': f'log/qlog_{Test_quic_no_activity_timeout.server_counter}', diff --git a/tests/gold_tests/timeout/quic_poll_timeout.test.py b/tests/gold_tests/timeout/quic_poll_timeout.test.py index 79386d30df3..dd32561c6dd 100644 --- a/tests/gold_tests/timeout/quic_poll_timeout.test.py +++ b/tests/gold_tests/timeout/quic_poll_timeout.test.py @@ -49,7 +49,7 @@ def _configure_traffic_server(self, tr: 'TestRun'): self._ts = ts self._ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'net|v_quic|quic|socket|inactivity_cop|v_iocore_net_poll', }) diff --git a/tests/gold_tests/timeout/tls_conn_timeout.test.py b/tests/gold_tests/timeout/tls_conn_timeout.test.py index 4342f768e37..486d49d5496 100644 --- a/tests/gold_tests/timeout/tls_conn_timeout.test.py +++ b/tests/gold_tests/timeout/tls_conn_timeout.test.py @@ -46,7 +46,7 @@ 'proxy.config.http.connect_attempts_timeout': 1, 'proxy.config.http.connect_attempts_max_retries': 1, 'proxy.config.http.transaction_no_activity_timeout_out': 4, - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'http|ssl', 'proxy.config.ssl.client.verify.server.policy': 'PERMISSIVE', }) diff --git a/tests/gold_tests/tls/allow-plain.test.py b/tests/gold_tests/tls/allow-plain.test.py index d4791383f4f..be6d287c26e 100644 --- a/tests/gold_tests/tls/allow-plain.test.py +++ b/tests/gold_tests/tls/allow-plain.test.py @@ -43,7 +43,7 @@ 'proxy.config.http.server_ports': '{0}:ssl:allow-plain'.format(ts.Variables.ssl_port), 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'ssl|http', }) diff --git a/tests/gold_tests/tls/ssl_key_dialog.test.py b/tests/gold_tests/tls/ssl_key_dialog.test.py index c1459e576ff..58dc412a5e0 100644 --- a/tests/gold_tests/tls/ssl_key_dialog.test.py +++ b/tests/gold_tests/tls/ssl_key_dialog.test.py @@ -32,7 +32,7 @@ ts.Disk.remap_config.AddLine(f"map https://passphrase:{ts.Variables.ssl_port}/ http://127.0.0.1:{server.Variables.Port}") ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl_load|http', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls/tls.test.py b/tests/gold_tests/tls/tls.test.py index 60789376ca0..f7f64d4e3ae 100644 --- a/tests/gold_tests/tls/tls.test.py +++ b/tests/gold_tests/tls/tls.test.py @@ -71,7 +71,7 @@ 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.exec_thread.autoconfig.scale': 1.0, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl', }) diff --git a/tests/gold_tests/tls/tls_0rtt_server.test.py b/tests/gold_tests/tls/tls_0rtt_server.test.py index cdbf48e1b97..0a12d62d2fd 100644 --- a/tests/gold_tests/tls/tls_0rtt_server.test.py +++ b/tests/gold_tests/tls/tls_0rtt_server.test.py @@ -98,7 +98,7 @@ ts1.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|ssl_early_data|ssl', 'proxy.config.exec_thread.autoconfig.enabled': 0, 'proxy.config.exec_thread.limit': 8, @@ -127,7 +127,7 @@ ts2.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|ssl_early_data|ssl', 'proxy.config.exec_thread.autoconfig.enabled': 0, 'proxy.config.exec_thread.limit': 8, diff --git a/tests/gold_tests/tls/tls_check_cert_select_plugin.test.py b/tests/gold_tests/tls/tls_check_cert_select_plugin.test.py index b4b4d8f5870..f7ea4c6ad33 100644 --- a/tests/gold_tests/tls/tls_check_cert_select_plugin.test.py +++ b/tests/gold_tests/tls/tls_check_cert_select_plugin.test.py @@ -58,7 +58,7 @@ ts.Disk.records_config.update( { 'proxy.config.diags.debug.tags': 'ssl_secret_load_test|ssl', - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.ssl.server.cert.path': '{0}/../'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}/../'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.cipher_suite': diff --git a/tests/gold_tests/tls/tls_check_cert_selection_reload.test.py b/tests/gold_tests/tls/tls_check_cert_selection_reload.test.py index 51d092a844e..2519fe9e7ef 100644 --- a/tests/gold_tests/tls/tls_check_cert_selection_reload.test.py +++ b/tests/gold_tests/tls/tls_check_cert_selection_reload.test.py @@ -55,7 +55,7 @@ 'proxy.config.exec_thread.autoconfig.scale': 1.0, 'proxy.config.ssl.client.verify.server.policy': 'PERMISSIVE', 'proxy.config.diags.debug.tags': 'ssl|http|lm', - 'proxy.config.diags.debug.enabled': 1 + 'proxy.config.diags.debug.mode': 1 }) # Should receive a bar.com cert issued by first signer diff --git a/tests/gold_tests/tls/tls_check_dual_cert_selection.test.py b/tests/gold_tests/tls/tls_check_dual_cert_selection.test.py index cff5c542803..80e6f6e1baf 100644 --- a/tests/gold_tests/tls/tls_check_dual_cert_selection.test.py +++ b/tests/gold_tests/tls/tls_check_dual_cert_selection.test.py @@ -67,7 +67,7 @@ 'proxy.config.exec_thread.autoconfig.scale': 1.0, 'proxy.config.dns.resolv_conf': 'NULL', 'proxy.config.diags.debug.tags': 'ssl', - 'proxy.config.diags.debug.enabled': 1 + 'proxy.config.diags.debug.mode': 1 }) dns.addRecords(records={"foo.com.": ["127.0.0.1"]}) diff --git a/tests/gold_tests/tls/tls_check_dual_cert_selection2.test.py b/tests/gold_tests/tls/tls_check_dual_cert_selection2.test.py index 94b01e8ded3..5904d69d97c 100644 --- a/tests/gold_tests/tls/tls_check_dual_cert_selection2.test.py +++ b/tests/gold_tests/tls/tls_check_dual_cert_selection2.test.py @@ -68,7 +68,7 @@ 'proxy.config.exec_thread.autoconfig.scale': 1.0, 'proxy.config.dns.resolv_conf': 'NULL', 'proxy.config.diags.debug.tags': 'ssl', - 'proxy.config.diags.debug.enabled': 0 + 'proxy.config.diags.debug.mode': 0 }) dns.addRecords(records={"foo.com.": ["127.0.0.1"]}) diff --git a/tests/gold_tests/tls/tls_check_dual_cert_selection_plugin.test.py b/tests/gold_tests/tls/tls_check_dual_cert_selection_plugin.test.py index c2be665da54..4011925b19f 100644 --- a/tests/gold_tests/tls/tls_check_dual_cert_selection_plugin.test.py +++ b/tests/gold_tests/tls/tls_check_dual_cert_selection_plugin.test.py @@ -72,7 +72,7 @@ 'proxy.config.exec_thread.autoconfig.scale': 1.0, 'proxy.config.dns.resolv_conf': 'NULL', 'proxy.config.diags.debug.tags': 'ssl_secret_load_test', - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, }) dns.addRecords(records={"foo.com.": ["127.0.0.1"]}) diff --git a/tests/gold_tests/tls/tls_client_alpn_configuration.test.py b/tests/gold_tests/tls/tls_client_alpn_configuration.test.py index dc57b3ae38d..6276b6c5945 100644 --- a/tests/gold_tests/tls/tls_client_alpn_configuration.test.py +++ b/tests/gold_tests/tls/tls_client_alpn_configuration.test.py @@ -98,7 +98,7 @@ def _configure_trafficserver( "proxy.config.ssl.server.cert.path": f'{ts.Variables.SSLDir}', "proxy.config.ssl.server.private_key.path": f'{ts.Variables.SSLDir}', "proxy.config.ssl.client.verify.server.policy": 'PERMISSIVE', - 'proxy.config.diags.debug.enabled': 3, + 'proxy.config.diags.debug.mode': 3, 'proxy.config.diags.debug.tags': 'ssl|http', }) diff --git a/tests/gold_tests/tls/tls_client_cert.test.py b/tests/gold_tests/tls/tls_client_cert.test.py index c848c735faa..a1c6d3bce9b 100644 --- a/tests/gold_tests/tls/tls_client_cert.test.py +++ b/tests/gold_tests/tls/tls_client_cert.test.py @@ -78,7 +78,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl_verify_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls/tls_client_cert2_plugin.test.py b/tests/gold_tests/tls/tls_client_cert2_plugin.test.py index 3f7924d7773..2a01d263afb 100644 --- a/tests/gold_tests/tls/tls_client_cert2_plugin.test.py +++ b/tests/gold_tests/tls/tls_client_cert2_plugin.test.py @@ -84,7 +84,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl_secret_load_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls/tls_client_cert_override.test.py b/tests/gold_tests/tls/tls_client_cert_override.test.py index 38f951d5705..ec531a2d708 100644 --- a/tests/gold_tests/tls/tls_client_cert_override.test.py +++ b/tests/gold_tests/tls/tls_client_cert_override.test.py @@ -75,7 +75,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls/tls_client_cert_override_plugin.test.py b/tests/gold_tests/tls/tls_client_cert_override_plugin.test.py index c9af9e2cca3..9cdfdc848c6 100644 --- a/tests/gold_tests/tls/tls_client_cert_override_plugin.test.py +++ b/tests/gold_tests/tls/tls_client_cert_override_plugin.test.py @@ -103,7 +103,7 @@ 'proxy.config.ssl.client.private_key.filename': 'signed-foo.key', 'proxy.config.exec_thread.autoconfig.scale': 1.0, 'proxy.config.url_remap.pristine_host_hdr': 1, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl_secret_load|http|ssl', }) diff --git a/tests/gold_tests/tls/tls_client_cert_plugin.test.py b/tests/gold_tests/tls/tls_client_cert_plugin.test.py index 7b8d39d91ee..597b1f7e6cb 100644 --- a/tests/gold_tests/tls/tls_client_cert_plugin.test.py +++ b/tests/gold_tests/tls/tls_client_cert_plugin.test.py @@ -85,7 +85,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl_secret_load_test|ssl', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), @@ -168,7 +168,7 @@ 'proxy.config.ssl.client.private_key.path': '{0}/../'.format(ts.Variables.SSLDir), 'proxy.config.ssl.client.private_key.filename': 'signed-foo.key', 'proxy.config.url_remap.pristine_host_hdr': 1, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl_secret_load_test|ssl', }) tr2.StillRunningAfter = ts diff --git a/tests/gold_tests/tls/tls_client_verify3.test.py b/tests/gold_tests/tls/tls_client_verify3.test.py index 27fd741b8f5..14d8dabf06b 100644 --- a/tests/gold_tests/tls/tls_client_verify3.test.py +++ b/tests/gold_tests/tls/tls_client_verify3.test.py @@ -40,7 +40,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl', 'proxy.config.ssl.server.cert.path': ts.Variables.SSLDir, 'proxy.config.ssl.server.private_key.path': ts.Variables.SSLDir, diff --git a/tests/gold_tests/tls/tls_client_versions_minmax.test.py b/tests/gold_tests/tls/tls_client_versions_minmax.test.py index 2ea78535803..3b53d605512 100644 --- a/tests/gold_tests/tls/tls_client_versions_minmax.test.py +++ b/tests/gold_tests/tls/tls_client_versions_minmax.test.py @@ -52,7 +52,7 @@ 'proxy.config.ssl.server.version.max': 2, 'proxy.config.ssl.TLSv1_2': 0, # This setting should be ignored in favor of a version range setting 'proxy.config.exec_thread.autoconfig.scale': 1.0, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl', }) diff --git a/tests/gold_tests/tls/tls_engine.test.py b/tests/gold_tests/tls/tls_engine.test.py index 623f4305389..17b66a3ce05 100644 --- a/tests/gold_tests/tls/tls_engine.test.py +++ b/tests/gold_tests/tls/tls_engine.test.py @@ -63,7 +63,7 @@ 'proxy.config.exec_thread.autoconfig.scale': 1.0, 'proxy.config.ssl.engine.conf_file': '{0}/ts/config/load_engine.cnf'.format(Test.RunDirectory), 'proxy.config.ssl.async.handshake.enabled': 1, - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'ssl|http' }) diff --git a/tests/gold_tests/tls/tls_hooks_client_verify.test.py b/tests/gold_tests/tls/tls_hooks_client_verify.test.py index f25e80b4890..6d104e14dc4 100644 --- a/tests/gold_tests/tls/tls_hooks_client_verify.test.py +++ b/tests/gold_tests/tls/tls_hooks_client_verify.test.py @@ -39,7 +39,7 @@ ts.Disk.records_config.update( { # Test looks for debug output from the plugin - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl_client_verify_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls/tls_hooks_verify.test.py b/tests/gold_tests/tls/tls_hooks_verify.test.py index dd33443f05d..0ddf100576c 100644 --- a/tests/gold_tests/tls/tls_hooks_verify.test.py +++ b/tests/gold_tests/tls/tls_hooks_verify.test.py @@ -35,7 +35,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl_verify_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls/tls_ocsp.test.py b/tests/gold_tests/tls/tls_ocsp.test.py index 5a77f84aa97..c2ab2aae2dd 100644 --- a/tests/gold_tests/tls/tls_ocsp.test.py +++ b/tests/gold_tests/tls/tls_ocsp.test.py @@ -56,7 +56,7 @@ 'proxy.config.ssl.ocsp.response.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.ocsp.enabled': 1, 'proxy.config.exec_thread.autoconfig.scale': 1.0, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl_ocsp' }) diff --git a/tests/gold_tests/tls/tls_origin_session_reuse.test.py b/tests/gold_tests/tls/tls_origin_session_reuse.test.py index 7afd06452fd..dcfa8de1fbe 100644 --- a/tests/gold_tests/tls/tls_origin_session_reuse.test.py +++ b/tests/gold_tests/tls/tls_origin_session_reuse.test.py @@ -78,7 +78,7 @@ ts2.Disk.records_config.update( { 'proxy.config.http.cache.http': 0, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl.origin_session_cache', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts2.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts2.Variables.SSLDir), @@ -114,7 +114,7 @@ ts4.Disk.records_config.update( { 'proxy.config.http.cache.http': 0, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl.origin_session_cache', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts4.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts4.Variables.SSLDir), diff --git a/tests/gold_tests/tls/tls_session_key_logging.test.py b/tests/gold_tests/tls/tls_session_key_logging.test.py index 7ace4a076aa..97d5492ad98 100644 --- a/tests/gold_tests/tls/tls_session_key_logging.test.py +++ b/tests/gold_tests/tls/tls_session_key_logging.test.py @@ -52,7 +52,7 @@ def setupTS(self, enable_secrets_logging): "proxy.config.ssl.server.cert.path": f'{self.ts.Variables.SSLDir}', "proxy.config.ssl.server.private_key.path": f'{self.ts.Variables.SSLDir}', "proxy.config.ssl.client.verify.server.policy": 'PERMISSIVE', - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl_keylog' }) self.ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key') diff --git a/tests/gold_tests/tls/tls_sni_groups.test.py b/tests/gold_tests/tls/tls_sni_groups.test.py index 16c1cce280a..87480f7468e 100644 --- a/tests/gold_tests/tls/tls_sni_groups.test.py +++ b/tests/gold_tests/tls/tls_sni_groups.test.py @@ -44,7 +44,7 @@ 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.client.CA.cert.path': '{0}'.format(ts.Variables.SSLDir), - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl_sni', }) diff --git a/tests/gold_tests/tls/tls_sni_host_policy.test.py b/tests/gold_tests/tls/tls_sni_host_policy.test.py index 03a6e172c0b..a30d823e816 100644 --- a/tests/gold_tests/tls/tls_sni_host_policy.test.py +++ b/tests/gold_tests/tls/tls_sni_host_policy.test.py @@ -48,7 +48,7 @@ 'proxy.config.exec_thread.autoconfig.scale': 1.0, 'proxy.config.http.host_sni_policy': 2, 'proxy.config.ssl.TLSv1_3.enabled': 0, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl', }) diff --git a/tests/gold_tests/tls/tls_sni_ip_allow.test.py b/tests/gold_tests/tls/tls_sni_ip_allow.test.py index 84cb9f6b9f3..ac5fe68e9b7 100644 --- a/tests/gold_tests/tls/tls_sni_ip_allow.test.py +++ b/tests/gold_tests/tls/tls_sni_ip_allow.test.py @@ -130,7 +130,7 @@ def _configure_trafficserver(self, tr: 'TestRun', connect_type: int, dns: 'Proce 'proxy.config.ssl.client.verify.server.policy': 'PERMISSIVE', 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", 'proxy.config.dns.resolv_conf': 'NULL', - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|ssl|proxyprotocol', 'proxy.config.acl.subjects': 'PROXY,PEER', }) diff --git a/tests/gold_tests/tls/tls_sni_with_port.test.py b/tests/gold_tests/tls/tls_sni_with_port.test.py index 3f107d6765a..1b3da2469d7 100644 --- a/tests/gold_tests/tls/tls_sni_with_port.test.py +++ b/tests/gold_tests/tls/tls_sni_with_port.test.py @@ -115,7 +115,7 @@ def _configure_traffic_server(self, tr: "TestRun", server_one: "Process", server 'proxy.config.ssl.server.private_key.path': f"{ts.Variables.SSLDir}", 'proxy.config.http.server_ports': f"{self._port_one}:ssl {self._port_two}:ssl {self._port_three}:ssl {self._port_unmapped}:ssl", - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'dns|http|ssl|sni', }) diff --git a/tests/gold_tests/tls/tls_sni_yaml_reload.test.py b/tests/gold_tests/tls/tls_sni_yaml_reload.test.py index 8e2e0b2772b..4968ba1f997 100644 --- a/tests/gold_tests/tls/tls_sni_yaml_reload.test.py +++ b/tests/gold_tests/tls/tls_sni_yaml_reload.test.py @@ -33,7 +33,7 @@ 'proxy.config.ssl.server.cert.path': ts.Variables.SSLDir, 'proxy.config.ssl.server.private_key.path': ts.Variables.SSLDir, 'proxy.config.ssl.CA.cert.filename': f'{ts.Variables.SSLDir}/signer.pem', - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl|http', 'proxy.config.diags.output.debug': 'L', }) diff --git a/tests/gold_tests/tls/tls_tunnel.test.py b/tests/gold_tests/tls/tls_tunnel.test.py index e2de6524af6..a1b3b1a24d6 100644 --- a/tests/gold_tests/tls/tls_tunnel.test.py +++ b/tests/gold_tests/tls/tls_tunnel.test.py @@ -88,7 +88,7 @@ 'proxy.config.ssl.client.CA.cert.filename': 'signer.pem', 'proxy.config.exec_thread.autoconfig.scale': 1.0, 'proxy.config.url_remap.pristine_host_hdr': 1, - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|ssl|proxyprotocol', 'proxy.config.dns.nameservers': f'127.0.0.1:{dns.Variables.Port}', 'proxy.config.dns.resolv_conf': 'NULL' diff --git a/tests/gold_tests/tls/tls_verify4.test.py b/tests/gold_tests/tls/tls_verify4.test.py index bab09093229..aa3d74eb5c8 100644 --- a/tests/gold_tests/tls/tls_verify4.test.py +++ b/tests/gold_tests/tls/tls_verify4.test.py @@ -82,7 +82,7 @@ 'proxy.config.ssl.client.CA.cert.filename': 'signer.pem', 'proxy.config.exec_thread.autoconfig.scale': 1.0, 'proxy.config.url_remap.pristine_host_hdr': 1, - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'ssl' }) @@ -118,7 +118,7 @@ 'proxy.config.ssl.client.CA.cert.filename': 'signer.pem', 'proxy.config.exec_thread.autoconfig.scale': 1.0, 'proxy.config.url_remap.pristine_host_hdr': 1, - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'ssl' }) tr2.StillRunningAfter = ts @@ -162,7 +162,7 @@ 'proxy.config.ssl.client.CA.cert.filename': 'signer.pem', 'proxy.config.exec_thread.autoconfig.scale': 1.0, 'proxy.config.url_remap.pristine_host_hdr': 1, - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'ssl' }) tr2.StillRunningAfter = ts diff --git a/tests/gold_tests/tls/tls_verify_override.test.py b/tests/gold_tests/tls/tls_verify_override.test.py index 747a4d804cd..6d509c469a8 100644 --- a/tests/gold_tests/tls/tls_verify_override.test.py +++ b/tests/gold_tests/tls/tls_verify_override.test.py @@ -107,7 +107,7 @@ # override for foo.com policy=enforced properties=all ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls/tls_verify_override_base.test.py b/tests/gold_tests/tls/tls_verify_override_base.test.py index be8179ddacf..0c1b640b1ae 100644 --- a/tests/gold_tests/tls/tls_verify_override_base.test.py +++ b/tests/gold_tests/tls/tls_verify_override_base.test.py @@ -106,7 +106,7 @@ # override for foo.com policy=enforced properties=all ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls/tls_verify_override_sni.test.py b/tests/gold_tests/tls/tls_verify_override_sni.test.py index 97391eb876d..c454b2057c1 100644 --- a/tests/gold_tests/tls/tls_verify_override_sni.test.py +++ b/tests/gold_tests/tls/tls_verify_override_sni.test.py @@ -88,7 +88,7 @@ # global config policy=permissive properties=all ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'ssl', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls_hooks/tls_hooks.test.py b/tests/gold_tests/tls_hooks/tls_hooks.test.py index ffb20503269..cdf6b05aee4 100644 --- a/tests/gold_tests/tls_hooks/tls_hooks.test.py +++ b/tests/gold_tests/tls_hooks/tls_hooks.test.py @@ -35,7 +35,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'ssl_hook_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls_hooks/tls_hooks10.test.py b/tests/gold_tests/tls_hooks/tls_hooks10.test.py index fb52206ed28..d18fe5dd5dc 100644 --- a/tests/gold_tests/tls_hooks/tls_hooks10.test.py +++ b/tests/gold_tests/tls_hooks/tls_hooks10.test.py @@ -34,7 +34,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'ssl_hook_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls_hooks/tls_hooks11.test.py b/tests/gold_tests/tls_hooks/tls_hooks11.test.py index f92b7dc5931..702ac1de517 100644 --- a/tests/gold_tests/tls_hooks/tls_hooks11.test.py +++ b/tests/gold_tests/tls_hooks/tls_hooks11.test.py @@ -35,7 +35,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'ssl_hook_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls_hooks/tls_hooks12.test.py b/tests/gold_tests/tls_hooks/tls_hooks12.test.py index 78f369691f7..8361f80affb 100644 --- a/tests/gold_tests/tls_hooks/tls_hooks12.test.py +++ b/tests/gold_tests/tls_hooks/tls_hooks12.test.py @@ -34,7 +34,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'ssl_hook_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls_hooks/tls_hooks13.test.py b/tests/gold_tests/tls_hooks/tls_hooks13.test.py index d9820afe05d..288692ff9bb 100644 --- a/tests/gold_tests/tls_hooks/tls_hooks13.test.py +++ b/tests/gold_tests/tls_hooks/tls_hooks13.test.py @@ -34,7 +34,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'ssl_hook_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls_hooks/tls_hooks14.test.py b/tests/gold_tests/tls_hooks/tls_hooks14.test.py index 8364fac306b..d9ab4e75672 100644 --- a/tests/gold_tests/tls_hooks/tls_hooks14.test.py +++ b/tests/gold_tests/tls_hooks/tls_hooks14.test.py @@ -34,7 +34,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'ssl_hook_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls_hooks/tls_hooks15.test.py b/tests/gold_tests/tls_hooks/tls_hooks15.test.py index fd2aa270b5c..1c2a1420dc6 100644 --- a/tests/gold_tests/tls_hooks/tls_hooks15.test.py +++ b/tests/gold_tests/tls_hooks/tls_hooks15.test.py @@ -34,7 +34,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'ssl_hook_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls_hooks/tls_hooks16.test.py b/tests/gold_tests/tls_hooks/tls_hooks16.test.py index 78042926341..f8413157ca7 100644 --- a/tests/gold_tests/tls_hooks/tls_hooks16.test.py +++ b/tests/gold_tests/tls_hooks/tls_hooks16.test.py @@ -37,7 +37,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'ssl_hook_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls_hooks/tls_hooks17.test.py b/tests/gold_tests/tls_hooks/tls_hooks17.test.py index 34a48e98d96..dd8c012f996 100644 --- a/tests/gold_tests/tls_hooks/tls_hooks17.test.py +++ b/tests/gold_tests/tls_hooks/tls_hooks17.test.py @@ -37,7 +37,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'ssl_hook_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls_hooks/tls_hooks18.test.py b/tests/gold_tests/tls_hooks/tls_hooks18.test.py index 64e7b3b089a..0d3e6cd748f 100644 --- a/tests/gold_tests/tls_hooks/tls_hooks18.test.py +++ b/tests/gold_tests/tls_hooks/tls_hooks18.test.py @@ -37,7 +37,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'ssl_hook_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls_hooks/tls_hooks2.test.py b/tests/gold_tests/tls_hooks/tls_hooks2.test.py index 66afffac595..f3c60b8dd7f 100644 --- a/tests/gold_tests/tls_hooks/tls_hooks2.test.py +++ b/tests/gold_tests/tls_hooks/tls_hooks2.test.py @@ -35,7 +35,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'ssl_hook_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls_hooks/tls_hooks3.test.py b/tests/gold_tests/tls_hooks/tls_hooks3.test.py index 006eecb479f..71222ab34f5 100644 --- a/tests/gold_tests/tls_hooks/tls_hooks3.test.py +++ b/tests/gold_tests/tls_hooks/tls_hooks3.test.py @@ -35,7 +35,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'ssl_hook_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls_hooks/tls_hooks4.test.py b/tests/gold_tests/tls_hooks/tls_hooks4.test.py index f7e0742baaf..83ec858f15a 100644 --- a/tests/gold_tests/tls_hooks/tls_hooks4.test.py +++ b/tests/gold_tests/tls_hooks/tls_hooks4.test.py @@ -35,7 +35,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'ssl_hook_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls_hooks/tls_hooks6.test.py b/tests/gold_tests/tls_hooks/tls_hooks6.test.py index 8e943fd3a99..dd14e307c06 100644 --- a/tests/gold_tests/tls_hooks/tls_hooks6.test.py +++ b/tests/gold_tests/tls_hooks/tls_hooks6.test.py @@ -35,7 +35,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'ssl_hook_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls_hooks/tls_hooks7.test.py b/tests/gold_tests/tls_hooks/tls_hooks7.test.py index 29a4490e281..fe25e699eb5 100644 --- a/tests/gold_tests/tls_hooks/tls_hooks7.test.py +++ b/tests/gold_tests/tls_hooks/tls_hooks7.test.py @@ -35,7 +35,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'ssl_hook_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls_hooks/tls_hooks8.test.py b/tests/gold_tests/tls_hooks/tls_hooks8.test.py index 721ce3630b4..3df3744c7a7 100644 --- a/tests/gold_tests/tls_hooks/tls_hooks8.test.py +++ b/tests/gold_tests/tls_hooks/tls_hooks8.test.py @@ -35,7 +35,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'ssl_hook_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tls_hooks/tls_hooks9.test.py b/tests/gold_tests/tls_hooks/tls_hooks9.test.py index cf77135203d..afdb995fca0 100644 --- a/tests/gold_tests/tls_hooks/tls_hooks9.test.py +++ b/tests/gold_tests/tls_hooks/tls_hooks9.test.py @@ -35,7 +35,7 @@ ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.show_location': 0, 'proxy.config.diags.debug.tags': 'ssl_hook_test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/traffic_ctl/gold/diff.gold b/tests/gold_tests/traffic_ctl/gold/diff.gold index ab50c4c93dc..a1864ea564c 100644 --- a/tests/gold_tests/traffic_ctl/gold/diff.gold +++ b/tests/gold_tests/traffic_ctl/gold/diff.gold @@ -1,4 +1,4 @@ -proxy.config.diags.debug.enabled has changed +proxy.config.diags.debug.mode has changed ``Current Value: 1 ``Default Value: 0 proxy.config.diags.debug.tags has changed diff --git a/tests/gold_tests/traffic_ctl/remap_inc/remap_inc.test.py b/tests/gold_tests/traffic_ctl/remap_inc/remap_inc.test.py index 52984a8ad6b..63ad0b2f127 100644 --- a/tests/gold_tests/traffic_ctl/remap_inc/remap_inc.test.py +++ b/tests/gold_tests/traffic_ctl/remap_inc/remap_inc.test.py @@ -39,7 +39,7 @@ # minimal configuration ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'regex_remap|url_rewrite|plugin_factory', 'proxy.config.dns.nameservers': f"127.0.0.1:{nameserver.Variables.Port}", }) diff --git a/tests/gold_tests/traffic_ctl/traffic_ctl_config_output.test.py b/tests/gold_tests/traffic_ctl/traffic_ctl_config_output.test.py index ecf30a924e6..c569f600681 100644 --- a/tests/gold_tests/traffic_ctl/traffic_ctl_config_output.test.py +++ b/tests/gold_tests/traffic_ctl/traffic_ctl_config_output.test.py @@ -45,7 +45,7 @@ # YAML output traffic_ctl.config().get("proxy.config.diags.debug.tags").as_records().validate_with_goldfile("t1_yaml.gold") # Default output -traffic_ctl.config().get("proxy.config.diags.debug.enabled").validate_with_text("proxy.config.diags.debug.enabled: 1") +traffic_ctl.config().get("proxy.config.diags.debug.mode").validate_with_text("proxy.config.diags.debug.mode: 1") # Default output with default. traffic_ctl.config().get("proxy.config.diags.debug.tags").with_default() \ .validate_with_text("proxy.config.diags.debug.tags: rpc # default http|dns") @@ -54,7 +54,7 @@ # when using --records. traffic_ctl.config().get("proxy.config.diags.debug.tags").as_records().with_default().validate_with_goldfile("t2_yaml.gold") traffic_ctl.config().get( - "proxy.config.diags.debug.tags proxy.config.diags.debug.enabled proxy.config.diags.debug.throttling_interval_msec").as_records( + "proxy.config.diags.debug.tags proxy.config.diags.debug.mode proxy.config.diags.debug.throttling_interval_msec").as_records( ).with_default().validate_with_goldfile("t3_yaml.gold") ##### CONFIG MATCH diff --git a/tests/gold_tests/traffic_ctl/traffic_ctl_test_utils.py b/tests/gold_tests/traffic_ctl/traffic_ctl_test_utils.py index a51bb665cca..81ef4dc16bf 100644 --- a/tests/gold_tests/traffic_ctl/traffic_ctl_test_utils.py +++ b/tests/gold_tests/traffic_ctl/traffic_ctl_test_utils.py @@ -219,7 +219,7 @@ def validate_result_with_text(self, text: str): traffic_ctl = Make_traffic_ctl(Test, records_yaml) ## if the output is simple, then you can just -traffic_ctl.config().get("proxy.config.diags.debug.enabled").validate_with_text("proxy.config.diags.debug.enabled: 1") +traffic_ctl.config().get("proxy.config.diags.debug.mode").validate_with_text("proxy.config.diags.debug.mode: 1") # if the poutput is a bit complex, then you can just set your own gold file. traffic_ctl.config().get("proxy.config.diags.debug.tags").as_records().validate_with_goldfile("your_gold_file.gold") diff --git a/tests/gold_tests/tunnel/tunnel_transform.test.py b/tests/gold_tests/tunnel/tunnel_transform.test.py index dabb0692b44..d759e5ca989 100644 --- a/tests/gold_tests/tunnel/tunnel_transform.test.py +++ b/tests/gold_tests/tunnel/tunnel_transform.test.py @@ -50,7 +50,7 @@ server.addResponse("sessionfile.log", request_tunnel_header, response_tunnel_header) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'http|test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/tunnel/txn_type.test.py b/tests/gold_tests/tunnel/txn_type.test.py index 8c79e0a6798..9f2af9381d3 100644 --- a/tests/gold_tests/tunnel/txn_type.test.py +++ b/tests/gold_tests/tunnel/txn_type.test.py @@ -55,7 +55,7 @@ server.addResponse("sessionfile.log", request_tunnel_header, response_tunnel_header) ts.Disk.records_config.update( { - 'proxy.config.diags.debug.enabled': 0, + 'proxy.config.diags.debug.mode': 0, 'proxy.config.diags.debug.tags': 'http|test', 'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir), 'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir), diff --git a/tests/gold_tests/url/uri.test.py b/tests/gold_tests/url/uri.test.py index 822ad19a563..81780adde8e 100644 --- a/tests/gold_tests/url/uri.test.py +++ b/tests/gold_tests/url/uri.test.py @@ -25,7 +25,7 @@ replay_file = "uri.replay.yaml" server = Test.MakeVerifierServerProcess("server", replay_file) ts.Disk.records_config.update({ - 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.mode': 1, 'proxy.config.diags.debug.tags': 'http|cache|url', }) ts.Disk.remap_config.AddLine('map / http://127.0.0.1:{0}'.format(server.Variables.http_port))