/*
- * $Id$
- *
* This contains a simple multithreaded TCP server manager. It sits around
* waiting on the specified port for incoming HTTP connections. When a
* connection is established, it calls context_loop() from context_loop.c.
*
- * Copyright (c) 1996-2010 by the citadel.org developers.
+ * Copyright (c) 1996-2011 by the citadel.org developers.
* This program is released under the terms of the GNU General Public License v3.
*
*/
extern int msock; /* master listening socket */
extern int verbosity; /* Logging level */
extern char static_icon_dir[PATH_MAX]; /* where should we find our mime icons */
-extern long MaxRead;
int is_https = 0; /* Nonzero if I am an HTTPS service */
int follow_xff = 0; /* Follow X-Forwarded-For: header */
int home_specified = 0; /* did the user specify a homedir? */
const char *nix(void *vptr) {snprintf(foobuf, 32, "%0x", (long) vptr); return foobuf;}
#endif
extern int dbg_analyze_msg;
-extern int dbg_bactrace_template_errors;
+extern int dbg_backtrace_template_errors;
extern int DumpTemplateI18NStrings;
extern StrBuf *I18nDump;
void InitTemplateCache(void);
/* Parse command line */
#ifdef HAVE_OPENSSL
- while ((a = getopt(argc, argv, "R:u:h:i:p:t:T:B:x:dD:G:cfsS:Z")) != EOF)
+ while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:dD:G:cfsS:Z")) != EOF)
#else
- while ((a = getopt(argc, argv, "R:u:h:i:p:t:T:B:x:dD:G:cfZ")) != EOF)
+ while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:dD:G:cfZ")) != EOF)
#endif
switch (a) {
case 'u':
case 'T':
LoadTemplates = atoi(optarg);
dbg_analyze_msg = (LoadTemplates && (1<<1)) != 0;
- dbg_bactrace_template_errors = (LoadTemplates && (1<<2)) != 0;
+ dbg_backtrace_template_errors = (LoadTemplates && (1<<2)) != 0;
break;
case 'Z':
DisableGzip = 1;
if (gethostname
(&server_cookie[strlen(server_cookie)],
200) != 0) {
- lprintf(2, "gethostname: %s\n",
+ syslog(2, "gethostname: %s\n",
strerror(errno));
free(server_cookie);
}
I18nDump = NewStrBufPlain(HKEY("int templatestrings(void)\n{\n"));
I18nDumpFile = optarg;
break;
- case 'R':
- MaxRead = atol(optarg);
- break;
default:
fprintf(stderr, "usage: webcit "
"[-i ip_addr] [-p http_port] "
return 1;
}
+ /* Start the logger */
+ openlog("webcit",
+ ( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ),
+ LOG_DAEMON
+ );
+
if (optind < argc) {
ctdlhost = argv[optind];
if (++optind < argc)
LoadIconDir(static_icon_dir);
/* Tell 'em who's in da house */
- lprintf(1, PACKAGE_STRING "\n");
- lprintf(1, "Copyright (C) 1996-2010 by the Citadel development team.\n"
- "This software is distributed under the terms of the "
- "GNU General Public License.\n\n"
- );
-
-
- /* initialize the International Bright Young Thing */
+ syslog(1, PACKAGE_STRING "\n");
+ syslog(1, "Copyright (C) 1996-2011 by the citadel.org team\n");
+ syslog(1, "\n");
+ syslog(1, "This program is open source software: you can redistribute it and/or\n");
+ syslog(1, "modify it under the terms of the GNU General Public License as published\n");
+ syslog(1, "by the Free Software Foundation, either version 3 of the License, or\n");
+ syslog(1, "(at your option) any later version.\n");
+ syslog(1, "\n");
+ syslog(1, "This program is distributed in the hope that it will be useful,\n");
+ syslog(1, "but WITHOUT ANY WARRANTY; without even the implied warranty of\n");
+ syslog(1, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n");
+ syslog(1, "GNU General Public License for more details.\n");
+ syslog(1, "\n");
+ syslog(1, "You should have received a copy of the GNU General Public License\n");
+ syslog(1, "along with this program. If not, see <http://www.gnu.org/licenses/>.\n");
+ syslog(1, "\n");
+
+
+ /* initialize various subsystems */
initialise_modules();
-
InitTemplateCache();
if (DumpTemplateI18NStrings) {
FILE *fd;
StrBufAppendBufPlain(I18nDump, HKEY("}\n"), 0);
if (StrLength(I18nDump) < 50) {
- lprintf(1, "********************************************************************************\n");
- lprintf(1, "* No strings found in templates! Are you sure they're there? *\n");
- lprintf(1, "********************************************************************************\n");
+ syslog(1, "********************************************************************************\n");
+ syslog(1, "* No strings found in templates! Are you sure they're there? *\n");
+ syslog(1, "********************************************************************************\n");
return -1;
}
fd = fopen(I18nDumpFile, "w");
if (fd == NULL) {
- lprintf(1, "********************************************************************************\n");
- lprintf(1, "* unable to open I18N dumpfile [%s] *\n", I18nDumpFile);
- lprintf(1, "********************************************************************************\n");
+ syslog(1, "********************************************************************************\n");
+ syslog(1, "* unable to open I18N dumpfile [%s] *\n", I18nDumpFile);
+ syslog(1, "********************************************************************************\n");
return -1;
}
rv = fwrite(ChrPtr(I18nDump), 1, StrLength(I18nDump), fd);
* wcsession struct to which the thread is currently bound.
*/
if (pthread_key_create(&MyConKey, NULL) != 0) {
- lprintf(1, "Can't create TSD key: %s\n", strerror(errno));
+ syslog(1, "Can't create TSD key: %s\n", strerror(errno));
}
InitialiseSemaphores ();
*/
#ifdef HAVE_OPENSSL
if (pthread_key_create(&ThreadSSL, NULL) != 0) {
- lprintf(1, "Can't create TSD key: %s\n", strerror(errno));
+ syslog(1, "Can't create TSD key: %s\n", strerror(errno));
}
#endif
*/
if (!IsEmptyStr(uds_listen_path)) {
- lprintf(2, "Attempting to create listener socket at %s...\n", uds_listen_path);
+ syslog(2, "Attempting to create listener socket at %s...\n", uds_listen_path);
msock = webcit_uds_server(uds_listen_path, LISTEN_QUEUE_LENGTH);
}
else {
- lprintf(2, "Attempting to bind to port %d...\n", http_port);
+ syslog(2, "Attempting to bind to port %d...\n", http_port);
msock = webcit_tcp_server(ip_addr, http_port, LISTEN_QUEUE_LENGTH);
}
if (msock < 0)
return -msock;
}
- lprintf(2, "Listening on socket %d\n", msock);
+ syslog(2, "Listening on socket %d\n", msock);
signal(SIGPIPE, SIG_IGN);
pthread_mutex_init(&SessionListMutex, NULL);
projects / citadel.git / blobdiff