Added support for LOG_LEVEL_FATAL

Renamed LOG_LEVEL_FRC to LOG_LEVEL_FORCE,
and LOG_LEVEL_REF to LOG_LEVEL_RE_FILTER

diff --git a/errlog.c b/errlog.c
index 7ab5275..2c0fddf 100644 (file)
--- a/errlog.c
+++ b/errlog.c
@@ -1,4 +1,4 @@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.1.1.1 2001/05/15 13:58:51 oes Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.2 2001/05/17 22:42:01 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/errlog.c,v $
@@ -33,6 +33,10 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.1.1.1 2001/05/15 13:58:51 oes Exp $
  *
  * Revisions   :
  *    $Log: errlog.c,v $
+ *    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
  *
@@ -63,9 +67,16 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.1.1.1 2001/05/15 13:58:51 oes Exp $
 #include "project.h"
 
 const char errlog_h_rcs[] = ERRLOG_H_VERSION;
+\r
 
-/* LOG_LEVEL_ERROR and LOG_LEVEL_INFO cannot be turned off. FIXME: Why?*/
-#define LOG_LEVEL_MINIMUM  (LOG_LEVEL_ERROR | LOG_LEVEL_INFO)
+/*\r
+ * LOG_LEVEL_FATAL, LOG_LEVEL_ERROR and LOG_LEVEL_INFO\r
+ * cannot be turned off.  (There are some exceptional situations\r
+ * where we need to get a message to the user).\r
+ *\r
+ * FIXME: Do we need LOG_LEVEL_INFO here?\r
+ */
+#define LOG_LEVEL_MINIMUM  (LOG_LEVEL_FATAL | LOG_LEVEL_ERROR | LOG_LEVEL_INFO)
 
 /* where to log (default: stderr) */
 static FILE *logfp = NULL;
@@ -76,6 +87,35 @@ static char * logfilename = NULL;
 /* logging detail level.  */
 static int debug = LOG_LEVEL_MINIMUM;  
 
+static void fatal_error(const char * error_message);\r
+\r
+\r
+/*********************************************************************\r
+ *\r
+ * Function    :  fatal_error\r
+ *\r
+ * Description :  Displays a fatal error to standard error (or, on \r
+ *                a WIN32 GUI, to a dialog box), and exits\r
+ *                JunkBuster with status code 1.\r
+ *\r
+ * Parameters  :\r
+ *          1  :  error_message = The error message to display.\r
+ *\r
+ * Returns     :  Does not return.\r
+ *\r
+ *********************************************************************/\r
+static void fatal_error(const char * error_message)\r
+{\r
+#if defined(_WIN32) && !defined(_WIN_CONSOLE)\r
+   MessageBox(NULL, error_message, "Internet JunkBuster Error", \r
+      MB_OK | MB_ICONERROR | MB_TASKMODAL | MB_SETFOREGROUND | MB_TOPMOST);  \r
+#else /* if !defined(_WIN32) || defined(_WIN_CONSOLE) */\r
+   fputs(error_message, stderr);\r
+#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */\r
+\r
+   exit(1);\r
+}\r
+\r
 
 /*********************************************************************
  *
@@ -111,13 +151,8 @@ void init_error_log(const char *prog_name, const char *logfname, int debuglevel)
    if( logfname )
    {
       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);
+      {\r
+         log_error(LOG_LEVEL_FATAL, "init_errlog(): can't open logfile: %s", logfname);
       }
 
       /* set logging to be completely unbuffered */
@@ -170,9 +205,12 @@ void log_error(int loglevel, char *fmt, ...)
 
    switch (loglevel)
    {
-      case LOG_LEVEL_ERROR:
-         outc = sprintf(outbuf, "IJB(%d) Error: ", this_thread);
-         break;
+      case LOG_LEVEL_ERROR:\r
+         outc = sprintf(outbuf, "IJB(%d) Error: ", this_thread);\r
+         break;\r
+      case LOG_LEVEL_FATAL:\r
+         outc = sprintf(outbuf, "IJB(%d) Fatal error: ", this_thread);\r
+         break;\r
       case LOG_LEVEL_GPC:
          outc = sprintf(outbuf, "IJB(%d) Request: ", this_thread);
          break;
@@ -182,15 +220,15 @@ void log_error(int loglevel, char *fmt, ...)
       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;
-      case LOG_LEVEL_REF:
+      case LOG_LEVEL_INFO:\r
+         outc = sprintf(outbuf, "IJB(%d) Info: ", this_thread);\r
+         break;\r
+      case LOG_LEVEL_RE_FILTER:
          outc = sprintf(outbuf, "IJB(%d) Re-Filter: ", this_thread);
          break;
-      case LOG_LEVEL_FRC:
+      case LOG_LEVEL_FORCE:
          outc = sprintf(outbuf, "IJB(%d) Force: ", this_thread);
-         break;
+         break;\r
       default:
          outc = sprintf(outbuf, "IJB(%d) UNKNOWN LOG TYPE(%d): ", this_thread, loglevel);
          break;
@@ -277,11 +315,8 @@ void log_error(int loglevel, char *fmt, ...)
                }
                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);\r
+               /* Never get here */\r
                break;
             }
             if (outc < BUFSIZ-1) 
@@ -348,11 +383,8 @@ void log_error(int loglevel, char *fmt, ...)
             }
             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);\r
+            /* Never get here */\r
             break;
 
       } /* switch( p ) */
@@ -397,8 +429,14 @@ void log_error(int loglevel, char *fmt, ...)
 
    fputs(outbuf, logfp);
 
+   if (loglevel == LOG_LEVEL_FATAL)\r
+   {\r
+      fatal_error(outbuf);\r
+      /* Never get here */\r
+   }\r
+\r
    /* FIXME RACE HAZARD: should end critical section error_log_use here */
-
+\r
 #if defined(_WIN32) && !defined(_WIN_CONSOLE)
    /* Write to display */
    LogPutString(outbuf);

diff --git a/errlog.h b/errlog.h
index 24ce285..82f8bc5 100644 (file)
--- a/errlog.h
+++ b/errlog.h
@@ -1,9 +1,9 @@
 #ifndef _ERRLOG_H
 #define _ERRLOG_H
-#define ERRLOG_H_VERSION "$Id: errlog.h,v 1.1 2001/05/13 21:57:06 administrator Exp $"
+#define ERRLOG_H_VERSION "$Id: errlog.h,v 1.1.1.1 2001/05/15 13:58:51 oes Exp $"
 /*********************************************************************
  *
- * File        :  $Source: /home/administrator/cvs/ijb/errlog.h,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/errlog.h,v $
  *
  * Purpose     :  Log errors to a designated destination in an elegant,
  *                printf-like fashion.
@@ -35,6 +35,9 @@
  *
  * Revisions   :
  *    $Log: errlog.h,v $
+ *    Revision 1.1.1.1  2001/05/15 13:58:51  oes
+ *    Initial import of version 2.9.3 source tree
+ *
  *
  *********************************************************************/
 \f
@@ -45,19 +48,20 @@ extern "C" {
 
 /* Debug level for errors */
 
-#define LOG_LEVEL_GPC     0x0001
-#define LOG_LEVEL_CONNECT 0x0002
-#define LOG_LEVEL_IO      0x0004
-#define LOG_LEVEL_HEADER  0x0008
-#define LOG_LEVEL_LOG     0x0010
+#define LOG_LEVEL_GPC        0x0001
+#define LOG_LEVEL_CONNECT    0x0002
+#define LOG_LEVEL_IO         0x0004
+#define LOG_LEVEL_HEADER     0x0008
+#define LOG_LEVEL_LOG        0x0010
 #ifdef PCRS
-#define LOG_LEVEL_FRC     0x0020
-#define LOG_LEVEL_REF     0x0040
+#define LOG_LEVEL_FORCE      0x0020
+#define LOG_LEVEL_RE_FILTER  0x0040
 #endif /* def PCRS */
 
 /* Following are always on: */
-#define LOG_LEVEL_ERROR   0x1000
-#define LOG_LEVEL_INFO    0x2000
+#define LOG_LEVEL_INFO    0x1000
+#define LOG_LEVEL_ERROR   0x2000\r
+#define LOG_LEVEL_FATAL   0x4000 /* Exits after writing log */\r
 
 extern void init_error_log(const char *prog_name, const char *logfname, int debuglevel);
 extern void log_error(int loglevel, char *fmt, ...);