master_cleanup() is now the global shutdown/exit function

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

diff --git a/citadel/server/server_main.c b/citadel/server/server_main.c
index a90ddd02d748189115fe85efee7c2e45e975df88..b5b3c3a575c62f6904efac0931402f47341262f5 100644 (file)
--- a/citadel/server/server_main.c
+++ b/citadel/server/server_main.c
@@ -316,11 +316,5 @@ int main(int argc, char **argv) {
        }
        
        // Get ready to shut down the server.
-       int exit_code = master_cleanup(exit_signal);
-       ctdl_lockfile(0);
-       if (restart_server) {
-               syslog(LOG_INFO, "main: *** CITADEL SERVER IS RESTARTING ***");
-               execv(argv[0], argv);
-       }
-       return(exit_code);
+       master_cleanup(exit_signal);
 }