removed StartLibCitadel()

[citadel.git] / webcit / webserver.c

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 636c7a706fe074094783268b62870b1fdf5e4fa2..96adf01c552edb7371283b1ab76b51a37ec98522 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996-2020 by the citadel.org team
+ * Copyright (c) 1996-2021 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.
@@ -64,7 +64,6 @@ void LoadMimeBlacklist(void);
 int main(int argc, char **argv)
 {
        uid_t UID = -1;
-       size_t basesize = 2;            /* how big should strbufs be on creation? */
        pthread_t SessThread;           /* Thread descriptor */
        pthread_attr_t attr;            /* Thread attributes */
        int a;                          /* General-purpose variable */
@@ -78,6 +77,7 @@ int main(int argc, char **argv)
        const char *basedir = NULL;
        char uds_listen_path[PATH_MAX]; /* listen on a unix domain socket? */
        const char *I18nDumpFile = NULL;
+       int max_log_level = LOG_INFO;
 
        WildFireInitBacktrace(argv[0], 2);
 
@@ -128,10 +128,7 @@ int main(int argc, char **argv)
                case 'g':
                        default_landing_page = strdup(optarg);
                        break;
-               case 'B': /* Basesize */
-                       basesize = atoi(optarg);
-                       if (basesize > 2)
-                               StartLibCitadel(basesize);
+               case 'B': /* deprecated */
                        break;
                case 'i':
                        safestrncpy(ip_addr, optarg, sizeof ip_addr);
@@ -154,7 +151,7 @@ int main(int argc, char **argv)
                        DisableGzip = 1;
                        break;
                case 'x':
-                       /* no longer used, but ignored so old scripts don't break */
+                       max_log_level = atoi(optarg);
                        break;
                case 'f':
                        follow_xff = 1;
@@ -198,7 +195,7 @@ int main(int argc, char **argv)
                                "[-d] [-Z] [-G i18ndumpfile] "
                                "[-u uid] [-h homedirectory] "
                                "[-D daemonizepid] [-v] "
-                               "[-g defaultlandingpage] [-B basesize] "
+                               "[-g defaultlandingpage] "
 #ifdef HAVE_OPENSSL
                                "[-s] [-S cipher_suites]"
 #endif
@@ -207,6 +204,7 @@ int main(int argc, char **argv)
                }
 
        /* Start the logger */
+       setlogmask(LOG_UPTO(max_log_level));
        openlog("webcit",
                ( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ),
                LOG_DAEMON
@@ -244,8 +242,13 @@ int main(int argc, char **argv)
        syslog(LOG_NOTICE, "GNU General Public License for more details.");
        syslog(LOG_NOTICE, " ");
 
-       /* initialize various subsystems */
+       /* run from the webcit home directory */
+       if (chdir(webcitdir) != 0) {
+               syslog(LOG_ERR, "webcit: %s: %m", webcitdir);
+               exit(errno);
+       }
 
+       /* initialize various subsystems */
        initialise_modules();
        initialise2_modules();
        InitTemplateCache();