Rebuild for recent changes.

[privoxy.git] / errlog.c

diff --git a/errlog.c b/errlog.c
index 0306242..0e672a7 100644 (file)
--- a/errlog.c
+++ b/errlog.c
@@ -1,4 +1,4 @@
-const char errlog_rcs[] = "$Id: errlog.c,v 1.56 2007/10/14 14:26:56 fabiankeil Exp $";
+const char errlog_rcs[] = "$Id: errlog.c,v 1.60 2007/11/03 19:03:31 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/errlog.c,v $
@@ -33,6 +33,23 @@ const char errlog_rcs[] = "$Id: errlog.c,v 1.56 2007/10/14 14:26:56 fabiankeil E
  *
  * Revisions   :
  *    $Log: errlog.c,v $
+ *    Revision 1.60  2007/11/03 19:03:31  fabiankeil
+ *    - Prevent the Windows GUI from showing the version two times in a row.
+ *    - Stop using the imperative in the "(Re-)Open logfile" message.
+ *    - Ditch the "Switching to daemon mode" message as the detection
+ *      whether or not we're already in daemon mode doesn't actually work.
+ *
+ *    Revision 1.59  2007/11/01 12:50:56  fabiankeil
+ *    Here's looking at you, deadlock.
+ *
+ *    Revision 1.58  2007/10/28 19:04:21  fabiankeil
+ *    Don't mention daemon mode in "Logging disabled" message. Some
+ *    platforms call it differently and it's not really relevant anyway.
+ *
+ *    Revision 1.57  2007/10/27 13:02:26  fabiankeil
+ *    Relocate daemon-mode-related log messages to make sure
+ *    they aren't shown again in case of configuration reloads.
+ *
  *    Revision 1.56  2007/10/14 14:26:56  fabiankeil
  *    Remove the old log_error() version.
  *
@@ -511,15 +528,14 @@ void set_debug_level(int debug_level)
  *********************************************************************/
 void disable_logging(void)
 {
-   lock_logfile();
    if (logfp != NULL)
    {
-      log_error(LOG_LEVEL_INFO,
-         "No logfile configured while in daemon mode. Logging disabled.");
+      log_error(LOG_LEVEL_INFO, "No logfile configured. Logging disabled.");
+      lock_logfile();
       fclose(logfp);
       logfp = NULL;
+      unlock_logfile();
    }
-   unlock_logfile();
 }
 
 
@@ -546,16 +562,10 @@ void init_error_log(const char *prog_name, const char *logfname)
    assert(NULL != logfname);
 
    lock_loginit();
-   lock_logfile();
 
-   if (logfp == stderr)
-   {
-      log_error(LOG_LEVEL_INFO,
-         "Switching to daemon mode. Log messages will be written to: %s", logfname);
-   }
-   else if (logfp != NULL)
+   if (logfp != NULL)
    {
-      log_error(LOG_LEVEL_INFO, "(Re-)Open logfile \'%s\'", logfname ? logfname : "none");
+      log_error(LOG_LEVEL_INFO, "(Re-)Opening logfile \'%s\'", logfname);
    }
 
    /* set the designated log file */
@@ -568,6 +578,7 @@ void init_error_log(const char *prog_name, const char *logfname)
    /* set logging to be completely unbuffered */
    setbuf(fp, NULL);
 
+   lock_logfile();
    if (logfp != NULL)
    {
       fclose(logfp);
@@ -575,7 +586,18 @@ void init_error_log(const char *prog_name, const char *logfname)
    logfp = fp;
    unlock_logfile();
 
+#if !defined(_WIN32)
+   /*
+    * Prevent the Windows GUI from showing the version two
+    * times in a row on startup. It already displayed the show_version()
+    * call from init_log_module() that other systems write to stderr.
+    *
+    * This means mingw32 users will never see the version in their
+    * log file, but I assume they wouldn't look for it there anyway
+    * and simply use the "Help/About Privoxy" menu.
+    */
    show_version(prog_name);
+#endif /* def unix */
 
    unlock_loginit();