-const char errlog_rcs[] = "$Id: errlog.c,v 1.14 2001/07/19 19:03:48 haroon Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.19 2001/09/13 20:08:06 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
*
* Revisions :
* $Log: errlog.c,v $
+ * Revision 1.19 2001/09/13 20:08:06 jongfoster
+ * Adding support for LOG_LEVEL_CGI
+ *
+ * Revision 1.18 2001/09/10 11:27:24 oes
+ * Declaration of w32_socket_strerr now conditional
+ *
+ * Revision 1.17 2001/09/10 10:17:13 oes
+ * Removed unused variable; Fixed sprintf format
+ *
+ * Revision 1.16 2001/07/30 22:08:36 jongfoster
+ * Tidying up #defines:
+ * - All feature #defines are now of the form FEATURE_xxx
+ * - Permanently turned off WIN_GUI_EDIT
+ * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS
+ *
+ * Revision 1.15 2001/07/29 17:41:10 jongfoster
+ * Now prints thread ID for each message (pthreads only)
+ *
* Revision 1.14 2001/07/19 19:03:48 haroon
* - Added case for LOG_LEVEL_POPUPS
*
/* where to log (default: stderr) */
static FILE *logfp = NULL;
-/* where to log (NULL == stderr) */
-static char * logfilename = NULL;
-
/* logging detail level. */
static int debug = (LOG_LEVEL_FATAL | LOG_LEVEL_ERROR | LOG_LEVEL_INFO);
/* static functions */
static void fatal_error(const char * error_message);
-static char * w32_socket_strerr(int errcode, char * tmp_buf);
-
+#ifdef _WIN32
+static char *w32_socket_strerr(int errcode, char *tmp_buf);
+#endif
/*********************************************************************
*
switch (loglevel)
{
case LOG_LEVEL_ERROR:
- outc = sprintf(outbuf, "IJB(%d) Error: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Error: ", this_thread);
break;
case LOG_LEVEL_FATAL:
- outc = sprintf(outbuf, "IJB(%d) Fatal error: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Fatal error: ", this_thread);
break;
case LOG_LEVEL_GPC:
- outc = sprintf(outbuf, "IJB(%d) Request: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Request: ", this_thread);
break;
case LOG_LEVEL_CONNECT:
- outc = sprintf(outbuf, "IJB(%d) Connect: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Connect: ", this_thread);
break;
case LOG_LEVEL_LOG:
- outc = sprintf(outbuf, "IJB(%d) Writing: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Writing: ", this_thread);
break;
case LOG_LEVEL_HEADER:
- outc = sprintf(outbuf, "IJB(%d) Header: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Header: ", this_thread);
break;
case LOG_LEVEL_INFO:
- outc = sprintf(outbuf, "IJB(%d) Info: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Info: ", this_thread);
break;
case LOG_LEVEL_RE_FILTER:
- outc = sprintf(outbuf, "IJB(%d) Re-Filter: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Re-Filter: ", this_thread);
break;
-#ifdef FORCE_LOAD
+#ifdef FEATURE_FORCE_LOAD
case LOG_LEVEL_FORCE:
- outc = sprintf(outbuf, "IJB(%d) Force: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Force: ", this_thread);
break;
-#endif /* def FORCE_LOAD */
-#ifdef FAST_REDIRECTS
+#endif /* def FEATURE_FORCE_LOAD */
+#ifdef FEATURE_FAST_REDIRECTS
case LOG_LEVEL_REDIRECTS:
- outc = sprintf(outbuf, "IJB(%d) Redirect: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Redirect: ", this_thread);
break;
-#endif /* def FAST_REDIRECTS */
+#endif /* def FEATURE_FAST_REDIRECTS */
case LOG_LEVEL_DEANIMATE:
- outc = sprintf(outbuf, "IJB(%d) Gif-Deanimate: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Gif-Deanimate: ", this_thread);
break;
case LOG_LEVEL_CLF:
outc = 0;
outbuf[0] = '\0';
break;
-#ifdef KILLPOPUPS
+#ifdef FEATURE_KILL_POPUPS
case LOG_LEVEL_POPUPS:
- outc = sprintf(outbuf, "IJB(%d) Kill-Popups: ", this_thread);
+ outc = sprintf(outbuf, "IJB(%ld) Kill-Popups: ", this_thread);
+ break;
+#endif /* def FEATURE_KILL_POPUPS */
+ case LOG_LEVEL_CGI:
+ outc = sprintf(outbuf, "IJB(%ld) CGI: ", this_thread);
break;
-#endif /* def KILLPOPUPS */
default:
- outc = sprintf(outbuf, "IJB(%d) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel);
+ outc = sprintf(outbuf, "IJB(%ld) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel);
break;
}
else
{
/* Error */
- sprintf(outbuf, "IJB(%d) Error: log_error(): Bad format string:\n"
+ sprintf(outbuf, "IJB(%ld) Error: log_error(): Bad format string:\n"
"Format = \"%s\"\n"
"Exiting.", this_thread, fmt);
/* FIXME RACE HAZARD: should start critical section error_log_use here */
}
break;
default:
- sprintf(outbuf, "IJB(%d) Error: log_error(): Bad format string:\n"
+ sprintf(outbuf, "IJB(%ld) Error: log_error(): Bad format string:\n"
"Format = \"%s\"\n"
"Exiting.", this_thread, fmt);
/* FIXME RACE HAZARD: should start critical section error_log_use here */
* tmp_buf.
*
*********************************************************************/
-static char * w32_socket_strerr(int errcode, char * tmp_buf)
+static char *w32_socket_strerr(int errcode, char *tmp_buf)
{
#define TEXT_FOR_ERROR(code,text) \
if (errcode == code) \