daemon: Use separate method to set default loggers

This way it is not necessary to pass the same values to reload the
loggers.
This commit is contained in:
Tobias Brunner
2017-01-25 14:58:09 +01:00
parent ff22d53ba9
commit 9665686bd8
13 changed files with 86 additions and 50 deletions
+4 -7
View File
@@ -39,11 +39,6 @@
*/
static level_t default_loglevel = LEVEL_CTRL;
/**
* Loglevel configuration
*/
static level_t levels[DBG_MAX];
/**
* Connection to initiate
*/
@@ -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())
{