more moving to new logging standard

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index a015876e5beedd803790e92aa0dda78093a5825d..53be18071451bba5ee7777c367b60755c83f4ba1 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -1,7 +1,7 @@
 /*
  * citserver's main() function lives here.
  * 
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2017 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.
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <grp.h>
+#include <sys/file.h>
 #include <libcitadel.h>
 
 #include "citserver.h"
@@ -34,6 +35,42 @@ const char *CitadelServiceTCP="citadel-TCP";
 
 void go_threading(void);
 
+
+
+/*
+ * Create or remove a lock file, so we only have one Citadel Server running at a time.
+ */
+void ctdl_lockfile(int yo) {
+       static char lockfilename[SIZ];
+       static FILE *fp;
+
+
+       if (yo) {
+               syslog(LOG_DEBUG, "main: creating lockfile");
+               snprintf(lockfilename, sizeof lockfilename, "%s/citadel.lock", ctdl_run_dir);
+               fp = fopen(lockfilename, "w");
+               if (!fp) {
+                       syslog(LOG_ERR, "%s: %s", lockfilename, strerror(errno));
+                       exit(CTDLEXIT_DB);
+               }
+               if (flock(fileno(fp), (LOCK_EX|LOCK_NB)) != 0) {
+                       syslog(LOG_ERR, "main: cannot lock %s , is another citserver running?", lockfilename);
+                       exit(CTDLEXIT_DB);
+               }
+               return;
+       }
+
+       syslog(LOG_DEBUG, "main: removing lockfile");
+       unlink(lockfilename);
+       flock(fileno(fp), LOCK_UN);
+       fclose(fp);
+}
+
+
+
+
+
+
 /*
  * Here's where it all begins.
  */
@@ -195,10 +232,9 @@ int main(int argc, char **argv)
        /* Tell 'em who's in da house */
        syslog(LOG_NOTICE, " ");
        syslog(LOG_NOTICE, " ");
-       syslog(LOG_NOTICE,
-               "*** Citadel server engine v%d.%02d (build %s) ***",
-               (REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
-       syslog(LOG_NOTICE, "Copyright (C) 1987-2015 by the Citadel development team.");
+       syslog(LOG_NOTICE, "*** Citadel server engine ***\n");
+       syslog(LOG_NOTICE, "Version %d (build %s) ***", REV_LEVEL, svn_revision());
+       syslog(LOG_NOTICE, "Copyright (C) 1987-2017 by the Citadel development team.");
        syslog(LOG_NOTICE, "This program is distributed under the terms of the GNU "
                                        "General Public License.");
        syslog(LOG_NOTICE, " ");
@@ -219,20 +255,18 @@ int main(int argc, char **argv)
                pwp = NULL;
 #endif // HAVE_GETPWUID_R
 
-               if ((mkdir(ctdl_run_dir, 0755) != 0) && (errno != EEXIST))
-                       syslog(LOG_EMERG, 
-                                     "unable to create run directory [%s]: %s", 
-                                     ctdl_run_dir, strerror(errno));
+               if ((mkdir(ctdl_run_dir, 0755) != 0) && (errno != EEXIST)) {
+                       syslog(LOG_ERR, "main: unable to create run directory [%s]: %s", ctdl_run_dir, strerror(errno));
+               }
 
-               if (chown(ctdl_run_dir, ctdluid, (pwp==NULL)?-1:pw.pw_gid) != 0)
-                       syslog(LOG_EMERG, 
-                                     "unable to set the access rights for [%s]: %s", 
-                                     ctdl_run_dir, strerror(errno));
+               if (chown(ctdl_run_dir, ctdluid, (pwp==NULL)?-1:pw.pw_gid) != 0) {
+                       syslog(LOG_ERR, "main: unable to set the access rights for [%s]: %s", ctdl_run_dir, strerror(errno));
+               }
        }
-                       
-
 #endif
 
+       ctdl_lockfile(1);
+
        /* Initialize... */
        init_sysdep();
 
@@ -249,7 +283,7 @@ int main(int argc, char **argv)
        /*
         * Run any upgrade entry points
         */
-       syslog(LOG_INFO, "Upgrading modules.");
+       syslog(LOG_INFO, "main: upgrading modules");
        upgrade_modules();
        
 /*
@@ -300,7 +334,7 @@ int main(int argc, char **argv)
        /*
         * Load any server-side extensions available here.
         */
-       syslog(LOG_INFO, "Initializing server extensions");
+       syslog(LOG_INFO, "main: initializing server extensions");
        
        initialise_modules(0);
 
@@ -340,18 +374,15 @@ int main(int argc, char **argv)
 #endif // HAVE_GETPWUID_R
 
                if (pwp == NULL)
-                       syslog(LOG_CRIT, "WARNING: getpwuid(%ld): %s"
-                                  "Group IDs will be incorrect.\n", (long)CTDLUID,
-                               strerror(errno));
+                       syslog(LOG_ERR, "main: WARNING, getpwuid(%ld): %s" "Group IDs will be incorrect.", (long)CTDLUID, strerror(errno));
                else {
                        initgroups(pw.pw_name, pw.pw_gid);
                        if (setgid(pw.pw_gid))
-                               syslog(LOG_CRIT, "setgid(%ld): %s", (long)pw.pw_gid,
-                                       strerror(errno));
+                               syslog(LOG_ERR, "main: setgid(%ld): %s", (long)pw.pw_gid, strerror(errno));
                }
-               syslog(LOG_INFO, "Changing uid to %ld", (long)CTDLUID);
+               syslog(LOG_INFO, "main: changing uid to %ld", (long)CTDLUID);
                if (setuid(CTDLUID) != 0) {
-                       syslog(LOG_CRIT, "setuid() failed: %s", strerror(errno));
+                       syslog(LOG_ERR, "main: setuid() failed: %s", strerror(errno));
                }
 #if defined (HAVE_SYS_PRCTL_H) && defined (PR_SET_DUMPABLE)
                prctl(PR_SET_DUMPABLE, 1);
@@ -363,6 +394,7 @@ int main(int argc, char **argv)
 
        go_threading();
        
-       master_cleanup(exit_signal);
-       return(0);
+       int exit_code = master_cleanup(exit_signal);
+       ctdl_lockfile(0);
+       return(exit_code);
 }