-const char errlog_rcs[] = "$Id: errlog.c,v 1.1 2001/05/13 21:57:06 administrator Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.7 2001/05/26 15:21:28 jongfoster Exp $";
/*********************************************************************
*
- * File : $Source: /home/administrator/cvs/ijb/errlog.c,v $
+ * File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
*
* Purpose : Log errors to a designated destination in an elegant,
* printf-like fashion.
*
* Revisions :
* $Log: errlog.c,v $
+ * Revision 1.7 2001/05/26 15:21:28 jongfoster
+ * Activity animation in Win32 GUI now works even if debug==0
+ *
+ * Revision 1.6 2001/05/25 21:55:08 jongfoster
+ * Now cleans up properly on FATAL (removes taskbar icon etc)
+ *
+ * Revision 1.5 2001/05/22 18:46:04 oes
+ *
+ * - Enabled filtering banners by size rather than URL
+ * by adding patterns that replace all standard banner
+ * sizes with the "Junkbuster" gif to the re_filterfile
+ *
+ * - Enabled filtering WebBugs by providing a pattern
+ * which kills all 1x1 images
+ *
+ * - Added support for PCRE_UNGREEDY behaviour to pcrs,
+ * which is selected by the (nonstandard and therefore
+ * capital) letter 'U' in the option string.
+ * It causes the quantifiers to be ungreedy by default.
+ * Appending a ? turns back to greedy (!).
+ *
+ * - Added a new interceptor ijb-send-banner, which
+ * sends back the "Junkbuster" gif. Without imagelist or
+ * MSIE detection support, or if tinygif = 1, or the
+ * URL isn't recognized as an imageurl, a lame HTML
+ * explanation is sent instead.
+ *
+ * - Added new feature, which permits blocking remote
+ * script redirects and firing back a local redirect
+ * to the browser.
+ * The feature is conditionally compiled, i.e. it
+ * can be disabled with --disable-fast-redirects,
+ * plus it must be activated by a "fast-redirects"
+ * line in the config file, has its own log level
+ * and of course wants to be displayed by show-proxy-args
+ * Note: Boy, all the #ifdefs in 1001 locations and
+ * all the fumbling with configure.in and acconfig.h
+ * were *way* more work than the feature itself :-(
+ *
+ * - Because a generic redirect template was needed for
+ * this, tinygif = 3 now uses the same.
+ *
+ * - Moved GIFs, and other static HTTP response templates
+ * to project.h
+ *
+ * - Some minor fixes
+ *
+ * - Removed some >400 CRs again (Jon, you really worked
+ * a lot! ;-)
+ *
+ * Revision 1.4 2001/05/21 19:32:54 jongfoster
+ * Added another #ifdef _WIN_CONSOLE
+ *
+ * Revision 1.3 2001/05/20 01:11:40 jongfoster
+ * Added support for LOG_LEVEL_FATAL
+ * Renamed LOG_LEVEL_FRC to LOG_LEVEL_FORCE,
+ * and LOG_LEVEL_REF to LOG_LEVEL_RE_FILTER
+ *
+ * Revision 1.2 2001/05/17 22:42:01 oes
+ * - Cleaned CRLF's from the sources and related files
+ * - Repaired logging for REF and FRC
+ *
+ * Revision 1.1.1.1 2001/05/15 13:58:51 oes
+ * Initial import of version 2.9.3 source tree
+ *
*
*********************************************************************/
\f
#ifdef _WIN32
#include <windows.h>
+#ifndef _WIN_CONSOLE
#include "w32log.h"
+#endif /* ndef _WIN_CONSOLE */
#endif /* def _WIN32 */
#include "errlog.h"
const char errlog_h_rcs[] = ERRLOG_H_VERSION;
-/* LOG_LEVEL_ERROR and LOG_LEVEL_INFO cannot be turned off */
-#define LOG_LEVEL_MINIMUM (LOG_LEVEL_ERROR | LOG_LEVEL_INFO)
+
+/*
+ * LOG_LEVEL_FATAL cannot be turned off. (There are
+ * some exceptional situations where we need to get a
+ * message to the user).
+ */
+#define LOG_LEVEL_MINIMUM LOG_LEVEL_FATAL
/* where to log (default: stderr) */
static FILE *logfp = NULL;
static char * logfilename = NULL;
/* logging detail level. */
-static int debug = LOG_LEVEL_MINIMUM;
+static int debug = (LOG_LEVEL_FATAL | LOG_LEVEL_ERROR | LOG_LEVEL_INFO);
+
+static void fatal_error(const char * error_message);
+
+
+/*********************************************************************
+ *
+ * Function : fatal_error
+ *
+ * Description : Displays a fatal error to standard error (or, on
+ * a WIN32 GUI, to a dialog box), and exits
+ * JunkBuster with status code 1.
+ *
+ * Parameters :
+ * 1 : error_message = The error message to display.
+ *
+ * Returns : Does not return.
+ *
+ *********************************************************************/
+static void fatal_error(const char * error_message)
+{
+#if defined(_WIN32) && !defined(_WIN_CONSOLE)
+ MessageBox(g_hwndLogFrame, error_message, "Internet JunkBuster Error",
+ MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST);
+
+ /* Cleanup - remove taskbar icon etc. */
+ TermLogWindow();
+
+#else /* if !defined(_WIN32) || defined(_WIN_CONSOLE) */
+ fputs(error_message, stderr);
+#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */
+
+ exit(1);
+}
/*********************************************************************
{
if( !(fp = fopen(logfname, "a")) )
{
- log_error(LOG_LEVEL_ERROR, "init_errlog(): can't open logfile: %s", logfname);
-#if defined(_WIN32) && ! defined (_WIN_CONSOLE)
- MessageBox(NULL, "init_errlog(): can't open logfile", "Internet JunkBuster Error",
- MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST);
-#endif /* defined(_WIN32) && ! defined (_WIN_CONSOLE) */
- exit(1);
+ log_error(LOG_LEVEL_FATAL, "init_errlog(): can't open logfile: %s", logfname);
}
/* set logging to be completely unbuffered */
int outc = 0;
long this_thread = 1; /* was: pthread_t this_thread;*/
+#if defined(_WIN32) && !defined(_WIN_CONSOLE)
+ /*
+ * Irrespective of debug setting, a GET/POST/CONNECT makes
+ * the taskbar icon animate. (There is an option to disable
+ * this but checking that is handled inside LogShowActivity()).
+ */
+ if (loglevel == LOG_LEVEL_GPC)
+ {
+ LogShowActivity();
+ }
+#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */
+
/* verify if loglevel applies to current settings and bail out if negative */
- if(!(loglevel & debug))
+ if ((loglevel & debug) == 0)
{
return;
}
case LOG_LEVEL_ERROR:
outc = sprintf(outbuf, "IJB(%d) Error: ", this_thread);
break;
+ case LOG_LEVEL_FATAL:
+ outc = sprintf(outbuf, "IJB(%d) Fatal error: ", this_thread);
+ break;
case LOG_LEVEL_GPC:
outc = sprintf(outbuf, "IJB(%d) Request: ", this_thread);
break;
case LOG_LEVEL_CONNECT:
outc = sprintf(outbuf, "IJB(%d) Connect: ", this_thread);
break;
+ case LOG_LEVEL_LOG:
+ outc = sprintf(outbuf, "IJB(%d) Writing: ", this_thread);
+ break;
case LOG_LEVEL_HEADER:
outc = sprintf(outbuf, "IJB(%d) Header: ", this_thread);
break;
case LOG_LEVEL_INFO:
outc = sprintf(outbuf, "IJB(%d) Info: ", this_thread);
break;
+#ifdef PCRS
+ case LOG_LEVEL_RE_FILTER:
+ outc = sprintf(outbuf, "IJB(%d) Re-Filter: ", this_thread);
+ break;
+#endif /* def PCRS */
+#ifdef FORCE_LOAD
+ case LOG_LEVEL_FORCE:
+ outc = sprintf(outbuf, "IJB(%d) Force: ", this_thread);
+ break;
+#endif /* def FORCE_LOAD */
+#ifdef FAST_REDIRECTS
+ case LOG_LEVEL_REDIRECTS:
+ outc = sprintf(outbuf, "IJB(%d) Redirect: ", this_thread);
+ break;
+#endif /* def FAST_REDIRECTS */
+ case LOG_LEVEL_CLF:
+ outc = 0;
+ outbuf[0] = '\0';
+ break;
default:
outc = sprintf(outbuf, "IJB(%d) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel);
break;
}
fputs(outbuf, logfp);
/* FIXME RACE HAZARD: should end critical section error_log_use here */
-#if defined(_WIN32) && ! defined (_WIN_CONSOLE)
- MessageBox(NULL, outbuf, "Internet JunkBuster Error",
- MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST);
-#endif /* defined(_WIN32) && ! defined (_WIN_CONSOLE) */
- exit(1);
+ fatal_error(outbuf);
+ /* Never get here */
break;
}
if (outc < BUFSIZ-1)
outbuf[oldoutc] = '\0';
}
break;
+ case 'N':
+ /* Non-standard: Print a counted string. Takes 2 parameters:
+ * int length, const char * string
+ */
+ ival = va_arg( ap, int );
+ sval = va_arg( ap, char * );
+ if (ival < 0)
+ {
+ ival = 0;
+ }
+ oldoutc = outc;
+ outc += ival;
+ if (outc < BUFSIZ-1)
+ {
+ memcpy(outbuf + oldoutc, sval, ival);
+ }
+ else
+ {
+ outbuf[oldoutc] = '\0';
+ }
+ break;
case 'E':
/* Non-standard: Print error code from errno */
ival = errno;
outbuf[oldoutc] = '\0';
}
break;
+ case 'T':
+ /* Non-standard: Print a Common Log File timestamp */
+ {
+ /*
+ * Write timestamp into tempbuf.
+ *
+ * Complex because not all OSs have tm_gmtoff or
+ * the %z field in strftime()
+ */
+ time_t now;
+ struct tm *tm_now;
+ struct tm gmt;
+ int days, hrs, mins;
+ time (&now);
+ gmt = *gmtime (&now);
+ tm_now = localtime (&now);
+ days = tm_now->tm_yday - gmt.tm_yday;
+ hrs = ((days < -1 ? 24 : 1 < days ? -24 : days * 24) + tm_now->tm_hour - gmt.tm_hour);
+ mins = hrs * 60 + tm_now->tm_min - gmt.tm_min;
+ strftime (tempbuf, BUFSIZ-6, "%d/%b/%Y:%H:%M:%S ", tm_now);
+ sprintf (tempbuf + strlen(tempbuf), "%+03d%02d", mins / 60, abs(mins) % 60);
+ }
+ oldoutc = outc;
+ outc += strlen(tempbuf);
+ if (outc < BUFSIZ-1)
+ {
+ strcpy(outbuf + oldoutc, tempbuf);
+ }
+ else
+ {
+ outbuf[oldoutc] = '\0';
+ }
+ break;
default:
sprintf(outbuf, "IJB(%d) Error: log_error(): Bad format string:\n"
"Format = \"%s\"\n"
}
fputs(outbuf, logfp);
/* FIXME RACE HAZARD: should end critical section error_log_use here */
-#if defined(_WIN32) && ! defined (_WIN_CONSOLE)
- MessageBox(NULL, outbuf, "Internet JunkBuster Error",
- MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST);
-#endif /* defined(_WIN32) && ! defined (_WIN_CONSOLE) */
- exit(1);
+ fatal_error(outbuf);
+ /* Never get here */
break;
} /* switch( p ) */
fputs(outbuf, logfp);
+ if (loglevel == LOG_LEVEL_FATAL)
+ {
+ fatal_error(outbuf);
+ /* Never get here */
+ }
+
/* FIXME RACE HAZARD: should end critical section error_log_use here */
#if defined(_WIN32) && !defined(_WIN_CONSOLE)
/* Write to display */
LogPutString(outbuf);
- LogShowActivity();
#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */
}
projects / privoxy.git / blobdiff