This is an automated email from the ASF dual-hosted git repository.
dmeden 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 78fb897f1d cleanup: TM removal leftovers. (#10994)
78fb897f1d is described below
commit 78fb897f1d9a166c24ec3ee1d91603f006dee2d0
Author: Damian Meden <[email protected]>
AuthorDate: Fri Jan 19 10:14:56 2024 +0100
cleanup: TM removal leftovers. (#10994)
RECU_RESTART_TM not needed anymore.
---
include/records/RecDefs.h | 7 +++----
src/records/P_RecDefs.h | 6 ------
src/records/RecordsConfig.cc | 12 ++++++------
3 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/include/records/RecDefs.h b/include/records/RecDefs.h
index 1a484349fe..2d147b686f 100644
--- a/include/records/RecDefs.h
+++ b/include/records/RecDefs.h
@@ -99,10 +99,9 @@ namespace detail
#define REC_PERSISTENCE_TYPE(P) rec::detail::is_valid_persistence<P>::value
enum RecUpdateT {
- RECU_NULL, // default: don't know the behavior
- RECU_DYNAMIC, // config can be updated dynamically w/ "traffic_ctl config
reload"
- RECU_RESTART_TS, // config requires TS to be restarted to take effect
- RECU_RESTART_TM, // deprecated
+ RECU_NULL, // default: don't know the behavior
+ RECU_DYNAMIC, // config can be updated dynamically w/ "traffic_ctl config
reload"
+ RECU_RESTART_TS // config requires TS to be restarted to take effect
};
enum RecCheckT {
diff --git a/src/records/P_RecDefs.h b/src/records/P_RecDefs.h
index 1eda45ca00..423aefbf41 100644
--- a/src/records/P_RecDefs.h
+++ b/src/records/P_RecDefs.h
@@ -50,12 +50,6 @@
#define REC_INC_CONFIG_VERSION (REC_PEER_SYNC_REQUIRED << 1)
#define REC_SYNC_REQUIRED (REC_DISK_SYNC_REQUIRED |
REC_PEER_SYNC_REQUIRED)
-enum RecEntryT {
- RECE_NULL,
- RECE_COMMENT,
- RECE_RECORD,
-};
-
struct RecConfigUpdateCbList {
RecConfigUpdateCbList() {}
RecConfigUpdateCbList(RecConfigUpdateCb const &update_cb, void
*update_cookie)
diff --git a/src/records/RecordsConfig.cc b/src/records/RecordsConfig.cc
index 3e69ef6b11..ece1c6656c 100644
--- a/src/records/RecordsConfig.cc
+++ b/src/records/RecordsConfig.cc
@@ -56,7 +56,7 @@ static const RecordElement RecordsConfig[] =
// Jira TS-21
{RECT_CONFIG, "proxy.config.local_state_dir", RECD_STRING,
TS_BUILD_RUNTIMEDIR, RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr,
RECA_READ_ONLY}
,
- {RECT_CONFIG, "proxy.config.syslog_facility", RECD_STRING, "LOG_DAEMON",
RECU_RESTART_TM, RR_NULL, RECC_STR, ".*", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.syslog_facility", RECD_STRING, "LOG_DAEMON",
RECU_RESTART_TS, RR_NULL, RECC_STR, ".*", RECA_NULL}
,
//# Negative core limit means max out limit
{RECT_CONFIG, "proxy.config.core_limit", RECD_INT, "-1", RECU_RESTART_TS,
RR_NULL, RECC_NULL, nullptr, RECA_NULL}
@@ -76,7 +76,7 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, "proxy.config.cache.persist_bad_disks", RECD_INT, "0",
RECU_RESTART_TS, RR_NULL, RECC_NULL, "[01]", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.output.logfile.name", RECD_STRING,
"traffic.out", RECU_RESTART_TM, RR_REQUIRED, RECC_NULL, nullptr,
+ {RECT_CONFIG, "proxy.config.output.logfile.name", RECD_STRING,
"traffic.out", RECU_RESTART_TS, RR_REQUIRED, RECC_NULL, nullptr,
RECA_NULL}
,
{RECT_CONFIG, "proxy.config.output.logfile_perm", RECD_STRING, "rw-r--r--",
RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
@@ -281,11 +281,11 @@ static const RecordElement RecordsConfig[] =
// #
{RECT_CONFIG, "proxy.config.http.allow_half_open", RECD_INT, "1",
RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.http.enabled", RECD_INT, "1", RECU_RESTART_TM,
RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.http.enabled", RECD_INT, "1", RECU_RESTART_TS,
RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.http.server_ports", RECD_STRING, "8080
8080:ipv6", RECU_RESTART_TM, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.http.server_ports", RECD_STRING, "8080
8080:ipv6", RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.http.wait_for_cache", RECD_INT, "0",
RECU_RESTART_TM, RR_NULL, RECC_INT, "[0-3]", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.http.wait_for_cache", RECD_INT, "0",
RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-3]", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.http.insert_request_via_str", RECD_INT, "1",
RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-4]", RECA_NULL}
,
@@ -760,7 +760,7 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, "proxy.config.net.default_inactivity_timeout", RECD_INT,
"86400", RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.net.inactivity_check_frequency", RECD_INT, "1",
RECU_RESTART_TM, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.net.inactivity_check_frequency", RECD_INT, "1",
RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
,
{RECT_CONFIG, "proxy.config.net.event_period", RECD_INT, "10",
RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
,
