This is an automated email from the ASF dual-hosted git repository.
maskit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 4f82363403 Add log messages about QUIC cert loading for consistency
(#12429)
4f82363403 is described below
commit 4f82363403927c199488b9000153a8148c0bd9db
Author: Masakazu Kitajo <[email protected]>
AuthorDate: Mon Aug 11 17:14:40 2025 -0600
Add log messages about QUIC cert loading for consistency (#12429)
There are "loading" message with quic/ssl label, but there's only
"finished" message for ssl.
---
src/iocore/net/QUICMultiCertConfigLoader.cc | 26 ++++++++++++++++++++++++--
src/iocore/net/SSLConfig.cc | 4 ++--
2 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/iocore/net/QUICMultiCertConfigLoader.cc
b/src/iocore/net/QUICMultiCertConfigLoader.cc
index b1dc57c8ec..314285d40a 100644
--- a/src/iocore/net/QUICMultiCertConfigLoader.cc
+++ b/src/iocore/net/QUICMultiCertConfigLoader.cc
@@ -40,13 +40,35 @@ QUICCertConfig::startup()
void
QUICCertConfig::reconfigure()
{
+ bool retStatus = true;
SSLConfig::scoped_config params;
SSLCertLookup *lookup = new SSLCertLookup();
QUICMultiCertConfigLoader loader(params);
- loader.load(lookup);
+ auto errata = loader.load(lookup);
+ if (!lookup->is_valid || (errata.has_severity() && errata.severity() >=
ERRATA_ERROR)) {
+ retStatus = false;
+ }
- _config_id = configProcessor.set(_config_id, lookup);
+ if (retStatus || _config_id == 0) {
+ _config_id = configProcessor.set(_config_id, lookup);
+ } else {
+ delete lookup;
+ }
+
+ if (!errata.empty()) {
+ errata.assign_annotation_glue_text("\n ");
+ errata.assign_severity_glue_text(" -> \n ");
+ bwprint(ts::bw_dbg, "\n{}", errata);
+ } else {
+ ts::bw_dbg = "";
+ }
+
+ if (retStatus) {
+ Note("(quic) %s finished loading%s", params->configFilePath,
ts::bw_dbg.c_str());
+ } else {
+ Error("(quic) %s failed to load%s", params->configFilePath,
ts::bw_dbg.c_str());
+ }
}
SSLCertLookup *
diff --git a/src/iocore/net/SSLConfig.cc b/src/iocore/net/SSLConfig.cc
index 78938c2728..a4b1e391b8 100644
--- a/src/iocore/net/SSLConfig.cc
+++ b/src/iocore/net/SSLConfig.cc
@@ -800,9 +800,9 @@ SSLCertificateConfig::reconfigure()
}
if (retStatus) {
- Note("%s finished loading%s", params->configFilePath, ts::bw_dbg.c_str());
+ Note("(ssl) %s finished loading%s", params->configFilePath,
ts::bw_dbg.c_str());
} else {
- Error("%s failed to load%s", params->configFilePath, ts::bw_dbg.c_str());
+ Error("(ssl) %s failed to load%s", params->configFilePath,
ts::bw_dbg.c_str());
}
return retStatus;