Where gettimeofday() is required, include both time.h and sys/time.h

[citadel.git] / citadel / server / citserver.c

diff --git a/citadel/server/citserver.c b/citadel/server/citserver.c
index ebb7a469f1a455f037e653c4af02e2d1df8b471f..016dad7b49cef1c0b56b8d5dc8b10dce56a9be09 100644 (file)
--- a/citadel/server/citserver.c
+++ b/citadel/server/citserver.c
@@ -11,8 +11,8 @@
 #include <sys/stat.h>
 #include "sysdep.h"
 #include <time.h>
+#include <sys/time.h>
 #include <libcitadel.h>
-
 #include "ctdl_module.h"
 #include "housekeeping.h"
 #include "locate_host.h"
@@ -67,7 +67,7 @@ void master_startup(void) {
                gid = pw->pw_gid;
        }
 
-       if (create_run_directories(CTDLUID, gid) != 0) {
+       if (create_run_directories(ctdluid, gid) != 0) {
                syslog(LOG_ERR, "citserver: failed to access and create directories");
                exit(1);
        }
@@ -78,6 +78,7 @@ void master_startup(void) {
        syslog(LOG_DEBUG, "citserver: ctdl_run_dir is %s", ctdl_run_dir);
 
        syslog(LOG_INFO, "Opening databases");
+       cdb_init_backends();
        cdb_open_databases();
 
        // Load site-specific configuration
@@ -120,7 +121,7 @@ void master_startup(void) {
 
 
 // Cleanup routine to be called when the server is shutting down.  Returns the needed exit code.
-int master_cleanup(int exitcode) {
+void master_cleanup(int exitcode) {
        static int already_cleaning_up = 0;
 
        if (already_cleaning_up) {
@@ -130,8 +131,8 @@ int master_cleanup(int exitcode) {
        }
        already_cleaning_up = 1;
 
-       // Do system-dependent stuff
-       sysdep_master_cleanup();
+       // Close the sockets
+       context_cleanup();
 
        // Close the configuration system
        shutdown_config_system();
@@ -155,13 +156,12 @@ int master_cleanup(int exitcode) {
        fflush(stdout);
        fflush(stderr);
 
-       if (restart_server != 0) {
-               exitcode = 1;
-       }
-       else if ((running_as_daemon != 0) && ((exitcode == 0))) {
+       if ((running_as_daemon != 0) && ((exitcode == 0))) {
                exitcode = CTDLEXIT_SHUTDOWN;
        }
-       return (exitcode);
+
+       ctdl_lockfile(0);
+       exit(exitcode);
 }