* There is now a dedicated thread for doing database checkpoints.

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 6e25f3cc6fab49556ef8bfc9dffcf7433dce4dc9..6497d37871423acb56d9a9520b05e30272db795f 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
        struct passwd *pw;
        int drop_root_perms = 1;
        size_t size;
-        
+
        /* initialize the master context */
        InitializeMasterCC();
 
@@ -87,6 +87,7 @@ int main(int argc, char **argv)
                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 */
@@ -100,11 +101,15 @@ int main(int argc, char **argv)
                }
 
                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;
                }
@@ -121,6 +126,7 @@ int main(int argc, char **argv)
                                        "citserver "
                                        "[-lLogFacility] "
                                        "[-d] [-f]"
+                                       " [-tTraceFile]"
                                        " [-xLogLevel] [-hHomeDir]\n");
                        exit(1);
                }
@@ -128,12 +134,22 @@ int main(int argc, char **argv)
        }
 
        /* daemonize, if we were asked to */
-       if (running_as_daemon) { start_daemon(0); drop_root_perms = 1; }
+       if (running_as_daemon) {
+               start_daemon(0);
+               drop_root_perms = 1;
+       }
 
        /* initialize the syslog facility */
-       if (running_as_daemon) openlog("Citadel", LOG_NDELAY, syslog_facility);
-       else openlog("Citadel", LOG_PERROR|LOG_NDELAY, syslog_facility);
-       setlogmask(LOG_UPTO(verbosity));
+       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");
@@ -142,11 +158,12 @@ int main(int argc, char **argv)
                "*** Citadel server engine v%d.%02d ***\n",
                (REV_LEVEL/100), (REV_LEVEL%100));
        lprintf(CTDL_NOTICE,
-               "Copyright (C) 1987-2004 by the Citadel 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");
@@ -184,17 +201,17 @@ int main(int argc, char **argv)
         * 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);
@@ -202,8 +219,8 @@ int main(int argc, char **argv)
                                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)
@@ -217,18 +234,23 @@ int main(int argc, char **argv)
        /*
         * 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. */
-       worker_thread(NULL);
+       /* Create the indexer thread. */
+       create_maintenance_threads();
 
-       /* Server is exiting. Wait for workers to shutdown. */
-       lprintf(CTDL_INFO, "Server is shutting down.\n");
-       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);
 }