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 2e1dd0fb8f records. Fix regex to make sure default values are properly
loaded. (#11654)
2e1dd0fb8f is described below
commit 2e1dd0fb8fc649db94df4bf3e08fdf7af15ef95f
Author: Damian Meden <[email protected]>
AuthorDate: Wed Aug 14 17:17:31 2024 +0200
records. Fix regex to make sure default values are properly loaded. (#11654)
Some default values weren't passing the validity check of the configured
regex. This changes the regex to make sure the validity check don't
fail.
---
src/records/RecordsConfig.cc | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/records/RecordsConfig.cc b/src/records/RecordsConfig.cc
index 47879359b4..9c6e02d3d3 100644
--- a/src/records/RecordsConfig.cc
+++ b/src/records/RecordsConfig.cc
@@ -88,9 +88,9 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, "proxy.config.output.logfile.rolling_interval_sec", RECD_INT,
"3600", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.output.logfile.rolling_size_mb", RECD_INT,
"100", RECU_DYNAMIC, RR_NULL, RECC_STR, "^0*[1-9][0-9]*$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.output.logfile.rolling_size_mb", RECD_INT,
"100", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.output.logfile.rolling_min_count", RECD_INT,
"0", RECU_DYNAMIC, RR_NULL, RECC_STR, "^0*[1-9][0-9]*$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.output.logfile.rolling_min_count", RECD_INT,
"0", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
//# 0 = disable
{RECT_CONFIG, "proxy.config.res_track_memory", RECD_INT, "0",
RECU_RESTART_TS, RR_REQUIRED, RECC_INT, "[0-2]", RECA_NULL}
@@ -233,9 +233,9 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, "proxy.config.diags.logfile.rolling_interval_sec", RECD_INT,
"3600", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.diags.logfile.rolling_size_mb", RECD_INT, "10",
RECU_DYNAMIC, RR_NULL, RECC_STR, "^0*[1-9][0-9]*$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.diags.logfile.rolling_size_mb", RECD_INT, "10",
RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.diags.logfile.rolling_min_count", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_STR, "^0*[1-9][0-9]*$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.diags.logfile.rolling_min_count", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.error.logfile.filename", RECD_STRING,
"error.log", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[^[:space:]]+$", RECA_NULL}
,
@@ -1023,9 +1023,9 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, "proxy.config.log.rolling_offset_hr", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.log.rolling_size_mb", RECD_INT, "10",
RECU_DYNAMIC, RR_NULL, RECC_STR, "^0*[1-9][0-9]*$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.log.rolling_size_mb", RECD_INT, "10",
RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.log.rolling_min_count", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_STR, "^0*[1-9][0-9]*$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.log.rolling_min_count", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.log.rolling_max_count", RECD_INT, "0",
RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
,
@@ -1080,13 +1080,13 @@ static const RecordElement RecordsConfig[] =
,
{RECT_CONFIG, "proxy.config.ssl.server.session_ticket.number", RECD_INT,
"2", RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL},
- {RECT_CONFIG, "proxy.config.ssl.client.version.min", RECD_INT, "-1",
RECU_RESTART_TS, RR_NULL, RECC_INT, "^-?[0-9]+$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.ssl.client.version.min", RECD_INT, "-1",
RECU_RESTART_TS, RR_NULL, RECC_STR, "^-?[0-9]+$", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.ssl.client.version.max", RECD_INT, "-1",
RECU_RESTART_TS, RR_NULL, RECC_INT, "^-?[0-9]+$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.ssl.client.version.max", RECD_INT, "-1",
RECU_RESTART_TS, RR_NULL, RECC_STR, "^-?[0-9]+$", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.ssl.server.version.min", RECD_INT, "-1",
RECU_RESTART_TS, RR_NULL, RECC_INT, "^-?[0-9]+$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.ssl.server.version.min", RECD_INT, "-1",
RECU_RESTART_TS, RR_NULL, RECC_STR, "^-?[0-9]+$", RECA_NULL}
,
- {RECT_CONFIG, "proxy.config.ssl.server.version.max", RECD_INT, "-1",
RECU_RESTART_TS, RR_NULL, RECC_INT, "^-?[0-9]+$", RECA_NULL}
+ {RECT_CONFIG, "proxy.config.ssl.server.version.max", RECD_INT, "-1",
RECU_RESTART_TS, RR_NULL, RECC_STR, "^-?[0-9]+$", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.ssl.TLSv1", RECD_INT, "0", RECU_RESTART_TS,
RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
,
