Skip to content

origin_server_auth: Improve log messages #13553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maskit wants to merge 3 commits into
base: master
Choose a base branch
from
+10 −4
Open

origin_server_auth: Improve log messages #13553

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01a6069
origin_server_auth: Improve an error message
maskit Aug 14, 2026
0bfd8aa
Add the getter
maskit Aug 14, 2026
a872963
Update more messages
maskit Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions plugins/origin_server_auth/origin_server_auth.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,12 @@ class S3Config
return _conf_reload_count++;
}

int
get_conf_reload_count()
{
return _conf_reload_count;
}

int
incr_invalid_file_count()
{
Expand Down Expand Up @@ -715,7 +721,7 @@ ConfigCache::get(const char *fname)
unsigned update_status = it->second.update_status;
if (tv.tv_sec > (it->second.load_time + _ttl)) {
if (!(update_status & 1) && it->second.update_status.compare_exchange_strong(update_status, update_status + 1)) {
Dbg(dbg_ctl, "Configuration from %s is stale, reloading", config_fname.c_str());
Dbg(dbg_ctl, "Cached configuration from %s is stale, reloading", config_fname.c_str());
s3 = new S3Config(false); // false == this config does not get the continuation

if (s3->parse_config(config_fname)) {
Expand Down Expand Up @@ -744,7 +750,7 @@ ConfigCache::get(const char *fname)
s3 = it->second.config;
}
} else {
Dbg(dbg_ctl, "Configuration from %s is fresh, reusing", config_fname.c_str());
Dbg(dbg_ctl, "Cached configuration from %s is fresh, reusing", config_fname.c_str());
s3 = it->second.config;
}
} else {
Expand Down Expand Up @@ -1179,8 +1185,8 @@ config_reloader(TSCont cont, TSEvent /* event ATS_UNUSED */, void *edata)
Dbg(dbg_ctl, "config expiration time for version: %s %s is in the past, re-checking in 1 minute", s3->versionString(),
config_fname.c_str());
if (s3->incr_conf_reload_count() % 10 == 0) {
TSError("[%s] tried to reload config automatically but failed, please try manual reloading the config file: %s",
PLUGIN_NAME, config_fname.c_str());
TSError("[%s] Reloading an expired config file has been failing (%d attempts): %s", PLUGIN_NAME,
s3->get_conf_reload_count(), config_fname.c_str());
}
Comment thread
maskit marked this conversation as resolved.
s3->schedule_conf_reload(60);
}
Expand Down