X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebserver.c;h=23043c840f4da4d48a8467e9eecbf478c3ce4c34;hb=37cdd9932e7854c7bde2b83a0b4f5f6aad105306;hp=df2d15098dda0925b61f93533603279a19eec020;hpb=3461572a79c5849073018d359ab666f95ddf0231;p=citadel.git

diff --git a/webcit/webserver.c b/webcit/webserver.c
index df2d15098..23043c840 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996-2018 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);
@@ -79,6 +78,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);
 
@@ -155,7 +155,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;
@@ -208,6 +208,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 +235,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-2018 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 +246,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();