/*
* citserver's main() function lives here.
*
- * Copyright (c) 1987-2017 by the citadel.org team
+ * Copyright (c) 1987-2018 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.
#include "serv_extensions.h"
#include "citadel_dirs.h"
#include "user_ops.h"
-#include "ecrash.h"
uid_t ctdluid = 0;
const char *CitadelServiceUDS="citadel-UDS";
const char *CitadelServiceTCP="citadel-TCP";
void go_threading(void);
+int sanity_diag_mode = 0;
/*
int relh=0;
int home=0;
int dbg=0;
+ int max_log_level = LOG_INFO;
char relhome[PATH_MAX]="";
char ctdldir[PATH_MAX]=CTDLDIR;
int syslog_facility = LOG_DAEMON;
struct passwd *p = NULL;
#ifdef HAVE_RUN_DIR
struct stat filestats;
-#endif
-#ifdef HAVE_BACKTRACE
- eCrashParameters params;
-// eCrashSymbolTable symbol_table;
#endif
/* initialize the master context */
InitializeMasterTSD();
/* parse command-line arguments */
- while ((a=getopt(argc, argv, "l:dh:x:t:B:Dru:")) != EOF) switch(a) {
+ while ((a=getopt(argc, argv, "l:dh:x:t:B:Dru:s:")) != EOF) switch(a) {
case 'l':
safestrncpy(facility, optarg, sizeof(facility));
break;
case 'x':
- /* deprecated */
+ max_log_level = atoi(optarg);
break;
case 't': /* deprecated */
}
break;
+ /* -s tells the server to behave differently during sanity checks */
+ case 's':
+ sanity_diag_mode = atoi(optarg);
+ break;
+
default:
/* any other parameter makes it crash and burn */
fprintf(stderr, "citserver: usage: "
"citserver "
"[-l LogFacility] "
+ "[-x MaxLogLevel] "
"[-d] [-D] [-r] "
"[-u user] "
"[-h HomeDir]\n"
}
StartLibCitadel(basesize);
+ setlogmask(LOG_UPTO(max_log_level));
openlog("citserver",
( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ),
syslog_facility
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, "Copyright (C) 1987-2018 by the Citadel development team.");
+ syslog(LOG_INFO, " ");
+ syslog(LOG_INFO, "This program is open source software: you can redistribute it and/or");
+ syslog(LOG_INFO, "modify it under the terms of the GNU General Public License, version 3.");
+ syslog(LOG_INFO, " ");
+ syslog(LOG_INFO, "This program is distributed in the hope that it will be useful,");
+ syslog(LOG_INFO, "but WITHOUT ANY WARRANTY; without even the implied warranty of");
+ syslog(LOG_INFO, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the");
+ syslog(LOG_INFO, "GNU General Public License for more details.");
syslog(LOG_INFO, " ");
syslog(LOG_INFO, "%s", libcitadel_version_string());
#ifdef HAVE_RUN_DIR
/* on some dists rundir gets purged on startup. so we need to recreate it. */
- if (stat(ctdl_run_dir, &filestats)==-1){
+ if (stat(ctdl_run_dir, &filestats) == -1) {
#ifdef HAVE_GETPWUID_R
#ifdef SOLARIS_GETPWUID
pwp = getpwuid_r(ctdluid, &pw, pwbuf, sizeof(pwbuf));
start_chkpwd_daemon();
}
-
/*
* check, whether we're fired up another time after a crash.
* if, post an aide message, so the admin has a chance to react.
*/
- checkcrash ();
-
+ checkcrash();
/*
* Now that we've bound the sockets, change to the Citadel user id and its