Skip to content

Respecting default rolling_enabled value in plugins. #7275

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

Merged
bneradt merged 1 commit into from
Oct 13, 2020
Merged

Respecting default rolling_enabled value in plugins. #7275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion plugins/regex_revalidate/regex_revalidate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,6 @@ TSPluginInit(int argc, const char *argv[])
break;
case 'l':
if (TS_SUCCESS == TSTextLogObjectCreate(optarg, TS_LOG_MODE_ADD_TIMESTAMP, &pstate->log)) {
TSTextLogObjectRollingEnabledSet(pstate->log, 1);
TSTextLogObjectRollingIntervalSecSet(pstate->log, LOG_ROLL_INTERVAL);
TSTextLogObjectRollingOffsetHrSet(pstate->log, LOG_ROLL_OFFSET);
}
Expand Down
23 changes: 15 additions & 8 deletions plugins/tcpinfo/tcpinfo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ TSPluginInit(int argc, const char *argv[])
const char *filename = "tcpinfo";
TSCont cont;
unsigned int hooks = 0;
unsigned int rolling_enabled = 1;
int rolling_enabled = -1;
unsigned int rolling_interval_sec = 86400;
unsigned int rolling_offset_hr = 0;
unsigned int rolling_size = 1024;
Expand Down Expand Up @@ -379,7 +379,8 @@ TSPluginInit(int argc, const char *argv[])
case 'e':
i = strtoul(optarg, &endptr, 10);
if (*endptr != '\0' || i > 3) {
TSError("[tcpinfo] invalid rolling-enabled argument, '%s', using default of %d", optarg, rolling_enabled);
TSError("[tcpinfo] invalid rolling-enabled argument, '%s', using the system's proxy.config.log.rolling_enabled value",
optarg);
} else {
rolling_enabled = i;
}
Expand Down Expand Up @@ -424,20 +425,26 @@ TSPluginInit(int argc, const char *argv[])
TSDebug("tcpinfo", "sample: %d", config->sample);
TSDebug("tcpinfo", "log filename: %s", filename);
TSDebug("tcpinfo", "log_level: %u", config->log_level);
TSDebug("tcpinfo", "rolling_enabled: %d", rolling_enabled);
TSDebug("tcpinfo", "hook mask: 0x%x", hooks);

if (TSTextLogObjectCreate(filename, TS_LOG_MODE_ADD_TIMESTAMP, &config->log) != TS_SUCCESS) {
TSError("[tcpinfo] failed to create log file '%s'", filename);
return;
}
if (TSTextLogObjectRollingEnabledSet(config->log, rolling_enabled) != TS_SUCCESS) {
TSError("[tcpinfo] failed to enable log file rolling to: '%d'", rolling_enabled);
return;
if (rolling_enabled == -1) {
// The user either did not provide a value or the value they provided was
// invalid.
TSDebug("tcpinfo", "Using system default value of proxy.config.log.rolling_enabled ");
} else {
TSTextLogObjectRollingIntervalSecSet(config->log, rolling_interval_sec);
TSTextLogObjectRollingOffsetHrSet(config->log, rolling_offset_hr);
TSTextLogObjectRollingSizeMbSet(config->log, rolling_size);
if (TSTextLogObjectRollingEnabledSet(config->log, rolling_enabled) != TS_SUCCESS) {
TSError("[tcpinfo] failed to enable log file rolling to: '%d'", rolling_enabled);
return;
}
}
TSTextLogObjectRollingIntervalSecSet(config->log, rolling_interval_sec);
TSTextLogObjectRollingOffsetHrSet(config->log, rolling_offset_hr);
TSTextLogObjectRollingSizeMbSet(config->log, rolling_size);

TSTextLogObjectHeaderSet(config->log, tcpi_headers[config->log_level - 1]);

Expand Down