#include "snprintf.h"
#endif
+int running_as_daemon = 0;
+
/*
* Here's where it all begins.
*/
int main(int argc, char **argv)
{
- char tracefile[128]; /* Name of file to log traces to */
+ char facility[32];
int a, i; /* General-purpose variables */
struct passwd *pw;
int drop_root_perms = 1;
- struct worker_node *wnp;
size_t size;
-
- /* specify default port name and trace file */
- strcpy(tracefile, "");
/* initialize the master context */
InitializeMasterCC();
+ /* set default syslog facility */
+ syslog_facility = LOG_DAEMON;
+
/* parse command-line arguments */
for (a=1; a<argc; ++a) {
- /* -t specifies where to log trace messages to */
- if (!strncmp(argv[a], "-t", 2)) {
- safestrncpy(tracefile, argv[a], sizeof tracefile);
- strcpy(tracefile, &tracefile[2]);
- freopen(tracefile, "r", stdin);
- freopen(tracefile, "w", stdout);
- freopen(tracefile, "w", stderr);
- chmod(tracefile, 0600);
- }
-
- else if (!strncmp(argv[a], "-l", 2)) {
- safestrncpy(tracefile, argv[a], sizeof tracefile);
- strcpy(tracefile, &tracefile[2]);
- syslog_facility = SyslogFacility(tracefile);
- if (syslog_facility >= 0) {
- openlog("citadel", LOG_PID, syslog_facility);
- }
+ if (!strncmp(argv[a], "-l", 2)) {
+ safestrncpy(facility, argv[a], sizeof(facility));
+ syslog_facility = SyslogFacility(facility);
+ enable_syslog = 1;
}
/* run in the background if -d was specified */
else if (!strcmp(argv[a], "-d")) {
- start_daemon( (strlen(tracefile) > 0) ? 0 : 1 ) ;
+ running_as_daemon = 1;
}
/* -x specifies the desired logging level */
}
else if (!strncmp(argv[a], "-h", 2)) {
- safestrncpy(bbs_home_directory, &argv[a][2],
- sizeof bbs_home_directory);
+ safestrncpy(ctdl_home_directory, &argv[a][2],
+ sizeof ctdl_home_directory);
home_specified = 1;
}
+ else if (!strncmp(argv[a], "-t", 2)) {
+ freopen(&argv[a][2], "w", stderr);
+ }
+
else if (!strncmp(argv[a], "-f", 2)) {
do_defrag = 1;
}
/* any other parameter makes it crash and burn */
else {
lprintf(CTDL_EMERG, "citserver: usage: "
- "citserver [-tTraceFile] "
+ "citserver "
"[-lLogFacility] "
"[-d] [-f]"
+ " [-tTraceFile]"
" [-xLogLevel] [-hHomeDir]\n");
exit(1);
}
}
+ /* daemonize, if we were asked to */
+ if (running_as_daemon) {
+ start_daemon(0);
+ drop_root_perms = 1;
+ }
+
+ /* initialize the syslog facility */
+ if (enable_syslog) {
+ if (running_as_daemon) {
+ openlog("citadel", LOG_NDELAY, syslog_facility);
+ }
+ else {
+ openlog("citadel", LOG_PERROR|LOG_NDELAY,
+ syslog_facility);
+ }
+ setlogmask(LOG_UPTO(verbosity));
+ }
+
/* Tell 'em who's in da house */
lprintf(CTDL_NOTICE, "\n");
lprintf(CTDL_NOTICE, "\n");
lprintf(CTDL_NOTICE,
- "*** Citadel/UX messaging server engine v%d.%02d ***\n",
+ "*** Citadel server engine v%d.%02d ***\n",
(REV_LEVEL/100), (REV_LEVEL%100));
lprintf(CTDL_NOTICE,
- "Copyright (C) 1987-2003 by the Citadel/UX development team.\n");
+ "Copyright (C) 1987-2005 by the Citadel development team.\n");
lprintf(CTDL_NOTICE,
"This program is distributed under the terms of the GNU "
"General Public License.\n");
lprintf(CTDL_NOTICE, "\n");
+ lprintf(CTDL_DEBUG, "Called as: %s\n", argv[0]);
/* Load site-specific parameters, and set the ipgm secret */
lprintf(CTDL_INFO, "Loading citadel.config\n");
CtdlRegisterServiceHook(0,
"citadel.socket",
citproto_begin_session,
- do_command_loop);
+ do_command_loop,
+ do_async_loop);
/*
* Bind the server to our favorite TCP port (usually 504).
CtdlRegisterServiceHook(config.c_port_number,
NULL,
citproto_begin_session,
- do_command_loop);
+ do_command_loop,
+ do_async_loop);
/*
* Load any server-side extensions available here.
*/
lprintf(CTDL_INFO, "Initializing server extensions\n");
- size = strlen(bbs_home_directory) + 9;
+ size = strlen(ctdl_home_directory) + 9;
initialize_server_extensions();
/*
- * Now that we've bound the sockets, change to the BBS user id and its
+ * Now that we've bound the sockets, change to the Citadel user id and its
* corresponding group ids
*/
if (drop_root_perms) {
- if ((pw = getpwuid(BBSUID)) == NULL)
+ if ((pw = getpwuid(CTDLUID)) == NULL)
lprintf(CTDL_CRIT, "WARNING: getpwuid(%ld): %s\n"
- "Group IDs will be incorrect.\n", (long)BBSUID,
+ "Group IDs will be incorrect.\n", (long)CTDLUID,
strerror(errno));
else {
initgroups(pw->pw_name, pw->pw_gid);
lprintf(CTDL_CRIT, "setgid(%ld): %s\n", (long)pw->pw_gid,
strerror(errno));
}
- lprintf(CTDL_INFO, "Changing uid to %ld\n", (long)BBSUID);
- if (setuid(BBSUID) != 0) {
+ lprintf(CTDL_INFO, "Changing uid to %ld\n", (long)CTDLUID);
+ if (setuid(CTDLUID) != 0) {
lprintf(CTDL_CRIT, "setuid() failed: %s\n", strerror(errno));
}
#if defined (HAVE_SYS_PRCTL_H) && defined (PR_SET_DUMPABLE)
/*
* Now create a bunch of worker threads.
*/
- lprintf(CTDL_DEBUG, "Starting %d worker threads\n", config.c_min_workers-1);
+ lprintf(CTDL_DEBUG, "Starting %d worker threads\n",
+ config.c_min_workers-1);
begin_critical_section(S_WORKER_LIST);
for (i=0; i<(config.c_min_workers-1); ++i) {
create_worker();
}
end_critical_section(S_WORKER_LIST);
- /* Now this thread can become a worker as well. */
- initial_thread = pthread_self();
- worker_thread(NULL);
+ /* Create the indexer thread. */
+ create_maintenance_threads();
- /* Server is exiting. Wait for workers to shutdown. */
- lprintf(CTDL_INFO, "Waiting for worker threads to shut down\n");
-
- begin_critical_section(S_WORKER_LIST);
- while (worker_list != NULL) {
- wnp = worker_list;
- worker_list = wnp->next;
-
- /* avoid deadlock with an exiting thread */
- end_critical_section(S_WORKER_LIST);
- if ((i = pthread_join(wnp->tid, NULL)))
- lprintf(CTDL_CRIT, "pthread_join: %s\n", strerror(i));
- free(wnp);
- begin_critical_section(S_WORKER_LIST);
- }
- end_critical_section(S_WORKER_LIST);
-
- master_cleanup();
+ /* This thread is now useless. It can't be turned into a worker
+ * thread because its stack is too small, but it can't be killed
+ * either because the whole server process would exit. So we just
+ * join to the first worker thread and exit when it exits.
+ */
+ pthread_join(worker_list->tid, NULL);
+ master_cleanup(0);
return(0);
}
projects / citadel.git / blobdiff