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
2024-10-25 14:49:11 +02:00
parent 768fec23bc
commit f09b8203d3
5 changed files with 123 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/daemon.c
+26 -19
View File
@@ -491,29 +491,37 @@ static void load_file_logger(private_daemon_t *this, char *section,
linked_list_t *current_loggers)
{
file_logger_t *file_logger;
file_logger_options_t options;
debug_t group;
level_t def;
bool add_ms, add_us, ike_name, log_level, json, flush_line, append;
char *time_format, *filename;
bool flush_line, append;
char *filename;
options.time_format = lib->settings->get_str(lib->settings,
"%s.filelog.%s.time_format", NULL, lib->ns, section);
options.time_precision = file_logger_time_precision_parse(
lib->settings->get_str(lib->settings,
"%s.filelog.%s.time_precision", NULL, lib->ns, section));
/* handle legacy option */
if (!options.time_precision &&
lib->settings->get_bool(lib->settings,
"%s.filelog.%s.time_add_ms", FALSE, lib->ns, section))
{
options.time_precision = FILE_LOGGER_TIME_PRECISION_MS;
}
options.ike_name = lib->settings->get_bool(lib->settings,
"%s.filelog.%s.ike_name", FALSE, lib->ns, section);
options.log_level = lib->settings->get_bool(lib->settings,
"%s.filelog.%s.log_level", FALSE, lib->ns, section);
options.json = lib->settings->get_bool(lib->settings,
"%s.filelog.%s.json", FALSE, lib->ns, section);
time_format = lib->settings->get_str(lib->settings,
"%s.filelog.%s.time_format", NULL, lib->ns, section);
add_ms = lib->settings->get_bool(lib->settings,
"%s.filelog.%s.time_add_ms", FALSE, lib->ns, section);
add_us = lib->settings->get_bool(lib->settings,
"%s.filelog.%s.time_add_us", FALSE, lib->ns, section);
ike_name = lib->settings->get_bool(lib->settings,
"%s.filelog.%s.ike_name", FALSE, lib->ns, section);
log_level = lib->settings->get_bool(lib->settings,
"%s.filelog.%s.log_level", FALSE, lib->ns, section);
json = lib->settings->get_bool(lib->settings,
"%s.filelog.%s.json", FALSE, lib->ns, section);
flush_line = lib->settings->get_bool(lib->settings,
"%s.filelog.%s.flush_line", FALSE, lib->ns, section);
"%s.filelog.%s.flush_line", FALSE, lib->ns, section);
append = lib->settings->get_bool(lib->settings,
"%s.filelog.%s.append", TRUE, lib->ns, section);
"%s.filelog.%s.append", TRUE, lib->ns, section);
filename = lib->settings->get_str(lib->settings,
"%s.filelog.%s.path", section, lib->ns, section);
"%s.filelog.%s.path", section, lib->ns, section);
file_logger = add_file_logger(this, filename, current_loggers);
if (!file_logger)
@@ -521,8 +529,7 @@ static void load_file_logger(private_daemon_t *this, char *section,
return;
}
file_logger->set_options(file_logger, time_format, add_ms, add_us,
ike_name, log_level, json);
file_logger->set_options(file_logger, &options);
file_logger->open(file_logger, flush_line, append);
def = lib->settings->get_int(lib->settings, "%s.filelog.%s.default", 1,