This is an automated email from the ASF dual-hosted git repository. cmcfarlen pushed a commit to branch 10.0.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit ce6b0df1f063f18c85d05e9ee0b6fcf59cd77651 Author: Damian Meden <[email protected]> AuthorDate: Mon Jul 22 17:00:59 2024 +0200 Errata: Make sure the initialization of the errata members are in (#11554) place. Call the Errata settings function just right after TS starts. (cherry picked from commit 5b1e62aba782cd0e235c4672f1f2e8c1c8741b77) --- src/traffic_server/traffic_server.cc | 5 +++++ src/tsutil/ts_diags.cc | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/traffic_server/traffic_server.cc b/src/traffic_server/traffic_server.cc index 573b8a926e..99e4a53746 100644 --- a/src/traffic_server/traffic_server.cc +++ b/src/traffic_server/traffic_server.cc @@ -693,6 +693,8 @@ initialize_process_manager() extern void initializeRegistry(); +extern void Initialize_Errata_Settings(); + static void initialize_file_manager() { @@ -1778,6 +1780,9 @@ main(int /* argc ATS_UNUSED */, const char **argv) mcheck_pedantic(NULL); #endif + // Override default swoc::Errata settings. + Initialize_Errata_Settings(); + pcre_malloc = ats_malloc; pcre_free = ats_free; diff --git a/src/tsutil/ts_diags.cc b/src/tsutil/ts_diags.cc index 7f4eb9d197..3fb9ef84b0 100644 --- a/src/tsutil/ts_diags.cc +++ b/src/tsutil/ts_diags.cc @@ -25,9 +25,10 @@ #include "tsutil/ts_diag_levels.h" #include "tsutil/ts_errata.h" -static const bool INITIALIZED = []() -> bool { +void +Initialize_Errata_Settings() +{ swoc::Errata::DEFAULT_SEVERITY = ERRATA_ERROR; swoc::Errata::FAILURE_SEVERITY = ERRATA_WARN; swoc::Errata::SEVERITY_NAMES = swoc::MemSpan<swoc::TextView const>(Severity_Names.data(), Severity_Names.size()); - return true; -}(); +}
