THREADS: config setting min_workers _now_ also is that, plus its also max_spare_workers

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index bab3ab69f29bc960da866d43e7c5cfd5a1417825..8f432963b42266b8108e2e365d75f15c2c832094 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -74,9 +74,6 @@
 #include <sys/select.h>
 #endif
 
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
 const char *CitadelServiceUDS="citadel-UDS";
 const char *CitadelServiceTCP="citadel-TCP";
 
@@ -89,6 +86,7 @@ void go_threading(void);
  */
 int main(int argc, char **argv)
 {
+       size_t basesize = 64;
        char facility[32];
        int a;                  /* General-purpose variables */
        struct passwd pw, *pwp = NULL;
@@ -100,6 +98,7 @@ int main(int argc, char **argv)
        char relhome[PATH_MAX]="";
        char ctdldir[PATH_MAX]=CTDLDIR;
        int syslog_facility = LOG_DAEMON;
+       const char *eDebuglist[] = {NULL, NULL};
 #ifdef HAVE_RUN_DIR
        struct stat filestats;
 #endif
@@ -113,7 +112,7 @@ int main(int argc, char **argv)
        InitializeMasterTSD();
 
        /* parse command-line arguments */
-       while ((a=getopt(argc, argv, "l:dh:x:t:Dr")) != EOF) switch(a) {
+       while ((a=getopt(argc, argv, "l:dh:x:t:B:Dr")) != EOF) switch(a) {
 
                case 'l':
                        safestrncpy(facility, optarg, sizeof(facility));
@@ -136,11 +135,15 @@ int main(int argc, char **argv)
                        home=1;
                        break;
 
-               case 'x':       /* deprecated */
+               case 'x':
+                       eDebuglist [0] = optarg;
                        break;
 
                case 't':       /* deprecated */
                        break;
+                case 'B': /* Basesize */
+                        basesize = atoi(optarg);
+                        break;
 
                case 'D':
                        dbg = 1;
@@ -163,7 +166,7 @@ int main(int argc, char **argv)
                        );
                        exit(1);
        }
-
+       StartLibCitadel(basesize);
        openlog("citserver",
                ( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ),
                syslog_facility
@@ -314,6 +317,9 @@ int main(int argc, char **argv)
        
        initialise_modules(0);
 
+       eDebuglist[1] = getenv("CITADEL_LOGDEBUG");
+       CtdlSetDebugLogFacilities(eDebuglist, 2);
+
        /*
         * If we need host auth, start our chkpwd daemon.
         */
@@ -366,7 +372,7 @@ int main(int argc, char **argv)
        }
 
        /* We want to check for idle sessions once per minute */
-       CtdlRegisterSessionHook(terminate_idle_sessions, EVT_TIMER);
+       CtdlRegisterSessionHook(terminate_idle_sessions, EVT_TIMER, PRIO_CLEANUP + 1);
 
        go_threading();