[exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim…

Page principale
Supprimer ce message
Répondre à ce message
Auteur: Philip Hazel
Date:  
À: exim-cvs
Sujet: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/exim-src/src log.c
ph10 2006/02/13 11:28:56 GMT

  Modified files:
    exim-doc/doc-txt     ChangeLog 
    exim-src/src         log.c 
  Log:
  Do not write to syslog when running in the test harness.


  Revision  Changes    Path
  1.293     +4 -0      exim/exim-doc/doc-txt/ChangeLog
  1.9       +5 -1      exim/exim-src/src/log.c


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.292
  retrieving revision 1.293
  diff -u -r1.292 -r1.293
  --- ChangeLog    13 Feb 2006 11:13:37 -0000    1.292
  +++ ChangeLog    13 Feb 2006 11:28:56 -0000    1.293
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.292 2006/02/13 11:13:37 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.293 2006/02/13 11:28:56 ph10 Exp $


   Change log file for Exim from version 4.21
   -------------------------------------------
  @@ -136,6 +136,10 @@
   PH/24 An host item such as 1.2.3.4/abc was being treated as the IP address
         1.2.3.4 without a mask. Now it is not recognized as an IP address, and
         PH/23 above applies.
  +
  +PH/25 Do not write to syslog when running in the test harness. The only
  +      occasion when this arises is a failure to open the main or panic logs
  +      (for which there is an explicit test).





  Index: log.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/log.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- log.c    7 Feb 2006 11:19:00 -0000    1.8
  +++ log.c    13 Feb 2006 11:28:56 -0000    1.9
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/log.c,v 1.8 2006/02/07 11:19:00 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/log.c,v 1.9 2006/02/13 11:28:56 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -57,7 +57,9 @@


/* The given string is split into sections according to length, or at embedded
newlines, and syslogged as a numbered sequence if it is overlong or if there is
-more than one line.
+more than one line. However, if we are running in the test harness, do not do
+anything. (The test harness doesn't use syslog - for obvious reasons - but we
+can get here if there is a failure to open the panic log.)

   Arguments:
     priority       syslog priority
  @@ -71,6 +73,8 @@
   {
   int len, pass;
   int linecount = 0;
  +
  +if (running_in_test_harness) return;


if (!syslog_timestamp) s += log_timezone? 26 : 20;