denozord/strongswan-ext
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

file-logger: Take options as a struct and combine ms/us suffix options

Browse Source 
References strongswan/strongswan#2475
This commit is contained in:
Tobias Brunner committed 2024-10-25 14:49:11 +02:00
1 parent 768fec23bc
commit f09b8203d3
5 files changed
+123 -72
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/conftest/conftest.c
+18 -12
View File
@@ -382,23 +382,28 @@ static void load_log_levels(file_logger_t *logger, char *section)
*/
static void load_logger_options(file_logger_t *logger, char *section)
{
char *time_format;
bool add_ms, add_us, ike_name, log_level, json;
file_logger_options_t options;
time_format = conftest->test->get_str(conftest->test,
options.time_format = conftest->test->get_str(conftest->test,
"log.%s.time_format", NULL, section);
add_ms = conftest->test->get_bool(conftest->test,
"log.%s.time_add_ms", FALSE, section);
add_us = conftest->test->get_bool(conftest->test,
"log.%s.time_add_us", FALSE, section);
ike_name = conftest->test->get_bool(conftest->test,
options.time_precision = file_logger_time_precision_parse(
conftest->test->get_str(conftest->test,
"log.%s.time_precision", NULL, section));
/* handle legacy option */
if (!options.time_precision &&
conftest->test->get_bool(conftest->test,
"log.%s.time_add_ms", FALSE, section))
{
options.time_precision = FILE_LOGGER_TIME_PRECISION_MS;
}
options.ike_name = conftest->test->get_bool(conftest->test,
"log.%s.ike_name", FALSE, section);
log_level = conftest->test->get_bool(conftest->test,
options.log_level = conftest->test->get_bool(conftest->test,
"log.%s.log_level", FALSE, section);
json = conftest->test->get_bool(conftest->test,
options.json = conftest->test->get_bool(conftest->test,
"log.%s.json", FALSE, section);
logger->set_options(logger, time_format, add_ms, add_us, ike_name, log_level, json);
logger->set_options(logger, &options);
}
/**
@@ -442,6 +447,7 @@ int main(int argc, char *argv[])
int sig;
char *suite_file = "suite.conf", *test_file = NULL, *preload, *plugins;
file_logger_t *logger;
file_logger_options_t options = {};
if (!library_init(NULL, "conftest"))
{
@@ -464,7 +470,7 @@ int main(int argc, char *argv[])
lib->credmgr->add_set(lib->credmgr, &conftest->creds->set);
logger = file_logger_create("stdout");
logger->set_options(logger, NULL, FALSE, FALSE, FALSE, FALSE, FALSE);
logger->set_options(logger, &options);
logger->open(logger, FALSE, FALSE);
logger->set_level(logger, DBG_ANY, LEVEL_CTRL);
charon->bus->add_logger(charon->bus, &logger->logger);