diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2017-01-23 17:14:01 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2017-01-25 14:58:09 +0100 |
| commit | 9665686bd807d70041b22312936034bf256d2b8c (patch) | |
| tree | 3f16de89f0f6dcef78331cfe40acc12547ba0bb6 /src/charon | |
| parent | ff22d53ba9949d20d00e4d2137fcdb354627565e (diff) | |
| download | strongswan-9665686bd807d70041b22312936034bf256d2b8c.tar.bz2 strongswan-9665686bd807d70041b22312936034bf256d2b8c.tar.xz | |
daemon: Use separate method to set default loggers
This way it is not necessary to pass the same values to reload the
loggers.
Diffstat (limited to 'src/charon')
| -rw-r--r-- | src/charon/charon.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/charon/charon.c b/src/charon/charon.c index 116ce7e93..520cb3c74 100644 --- a/src/charon/charon.c +++ b/src/charon/charon.c @@ -59,16 +59,6 @@ static FILE *pidfile = NULL; /** - * Log levels as defined via command line arguments - */ -static level_t levels[DBG_MAX]; - -/** - * Whether to only use syslog when logging - */ -static bool use_syslog = FALSE; - -/** * hook in library for debugging messages */ extern void (*dbg) (debug_t group, level_t level, char *fmt, ...); @@ -126,7 +116,7 @@ static void run() "configuration"); if (lib->settings->load_files(lib->settings, lib->conf, FALSE)) { - charon->load_loggers(charon, levels, !use_syslog); + charon->load_loggers(charon); lib->plugins->reload(lib->plugins, NULL); } else @@ -289,6 +279,8 @@ int main(int argc, char *argv[]) struct sigaction action; int group, status = SS_RC_INITIALIZATION_FAILED; struct utsname utsname; + level_t levels[DBG_MAX]; + bool use_syslog = FALSE; /* logging for library during initialization, as we have no bus yet */ dbg = dbg_stderr; @@ -382,7 +374,8 @@ int main(int argc, char *argv[]) goto deinit; } - charon->load_loggers(charon, levels, !use_syslog); + charon->set_default_loggers(charon, levels, !use_syslog); + charon->load_loggers(charon); if (uname(&utsname) != 0) { |