This is an automated email from the ASF dual-hosted git repository.
masaori 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 baeaf9a07f s3_auth: Clear handling TSAction in the config_reloader
(#10556)
baeaf9a07f is described below
commit baeaf9a07f627a463f6fcfc0df6e0ae19e31fd0e
Author: Masaori Koshiba <[email protected]>
AuthorDate: Mon Oct 16 08:03:54 2023 +0900
s3_auth: Clear handling TSAction in the config_reloader (#10556)
---
plugins/s3_auth/s3_auth.cc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/plugins/s3_auth/s3_auth.cc b/plugins/s3_auth/s3_auth.cc
index f43ce16006..a849cabf94 100644
--- a/plugins/s3_auth/s3_auth.cc
+++ b/plugins/s3_auth/s3_auth.cc
@@ -1053,7 +1053,9 @@ int
config_reloader(TSCont cont, TSEvent event, void *edata)
{
Dbg(dbg_ctl, "reloading configs");
- S3Config *s3 = static_cast<S3Config *>(TSContDataGet(cont));
+ S3Config *s3 = static_cast<S3Config *>(TSContDataGet(cont));
+ s3->check_current_action(edata);
+
S3Config *file_config = gConfCache.get(s3->conf_fname());
if (!file_config || !file_config->valid()) {
@@ -1064,7 +1066,6 @@ config_reloader(TSCont cont, TSEvent event, void *edata)
{
std::unique_lock lock(s3->reload_mutex);
s3->copy_changes_from(file_config);
- s3->check_current_action(edata);
}
if (s3->expiration() == 0) {