X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebserver.c;h=96adf01c552edb7371283b1ab76b51a37ec98522;hb=b826c3117bb7ddf1386a4811cb2eb47ea4e1097c;hp=99e303a098ddfb9aedc85d9a9fc353454ae321a4;hpb=5eac97938a6d6f6967d80a8fd914c51710c82ea9;p=citadel.git

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 99e303a09..96adf01c5 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996-2017 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.
@@ -22,7 +22,6 @@ int follow_xff = 0;				/* Follow X-Forwarded-For: header? */
 int DisableGzip = 0;
 char *default_landing_page = NULL;
 extern pthread_mutex_t SessionListMutex;
-extern pthread_key_t MyConKey;
 
 extern void *housekeeping_loop(void);
 extern int webcit_tcp_server(char *ip_addr, int port_number, int queue_len);
@@ -65,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 */
@@ -79,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);
 
@@ -129,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);
@@ -155,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;
@@ -199,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
@@ -208,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
@@ -234,7 +231,7 @@ int main(int argc, char **argv)
 
 	/* Tell 'em who's in da house */
 	syslog(LOG_NOTICE, "%s", PACKAGE_STRING);
-	syslog(LOG_NOTICE, "Copyright (C) 1996-2017 by the citadel.org team");
+	syslog(LOG_NOTICE, "Copyright (C) 1996-2020 by the citadel.org team");
 	syslog(LOG_NOTICE, " ");
 	syslog(LOG_NOTICE, "This program is open source software: you can redistribute it and/or");
 	syslog(LOG_NOTICE, "modify it under the terms of the GNU General Public License, version 3.");
@@ -245,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();