Commit 4bcc9c7b authored by David Lawrence's avatar David Lawrence
Browse files

When loading a configuration file, set log defaults if and only if no

"category default" clause was found in a logging statement.
parent 5542df09
......@@ -962,14 +962,14 @@ load_configuration(const char *filename, ns_server_t *server,
CHECKM(isc_logconfig_create(ns_g_lctx, &logc),
"creating new logging configuration");
CHECKM(ns_log_setdefaults(logc),
"setting up default logging defaults");
(void) dns_c_ctx_getlogging(configctx, &clog);
if (clog != NULL) {
if (clog != NULL)
CHECKM(ns_log_configure(logc, clog),
"configuring logging");
}
else
CHECKM(ns_log_setdefaults(logc),
"setting up default logging defaults");
result = isc_logconfig_use(ns_g_lctx, logc);
if (result != ISC_R_SUCCESS) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment