/*
* 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.
* 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
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
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.
*/
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
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");
/* 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);
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 {
srand(seed);
srandom(seed);
- syslog(LOG_DEBUG, "master_startup() finished\n");
+ syslog(LOG_DEBUG, "master_startup() finished");
}
/*
- * Cleanup routine to be called when the server is shutting down.
+ * Cleanup routine to be called when the server is shutting down. Returns the needed exit code.
*/
-void master_cleanup(int exitcode) {
+int master_cleanup(int exitcode) {
struct CleanupFunctionHook *fcn;
static int already_cleaning_up = 0;
/* 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);
}
/* 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)
- exit(1);
- if ((running_as_daemon != 0) && ((exitcode == 0) ))
+ if (restart_server != 0) {
+ exitcode = 1;
+ }
+ else if ((running_as_daemon != 0) && ((exitcode == 0) )) {
exitcode = CTDLEXIT_SHUTDOWN;
- exit(exitcode);
+ }
+ return(exitcode);
}
*/
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;
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);
}