Implemented the use of %m as a shortcut for %s and strerror(errno) in all syslog...

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 53be18071451bba5ee7777c367b60755c83f4ba1..b02596f3f4e2dda3866e497f7dc989abad864aa6 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -11,8 +11,11 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
+#include <stdlib.h>
+#include <unistd.h>
 #include <stdio.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <grp.h>
 #include <sys/file.h>
 #include <libcitadel.h>
@@ -30,13 +33,9 @@
 uid_t ctdluid = 0;
 const char *CitadelServiceUDS="citadel-UDS";
 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.
  */
@@ -44,13 +43,12 @@ 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));
+                       syslog(LOG_ERR, "%s: %m", lockfilename);
                        exit(CTDLEXIT_DB);
                }
                if (flock(fileno(fp), (LOCK_EX|LOCK_NB)) != 0) {
@@ -67,10 +65,6 @@ void ctdl_lockfile(int yo) {
 }
 
 
-
-
-
-
 /*
  * Here's where it all begins.
  */
@@ -88,7 +82,6 @@ int main(int argc, char **argv)
        char relhome[PATH_MAX]="";
        char ctdldir[PATH_MAX]=CTDLDIR;
        int syslog_facility = LOG_DAEMON;
-       const char *eDebuglist[] = {NULL, NULL};
        uid_t u = 0;
        struct passwd *p = NULL;
 #ifdef HAVE_RUN_DIR
@@ -128,7 +121,7 @@ int main(int argc, char **argv)
                        break;
 
                case 'x':
-                       eDebuglist [0] = optarg;
+                               /* deprecated */
                        break;
 
                case 't':       /* deprecated */
@@ -212,33 +205,14 @@ int main(int argc, char **argv)
                drop_root_perms = 1;
        }
 
-#if 0
- def HAVE_BACKTRACE
-       bzero(&params, sizeof(params));
-       params.filename = file_pid_paniclog;
-       panic_fd=open(file_pid_paniclog, O_APPEND|O_CREAT|O_DIRECT);
-       params.filep = fopen(file_pid_paniclog, "a+");
-       params.debugLevel = ECRASH_DEBUG_VERBOSE;
-       params.dumpAllThreads = TRUE;
-       params.useBacktraceSymbols = 1;
-       params.signals[0]=SIGSEGV;
-       params.signals[1]=SIGILL;
-       params.signals[2]=SIGBUS;
-       params.signals[3]=SIGABRT;
-       eCrash_Init(&params);
-       eCrash_RegisterThread("MasterThread", 0);
-#endif
-
        /* Tell 'em who's in da house */
-       syslog(LOG_NOTICE, " ");
-       syslog(LOG_NOTICE, " ");
-       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, " ");
-       syslog(LOG_DEBUG, "Called as: %s", argv[0]);
+       syslog(LOG_INFO, " ");
+       syslog(LOG_INFO, " ");
+       syslog(LOG_INFO, "*** Citadel server engine ***\n");
+       syslog(LOG_INFO, "Version %d (build %s) ***", REV_LEVEL, svn_revision());
+       syslog(LOG_INFO, "Copyright (C) 1987-2017 by the Citadel development team.");
+       syslog(LOG_INFO, "This program is distributed under the terms of the GNU General Public License.");
+       syslog(LOG_INFO, " ");
        syslog(LOG_INFO, "%s", libcitadel_version_string());
 
 #ifdef HAVE_RUN_DIR
@@ -256,11 +230,11 @@ int main(int argc, char **argv)
 #endif // HAVE_GETPWUID_R
 
                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));
+                       syslog(LOG_ERR, "main: unable to create run directory [%s]: %m", ctdl_run_dir);
                }
 
                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));
+                       syslog(LOG_ERR, "main: unable to set the access rights for [%s]: %m", ctdl_run_dir);
                }
        }
 #endif
@@ -338,9 +312,6 @@ int main(int argc, char **argv)
        
        initialise_modules(0);
 
-       eDebuglist[1] = getenv("CITADEL_LOGDEBUG");
-       CtdlSetDebugLogFacilities(eDebuglist, 2);
-
        /*
         * If we need host auth, start our chkpwd daemon.
         */
@@ -374,15 +345,15 @@ int main(int argc, char **argv)
 #endif // HAVE_GETPWUID_R
 
                if (pwp == NULL)
-                       syslog(LOG_ERR, "main: WARNING, getpwuid(%ld): %s" "Group IDs will be incorrect.", (long)CTDLUID, strerror(errno));
+                       syslog(LOG_ERR, "main: WARNING, getpwuid(%ld): %m Group IDs will be incorrect.", (long)CTDLUID);
                else {
                        initgroups(pw.pw_name, pw.pw_gid);
                        if (setgid(pw.pw_gid))
-                               syslog(LOG_ERR, "main: setgid(%ld): %s", (long)pw.pw_gid, strerror(errno));
+                               syslog(LOG_ERR, "main: setgid(%ld): %m", (long)pw.pw_gid);
                }
                syslog(LOG_INFO, "main: changing uid to %ld", (long)CTDLUID);
                if (setuid(CTDLUID) != 0) {
-                       syslog(LOG_ERR, "main: setuid() failed: %s", strerror(errno));
+                       syslog(LOG_ERR, "main: setuid() failed: %m");
                }
 #if defined (HAVE_SYS_PRCTL_H) && defined (PR_SET_DUMPABLE)
                prctl(PR_SET_DUMPABLE, 1);