Mercurial > hg > webserver / file diff

--- a/src/server/daemon/config.c	Wed Feb 10 12:19:56 2016 +0100
+++ b/src/server/daemon/config.c	Sat Oct 22 11:27:39 2016 +0200
@@ -61,11 +61,11 @@
 // TODO: Funktion für UcxList parameter list -> pblock
 
 int load_init_conf(char *file) {
-    printf("load_init_conf\n");
+    log_ereport(LOG_VERBOSE, "load_init_conf");
 
     InitConfig *cfg = load_init_config(file);
     if(cfg == NULL) {
-        fprintf(stderr, "Cannot load init.conf\n");
+        log_ereport(LOG_FAILURE, "Cannot load init.conf");
         return 1;
     }
     UcxAllocator *mp = cfg->parser.mp;
@@ -128,11 +128,11 @@
 }
 
 ServerConfiguration* load_server_conf(ServerConfiguration *old, char *file) {
-    printf("load_server_conf\n");
+    log_ereport(LOG_VERBOSE, "load_server_conf");
 
     ServerConfig *serverconf = load_server_config(file);
     if(serverconf == NULL) {
-        fprintf(stderr, "Cannot load server.conf\n");
+        log_ereport(LOG_FAILURE, "Cannot load server.conf");
     }
     ServerConfiguration *serverconfig = calloc(1, sizeof(ServerConfiguration));
     serverconfig->ref = 1;
@@ -504,7 +504,6 @@
         name = sstrdup(name);
         
         AuthDB *authdb = create_ldap_authdb(name.ptr, &conf);
-        printf("authdb: %"PRIxPTR"\n", (intptr_t)authdb);
         ucx_map_sstr_put(cfg->authdbs, name, authdb);
         
         // TODO: create_ldap_authdb should copy the strings
@@ -549,7 +548,6 @@
         // add keyfile authdb
         Keyfile *keyfile = f->data;
         keyfile->authdb.name = sstrdup(name).ptr;
-        printf("authdb: %"PRIxPTR"\n", (intptr_t)keyfile);
         ucx_map_sstr_put(cfg->authdbs, name, keyfile);
     }
 
@@ -716,7 +714,7 @@
 }
 
 HTTPObjectConfig* load_obj_conf(char *file) {
-    printf("load_obj_conf\n");
+    log_ereport(LOG_VERBOSE, "load_obj_conf");
 
     // new conf function test
     ObjectConfig *cfg = load_object_config(file);
@@ -863,7 +861,7 @@
     UCX_FOREACH(elm, aclfile->namedACLs) {
         ACLConfig *ac = elm->data;
         ACLList *acl = acl_config_convert(cfg, ac);
-        printf("put acl: %s\n", ac->id.ptr);
+        log_ereport(LOG_VERBOSE, "add acl: %.*s", (int)ac->id.length, ac->id.ptr);
         ucx_map_sstr_put(acldata->namedACLs, ac->id, acl);
     }
     free_acl_file(aclfile);
@@ -887,7 +885,6 @@
     acllist->ece = NULL;
     
     if(acl->type.ptr && !sstrcmp(acl->type, sstr("fs"))) {
-        printf("set acl to extern\n");
         acllist->acl.isextern = 1;
     }