started setting up new config system

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 0ba31244673aede1d1af89dca0b4de503157842d..076f5cee9ba0b7010f04d7c918260036dddde6c3 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -139,7 +139,7 @@ void master_startup(void) {
 
        /* Load site-specific configuration */
        syslog(LOG_INFO, "Loading citadel.config");
-       get_config();
+       initialize_config_system();
        validate_config();
 
        syslog(LOG_INFO, "Acquiring control record");
@@ -209,6 +209,9 @@ void master_cleanup(int exitcode) {
 
        /* Do system-dependent stuff */
        sysdep_master_cleanup();
+
+       /* Close the configuration system */
+       shutdown_config_system();
        
        /* Close databases */
        syslog(LOG_INFO, "Closing databases\n");