-const char errlog_rcs[] = "$Id: errlog.c,v 1.108 2010/07/26 11:28:11 fabiankeil Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.121 2014/06/03 10:24:00 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/errlog.c,v $
* Purpose : Log errors to a designated destination in an elegant,
* printf-like fashion.
*
- * Copyright : Written by and Copyright (C) 2001-2010 the
+ * Copyright : Written by and Copyright (C) 2001-2014 the
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
- * by and Copyright (C) 1997 Anonymous Coders and
+ * by and Copyright (C) 1997 Anonymous Coders and
* Junkbusters Corporation. http://www.junkbusters.com
*
- * This program is free software; you can redistribute it
+ * This program is free software; you can redistribute it
* and/or modify it under the terms of the GNU General
* Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at
#include "errlog.h"
#include "project.h"
#include "jcc.h"
+#ifdef FEATURE_EXTERNAL_FILTERS
+#include "jbsockets.h"
+#endif
const char errlog_h_rcs[] = ERRLOG_H_VERSION;
#else /* ! MUTEX_LOCKS_AVAILABLE */
/*
* FIXME we need a cross-platform locking mechanism.
- * The locking/unlocking functions below should be
+ * The locking/unlocking functions below should be
* fleshed out for non-pthread implementations.
- */
+ */
static inline void lock_logfile() {}
static inline void unlock_logfile() {}
static inline void lock_loginit() {}
*
* Function : fatal_error
*
- * Description : Displays a fatal error to standard error (or, on
+ * Description : Displays a fatal error to standard error (or, on
* a WIN32 GUI, to a dialog box), and exits Privoxy
* with status code 1.
*
*********************************************************************/
static void fatal_error(const char *error_message)
{
-#if defined(_WIN32) && !defined(_WIN_CONSOLE)
- /* Skip timestamp and thread id for the message box. */
- const char *box_message = strstr(error_message, "Fatal error");
- if (NULL == box_message)
+ if (logfp != NULL)
{
- /* Shouldn't happen but ... */
- box_message = error_message;
+ fputs(error_message, logfp);
}
- MessageBox(g_hwndLogFrame, box_message, "Privoxy Error",
- MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST);
- /* Cleanup - remove taskbar icon etc. */
- TermLogWindow();
-#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */
-
- if (logfp != NULL)
+#if defined(_WIN32) && !defined(_WIN_CONSOLE)
{
- fputs(error_message, logfp);
+ /* Skip timestamp and thread id for the message box. */
+ const char *box_message = strstr(error_message, "Fatal error");
+ if (NULL == box_message)
+ {
+ /* Shouldn't happen but ... */
+ box_message = error_message;
+ }
+ MessageBox(g_hwndLogFrame, box_message, "Privoxy Error",
+ MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST);
+
+ /* Cleanup - remove taskbar icon etc. */
+ TermLogWindow();
}
+#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */
#if defined(unix)
if (pidfile)
* XXX: we should only use the LOG_LEVEL_MINIMUM
* until the first time the configuration file has
* been parsed.
- *
+ *
* Parameters : 1: debug_level = The debug level to set.
*
* Returns : Nothing.
}
+/*********************************************************************
+ *
+ * Function : debug_level_is_enabled
+ *
+ * Description : Checks if a certain debug level is enabled.
+ *
+ * Parameters : 1: debug_level = The debug level to check.
+ *
+ * Returns : Nothing.
+ *
+ *********************************************************************/
+int debug_level_is_enabled(int debug_level)
+{
+ return (0 != (debug & debug_level));
+}
+
+
/*********************************************************************
*
* Function : disable_logging
*
* Description : Disables logging.
- *
+ *
* Parameters : None.
*
* Returns : Nothing.
log_error(LOG_LEVEL_FATAL, "init_error_log(): can't open logfile: \'%s\'", logfname);
}
+#ifdef FEATURE_EXTERNAL_FILTERS
+ mark_socket_for_close_on_execute(3);
+#endif
+
/* set logging to be completely unbuffered */
setbuf(fp, NULL);
* Description : Returns a number that is different for each thread.
*
* XXX: Should be moved elsewhere (miscutil.c?)
- *
+ *
* Parameters : None
*
* Returns : thread_id
*********************************************************************/
static long get_thread_id(void)
{
- long this_thread = 1; /* was: pthread_t this_thread;*/
+ long this_thread;
#ifdef __OS2__
PTIB ptib;
ulrc = DosGetInfoBlocks(&ptib, NULL);
if (ulrc == 0)
this_thread = ptib -> tib_ptib2 -> tib2_ultid;
+#else
+ /* Forking instead of threading. */
+ this_thread = 1;
#endif /* def FEATURE_PTHREAD */
return this_thread;
static inline size_t get_log_timestamp(char *buffer, size_t buffer_size)
{
size_t length;
- time_t now;
+ time_t now;
struct tm tm_now;
struct timeval tv_now; /* XXX: stupid name */
long msecs;
tm_now = *localtime_r(&now, &tm_now);
#elif defined(MUTEX_LOCKS_AVAILABLE)
privoxy_mutex_lock(&localtime_mutex);
- tm_now = *localtime(&now);
+ tm_now = *localtime(&now);
privoxy_mutex_unlock(&localtime_mutex);
#else
- tm_now = *localtime(&now);
+ tm_now = *localtime(&now);
#endif
- length = strftime(buffer, buffer_size, "%b %d %H:%M:%S", &tm_now);
+ length = strftime(buffer, buffer_size, "%Y-%m-%d %H:%M:%S", &tm_now);
if (length > (size_t)0)
{
- msecs_length = snprintf(buffer+length, buffer_size - length, ".%.3ld", msecs);
+ msecs_length = snprintf(buffer+length, buffer_size - length, ".%.3ld", msecs);
}
if (msecs_length > 0)
{
* the %z field in strftime()
*/
time_t now;
- struct tm *tm_now;
+ struct tm *tm_now;
struct tm gmt;
#ifdef HAVE_LOCALTIME_R
struct tm dummy;
size_t length;
int tz_length = 0;
- time (&now);
+ time (&now);
#ifdef HAVE_GMTIME_R
gmt = *gmtime_r(&now, &gmt);
#elif defined(MUTEX_LOCKS_AVAILABLE)
tm_now = localtime_r(&now, &dummy);
#elif defined(MUTEX_LOCKS_AVAILABLE)
privoxy_mutex_lock(&localtime_mutex);
- tm_now = localtime(&now);
+ tm_now = localtime(&now);
privoxy_mutex_unlock(&localtime_mutex);
#else
- tm_now = localtime(&now);
+ tm_now = localtime(&now);
#endif
- 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;
+ 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;
length = strftime(buffer, buffer_size, "%d/%b/%Y:%H:%M:%S ", tm_now);
*
* Description : Translates a numerical loglevel into a string.
*
- * Parameters :
+ * Parameters :
* 1 : loglevel = LOG_LEVEL_FOO
*
* Returns : Log level string.
case LOG_LEVEL_CGI:
log_level_string = "CGI";
break;
+ case LOG_LEVEL_ACTIONS:
+ log_level_string = "Actions";
+ break;
default:
log_level_string = "Unknown log level";
break;
}
+#define LOG_BUFFER_SIZE BUFFER_SIZE
/*********************************************************************
*
* Function : log_error
va_list ap;
char *outbuf = NULL;
static char *outbuf_save = NULL;
- char tempbuf[BUFFER_SIZE];
+ char tempbuf[LOG_BUFFER_SIZE];
size_t length = 0;
const char * src = fmt;
long thread_id;
* why else do we allocate instead of using
* an array?
*/
- size_t log_buffer_size = BUFFER_SIZE;
+ size_t log_buffer_size = LOG_BUFFER_SIZE;
#if defined(_WIN32) && !defined(_WIN_CONSOLE)
/*
/* protect the whole function because of the static buffer (outbuf) */
lock_logfile();
- if (NULL == outbuf_save)
+ if (NULL == outbuf_save)
{
outbuf_save = (char*)zalloc(log_buffer_size + 1); /* +1 for paranoia */
if (NULL == outbuf_save)
tempbuf[1] = '\0';
break;
case 'd':
- ival = va_arg( ap, int );
+ ival = va_arg(ap, int);
snprintf(tempbuf, sizeof(tempbuf), "%d", ival);
break;
case 'u':
- uval = va_arg( ap, unsigned );
+ uval = va_arg(ap, unsigned);
snprintf(tempbuf, sizeof(tempbuf), "%u", uval);
break;
case 'l':
ch = *src++;
if (ch == 'd')
{
- lval = va_arg( ap, long );
+ lval = va_arg(ap, long);
snprintf(tempbuf, sizeof(tempbuf), "%ld", lval);
}
else if (ch == 'u')
{
- ulval = va_arg( ap, unsigned long );
+ ulval = va_arg(ap, unsigned long);
snprintf(tempbuf, sizeof(tempbuf), "%lu", ulval);
}
else if ((ch == 'l') && (*src == 'u'))
else
{
int ret = snprintf(outbuf + length,
- log_buffer_size - length - 2, "\\x%.2x", (int)*sval);
+ log_buffer_size - length - 2, "\\x%.2x", (unsigned char)*sval);
assert(ret == 4);
length += 4;
}
format_string = strerror(ival);
}
#else /* ifndef _WIN32 */
- ival = errno;
+ ival = errno;
#ifdef HAVE_STRERROR
format_string = strerror(ival);
#else /* ifndef HAVE_STRERROR */
return "File has been modified outside of the CGI actions editor.";
case JB_ERR_COMPRESS:
return "(De)compression failure";
- default:
- assert(0);
- return "Unknown error";
}
assert(0);
return "Internal error";
projects / privoxy.git / blobdiff