diff -r 80ee93a7d257 -r 0aef555055ee src/server/daemon/config.c --- a/src/server/daemon/config.c Sun Sep 25 11:00:38 2022 +0200 +++ b/src/server/daemon/config.c Sun Sep 25 11:56:47 2022 +0200 @@ -195,6 +195,7 @@ // init logfile first UcxList *list; + log_ereport(LOG_DEBUG, "apply config: LogFile"); list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("LogFile")); if(list) { ConfigNode *logobj = list->data; @@ -215,7 +216,7 @@ ucx_list_free(list); - + log_ereport(LOG_DEBUG, "apply config: Threadpool"); list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("Threadpool")); UCX_FOREACH(elm, list) { if(cfg_handle_threadpool(serverconfig, elm->data)) { @@ -229,6 +230,7 @@ return NULL; } + log_ereport(LOG_DEBUG, "apply config: EventHandler"); list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("EventHandler")); UCX_FOREACH(elm, list) { if(cfg_handle_eventhandler( @@ -244,6 +246,7 @@ } ucx_list_free(list); + log_ereport(LOG_DEBUG, "apply config: AccessLog"); list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("AccessLog")); UCX_FOREACH(elm, list) { ConfigNode *scfgobj = elm->data; @@ -253,6 +256,7 @@ } ucx_list_free(list); + log_ereport(LOG_DEBUG, "apply config: AuthDB"); list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("AuthDB")); UCX_FOREACH(elm, list) { ConfigNode *scfgobj = elm->data; @@ -262,6 +266,7 @@ } ucx_list_free(list); + log_ereport(LOG_DEBUG, "apply config: Listener"); list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("Listener")); UCX_FOREACH(elm, list) { ConfigNode *scfgobj = elm->data; @@ -271,6 +276,7 @@ } ucx_list_free(list); + log_ereport(LOG_DEBUG, "apply config: VirtualServer"); list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("VirtualServer")); UCX_FOREACH(elm, list) { ConfigNode *scfgobj = elm->data; @@ -280,6 +286,7 @@ } ucx_list_free(list); + log_ereport(LOG_DEBUG, "apply config: ResourcePool"); list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("ResourcePool")); UCX_FOREACH(elm, list) { ConfigNode *scfgobj = elm->data; @@ -288,6 +295,7 @@ } } + log_ereport(LOG_DEBUG, "apply config: Dav"); list = serverconfig_get_node_list(serverconf->root, CONFIG_NODE_OBJECT, SC("Dav")); UCX_FOREACH(elm, list) { ConfigNode *scfgobj = elm->data; @@ -369,8 +377,16 @@ scstr_t file = serverconfig_directive_value(obj, SC("File")); scstr_t lvl = serverconfig_directive_value(obj, SC("Level")); - if(file.ptr == NULL || lvl.ptr == NULL) { - /* missing log file parameters */ + int err = 0; + if(file.ptr == NULL) { + err = 1; + log_ereport(LOG_MISCONFIG, "LogFile: parameter missing: File"); + } + if(lvl.ptr == NULL) { + err = 1; + log_ereport(LOG_MISCONFIG, "LogFile: parameter missing: Level"); + } + if(err) { return -1; } @@ -950,6 +966,7 @@ sstr_t ext = sstr(xl->data); sstr_t value = sstrdup(d->type); if(ucx_map_sstr_put(map, ext, value.ptr)) { + log_ereport(LOG_CATASTROPHE, "OOM"); ret = -1; break; } @@ -961,6 +978,7 @@ cfg->mimetypes = mimemap; } else { + log_ereport(LOG_CATASTROPHE, "OOM"); ret = -1; }