diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2017-01-25 14:58:24 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2017-01-25 15:03:01 +0100 |
| commit | 68d97ac541409a11bcf323795e4c2890674e5fb1 (patch) | |
| tree | d6a8ba872b9f8ee9c390804dd758ac10851a4d42 /src/charon-cmd/charon-cmd.c | |
| parent | 4e382f5ffcb8590b30f8953640eb1e111bf1ced9 (diff) | |
| parent | 83bf6db3038bdf0005e73989e18f315f758b1970 (diff) | |
| download | strongswan-68d97ac541409a11bcf323795e4c2890674e5fb1.tar.bz2 strongswan-68d97ac541409a11bcf323795e4c2890674e5fb1.tar.xz | |
Merge branch 'charon-systemd-reload-loggers'
Allows reloading strongswan.conf, the loggers, and the plugins in
charon-systemd by sending a SIGHUP (as already supported by charon).
Loggers are now also reloaded by VICI's `reload-settings` command (works
with both daemons).
Fixes #2222.
Diffstat (limited to 'src/charon-cmd/charon-cmd.c')
| -rw-r--r-- | src/charon-cmd/charon-cmd.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/charon-cmd/charon-cmd.c b/src/charon-cmd/charon-cmd.c index f350198c6..793496451 100644 --- a/src/charon-cmd/charon-cmd.c +++ b/src/charon-cmd/charon-cmd.c @@ -40,11 +40,6 @@ static level_t default_loglevel = LEVEL_CTRL; /** - * Loglevel configuration - */ -static level_t levels[DBG_MAX]; - -/** * Connection to initiate */ static cmd_connection_t *conn; @@ -129,7 +124,7 @@ static int run() "configuration"); if (lib->settings->load_files(lib->settings, lib->conf, FALSE)) { - charon->load_loggers(charon, levels, TRUE); + charon->load_loggers(charon); lib->plugins->reload(lib->plugins, NULL); } else @@ -311,6 +306,7 @@ int main(int argc, char *argv[]) { struct sigaction action; struct utsname utsname; + level_t levels[DBG_MAX]; int group; /* handle simple arguments */ @@ -338,7 +334,8 @@ int main(int argc, char *argv[]) { levels[group] = default_loglevel; } - charon->load_loggers(charon, levels, TRUE); + charon->set_default_loggers(charon, levels, TRUE); + charon->load_loggers(charon); if (!lookup_uid_gid()) { |