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
@@ -624,7 +624,7 @@ JNI_METHOD(CharonVpnService, initializeCharon, jboolean,
return FALSE;
}
charon->load_loggers(charon, NULL, FALSE);
charon->load_loggers(charon);
charonservice_init(env, this, builder, byod);
+3 -6
View File
@@ -41,11 +41,6 @@ void dispatcher_cleanup()
DESTROY_IF(dispatcher);
}
/**
* Loglevel configuration
*/
static level_t levels[DBG_MAX];
/**
* hook in library for debugging messages
*/
@@ -154,6 +149,7 @@ int main(int argc, char *argv[])
{
struct sigaction action;
struct utsname utsname;
level_t levels[DBG_MAX];
int group;
dbg = dbg_stderr;
@@ -178,7 +174,8 @@ int main(int argc, char *argv[])
{
levels[group] = LEVEL_CTRL;
}
charon->load_loggers(charon, levels, TRUE);
charon->set_default_loggers(charon, levels, TRUE);
charon->load_loggers(charon);
lib->settings->set_default_str(lib->settings, "charon-xpc.port", "0");
lib->settings->set_default_str(lib->settings, "charon-xpc.port_nat_t", "0");