Ultra-simplification of the build system for the text client.

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index f389ac9f020b303551e62769d12c4d9135ea9b6c..3ac69266d64099991dff643937446517b03d6a15 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -1,7 +1,7 @@
 /* 
  * Main source module for the Citadel server
  *
- * 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.
@@ -12,7 +12,10 @@
  * GNU General Public License for more details.
  */
 
+#include <stdlib.h>
+#include <unistd.h>
 #include <stdio.h>
+#include <sys/stat.h>
 #include "sysdep.h"
 #include <time.h>
 #if HAVE_BACKTRACE
@@ -49,10 +52,12 @@ void cit_backtrace(void)
        size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*));
        strings = backtrace_symbols(stack_frames, size);
        for (i = 0; i < size; i++) {
-               if (strings != NULL)
-                       syslog(LOG_ALERT, "%s %s\n", p, strings[i]);
-               else
-                       syslog(LOG_ALERT, "%s %p\n", p, stack_frames[i]);
+               if (strings != NULL) {
+                       syslog(LOG_DEBUG, "citserver: %s %s", p, strings[i]);
+               }
+               else {
+                       syslog(LOG_DEBUG, "citserver: %s %p", p, stack_frames[i]);
+               }
        }
        free(strings);
 #endif
@@ -78,12 +83,13 @@ void cit_oneline_backtrace(void)
                                StrBufAppendPrintf(Buf, "%p : ", stack_frames[i]);
                }
                free(strings);
-               syslog(LOG_ALERT, "%s %s\n", IOSTR, ChrPtr(Buf));
+               syslog(LOG_DEBUG, "citserver: %s %s", IOSTR, ChrPtr(Buf));
                FreeStrBuf(&Buf);
        }
 #endif
 }
 
+
 /*
  * print the actual stack frame.
  */
@@ -98,10 +104,12 @@ void cit_panic_backtrace(int SigNum)
        size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*));
        strings = backtrace_symbols(stack_frames, size);
        for (i = 0; i < size; i++) {
-               if (strings != NULL)
-                       syslog(LOG_ALERT, "%s\n", strings[i]);
-               else
-                       syslog(LOG_ALERT, "%p\n", stack_frames[i]);
+               if (strings != NULL) {
+                       syslog(LOG_DEBUG, "%s", strings[i]);
+               }
+               else {
+                       syslog(LOG_DEBUG, "%p", stack_frames[i]);
+               }
        }
        free(strings);
 #endif
@@ -120,7 +128,7 @@ void master_startup(void) {
        struct passwd *pw;
        gid_t gid;
        
-       syslog(LOG_DEBUG, "master_startup() started\n");
+       syslog(LOG_DEBUG, "master_startup() started");
        time(&server_startup_time);
 
        syslog(LOG_INFO, "Checking directory access");
@@ -146,7 +154,7 @@ void master_startup(void) {
        /* Check floor reference counts */
        check_ref_counts();
 
-       syslog(LOG_INFO, "Creating base rooms (if necessary)\n");
+       syslog(LOG_INFO, "Creating base rooms (if necessary)");
        CtdlCreateRoom(CtdlGetConfigStr("c_baseroom"),  0, "", 0, 1, 0, VIEW_BBS);
        CtdlCreateRoom(AIDEROOM,                        3, "", 0, 1, 0, VIEW_BBS);
        CtdlCreateRoom(SYSCONFIGROOM,                   3, "", 0, 1, 0, VIEW_BBS);
@@ -164,13 +172,13 @@ void master_startup(void) {
                 CtdlPutRoomLock(&qrbuf);
         }
 
-       syslog(LOG_INFO, "Seeding the pseudo-random number generator...\n");
+       syslog(LOG_INFO, "Seeding the pseudo-random number generator...");
        urandom = fopen("/dev/urandom", "r");
        if (urandom != NULL) {
                rv = fread(&seed, sizeof seed, 1, urandom);
-               if (rv == -1)
-                       syslog(LOG_EMERG, "failed to read random seed: %s\n", 
-                              strerror(errno));
+               if (rv == -1) {
+                       syslog(LOG_ERR, "citserver: failed to read random seed: %m");
+               }
                fclose(urandom);
        }
        else {
@@ -180,7 +188,7 @@ void master_startup(void) {
        srand(seed);
        srandom(seed);
 
-       syslog(LOG_DEBUG, "master_startup() finished\n");
+       syslog(LOG_DEBUG, "master_startup() finished");
 }
 
 
@@ -214,7 +222,7 @@ int master_cleanup(int exitcode) {
 
        /* If the operator requested a halt but not an exit, halt here. */
        if (shutdown_and_halt) {
-               syslog(LOG_NOTICE, "citserver: Halting server without exiting.\n");
+               syslog(LOG_ERR, "citserver: Halting server without exiting.");
                fflush(stdout); fflush(stderr);
                while(1) {
                        sleep(32767);
@@ -222,7 +230,7 @@ int master_cleanup(int exitcode) {
        }
        
        /* Now go away. */
-       syslog(LOG_NOTICE, "citserver: Exiting with status %d\n", exitcode);
+       syslog(LOG_ERR, "citserver: Exiting with status %d", exitcode);
        fflush(stdout); fflush(stderr);
        
        if (restart_server != 0) {
@@ -282,14 +290,13 @@ int CtdlIsPublicClient(void)
         */
        if (stat(public_clients_file, &statbuf) != 0) {
                /* No public_clients file exists, so bail out */
-               syslog(LOG_WARNING, "Warning: '%s' does not exist\n", 
-                               public_clients_file);
+               syslog(LOG_WARNING, "Warning: '%s' does not exist", public_clients_file);
                return(0);
        }
 
        if (statbuf.st_mtime > pc_timestamp) {
                begin_critical_section(S_PUBLIC_CLIENTS);
-               syslog(LOG_INFO, "Loading %s\n", public_clients_file);
+               syslog(LOG_INFO, "Loading %s", public_clients_file);
 
                public_clientspos = &public_clients[0];
                public_clientsend = public_clientspos + SIZ;
@@ -335,18 +342,17 @@ int CtdlIsPublicClient(void)
                end_critical_section(S_PUBLIC_CLIENTS);
        }
 
-       syslog(LOG_DEBUG, "Checking whether %s is a local or public client\n",
-               CC->cs_addr);
+       syslog(LOG_DEBUG, "Checking whether %s is a local or public client", CC->cs_addr);
        for (i=0; i<num_parms(public_clients); ++i) {
                extract_token(addrbuf, public_clients, i, '|', sizeof addrbuf);
                if (!strcasecmp(CC->cs_addr, addrbuf)) {
-                       syslog(LOG_DEBUG, "... yes its local.\n");
+                       syslog(LOG_DEBUG, "... yes its local.");
                        return(1);
                }
        }
 
        /* No hits.  This is not a public client. */
-       syslog(LOG_DEBUG, "... no it isn't.\n");
+       syslog(LOG_DEBUG, "... no it isn't.");
        return(0);
 }