diff --git a/import/log4c/log4c/rc.c b/import/log4c/log4c/rc.c index f71186c..cdfeba6 100644 --- a/import/log4c/log4c/rc.c +++ b/import/log4c/log4c/rc.c @@ -121,7 +121,7 @@ static int appender_load(log4c_rc_t* this, sd_domnode_t* anode) if (type) { log4c_appender_set_type(app, log4c_appender_type_get(type->value)); - printf("set to type %s\n", type->value); + // printf("set to type %s\n", type->value); } if (layout) diff --git a/src/apps/manager/manager.c b/src/apps/manager/manager.c index 196b727..2ffb988 100644 --- a/src/apps/manager/manager.c +++ b/src/apps/manager/manager.c @@ -637,6 +637,7 @@ StartSlapd(BOOL killExisting) "-f", XPL_DEFAULT_CONF_DIR "/bongo-slapd.conf", "-h", url, "-n", "bongo-slapd", + "-s", "0", NULL); exit(1); diff --git a/src/libs/logger/Bongo.rules b/src/libs/logger/Bongo.rules index 3091837..44505ca 100644 --- a/src/libs/logger/Bongo.rules +++ b/src/libs/logger/Bongo.rules @@ -1,6 +1,11 @@ # -*- Makefile -*- lib_LTLIBRARIES += libbongologger.la +logconfdir := $(XPL_DEFAULT_CONF_DIR) + +dist_logconf_DATA := \ + src/libs/logger/logs.conf + libbongologger_la_SOURCES := \ src/libs/logger/bongo.lsc \ src/libs/logger/logger-format.pl \ diff --git a/src/libs/logger/logger.c b/src/libs/logger/logger.c index 165144c..5e9bd40 100644 --- a/src/libs/logger/logger.c +++ b/src/libs/logger/logger.c @@ -45,7 +45,15 @@ LoggerClose(LoggingHandle *handle) EXPORT LoggingHandle * LoggerOpen(const char *name) { - log4c_init(); + char bongo_log_file[XPL_MAX_PATH]; + + if (log4c_init() == -1) { + // log4c couldn't find a file itself, let's default to etc/bongo/logs.conf + snprintf(&bongo_log_file, XPL_MAX_PATH, "%s/logs.conf", XPL_DEFAULT_CONF_DIR); + if (log4c_load(bongo_log_file) == -1) { + XplConsolePrintf("ERROR: Unable to find log config %s\n", bongo_log_file); + } + } return (LoggingHandle*)1; } diff --git a/src/libs/logger/logs.conf b/src/libs/logger/logs.conf new file mode 100644 index 0000000..e5207bd --- /dev/null +++ b/src/libs/logger/logs.conf @@ -0,0 +1,35 @@ + + + + + + + 0 + + 0 + 1 + + + + + + + + + + + + + + + + + + + + + + + + +