* initialize_viewdefs (): call me via the init hook

[citadel.git] / webcit / webserver.c

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 6d02afed2141ccc09593efa89c29d7c26206288f..65c812a5f36beb45a9892b7b7b417a3873a7a061 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -77,7 +77,7 @@ int main(int argc, char **argv)
        size_t basesize = 2;            /* how big should strbufs be on creation? */
        pthread_t SessThread;           /* Thread descriptor */
        pthread_attr_t attr;            /* Thread attributes */
-       int a, i;                       /* General-purpose variables */
+       int a;                          /* General-purpose variable */
        char tracefile[PATH_MAX];
        char ip_addr[256]="0.0.0.0";
        int relh=0;
@@ -232,6 +232,7 @@ int main(int argc, char **argv)
                start_daemon(pidfile);
        }
        else {
+               signal(SIGINT, graceful_shutdown);
                signal(SIGHUP, graceful_shutdown);
        }
 
@@ -249,7 +250,6 @@ int main(int argc, char **argv)
        /* initialize the International Bright Young Thing */
 
        initialise_modules();
-       initialize_viewdefs();
        initialize_axdefs();
 
        InitTemplateCache();
@@ -258,7 +258,7 @@ int main(int argc, char **argv)
                StrBufAppendBufPlain(I18nDump, HKEY("}\n"), 0);
                if (StrLength(I18nDump) < 50) {
                        lprintf(1, "********************************************************************************\n");
-                       lprintf(1, "*        No strings found in templates! are you shure they're there?           *\n");
+                       lprintf(1, "*        No strings found in templates!  Are you sure they're there?           *\n");
                        lprintf(1, "********************************************************************************\n");
                        return -1;
                }
@@ -347,12 +347,7 @@ int main(int argc, char **argv)
 #endif
        drop_root(UID);
 
-       /* Start a few initial worker threads */
-       for (i = 0; i < (MIN_WORKER_THREADS); ++i) {
-               spawn_another_worker_thread();
-       }
-
-       /* now the original thread becomes another worker */
+       /* Become a worker thread.  More worker threads will be spawned as they are needed. */
        worker_entry();
        ShutDownLibCitadel ();
        return 0;