get_config() is now called from master_startup() immediately after the databases...

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index ace58c5e713a35404bb8c42eb4daeb21d60d0cfc..0ba31244673aede1d1af89dca0b4de503157842d 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -1,7 +1,7 @@
 /* 
  * Main source module for the Citadel server
  *
- * Copyright (c) 1987-2014 by the citadel.org team
+ * Copyright (c) 1987-2015 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 3.
@@ -44,14 +44,15 @@ void cit_backtrace(void)
        size_t size, i;
        char **strings;
 
-
+       const char *p = IOSTR;
+       if (p == NULL) p = "";
        size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*));
        strings = backtrace_symbols(stack_frames, size);
        for (i = 0; i < size; i++) {
                if (strings != NULL)
-                       syslog(LOG_ALERT, "%s\n", strings[i]);
+                       syslog(LOG_ALERT, "%s %s\n", p, strings[i]);
                else
-                       syslog(LOG_ALERT, "%p\n", stack_frames[i]);
+                       syslog(LOG_ALERT, "%s %p\n", p, stack_frames[i]);
        }
        free(strings);
 #endif
@@ -77,7 +78,7 @@ void cit_oneline_backtrace(void)
                                StrBufAppendPrintf(Buf, "%p : ", stack_frames[i]);
                }
                free(strings);
-               syslog(LOG_ALERT, "%s\n", ChrPtr(Buf));
+               syslog(LOG_ALERT, "%s %s\n", IOSTR, ChrPtr(Buf));
                FreeStrBuf(&Buf);
        }
 #endif
@@ -116,13 +117,36 @@ void master_startup(void) {
        FILE *urandom;
        struct ctdlroom qrbuf;
        int rv;
+       struct passwd *pw;
+       gid_t gid;
        
        syslog(LOG_DEBUG, "master_startup() started\n");
        time(&server_startup_time);
-       get_config();
 
-       syslog(LOG_INFO, "Opening databases\n");
+       syslog(LOG_INFO, "Checking directory access");
+       if ((pw = getpwuid(ctdluid)) == NULL) {
+               gid = getgid();
+       } else {
+               gid = pw->pw_gid;
+       }
+
+       if (create_run_directories(CTDLUID, gid) != 0) {
+               syslog(LOG_EMERG, "failed to access & create directories");
+               exit(1);
+       }
+       syslog(LOG_INFO, "Opening databases");
        open_databases();
+
+       /* Load site-specific configuration */
+       syslog(LOG_INFO, "Loading citadel.config");
+       get_config();
+       validate_config();
+
+       syslog(LOG_INFO, "Acquiring control record");
+       get_control();
+       put_config();
+
+       /* Check floor reference counts */
        check_ref_counts();
 
        syslog(LOG_INFO, "Creating base rooms (if necessary)\n");