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

Top Page
Delete this message
Reply to this message
Author: Philip Hazel
Date:  
To: exim-cvs
Subject: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog NewStuff exim/exim-src ACKNOWLEDGMENTS exim/exim-src/src exicyclog.src
ph10 2006/03/16 11:51:10 GMT

  Modified files:
    exim-doc/doc-txt     ChangeLog NewStuff 
    exim-src             ACKNOWLEDGMENTS 
    exim-src/src         exicyclog.src 
  Log:
  Add -k and -l to exicyclog.


  Revision  Changes    Path
  1.329     +2 -0      exim/exim-doc/doc-txt/ChangeLog
  1.97      +9 -0      exim/exim-doc/doc-txt/NewStuff
  1.43      +2 -1      exim/exim-src/ACKNOWLEDGMENTS
  1.5       +35 -9     exim/exim-src/src/exicyclog.src


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.328
  retrieving revision 1.329
  diff -u -r1.328 -r1.329
  --- ChangeLog    16 Mar 2006 11:14:46 -0000    1.328
  +++ ChangeLog    16 Mar 2006 11:51:09 -0000    1.329
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.328 2006/03/16 11:14:46 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.329 2006/03/16 11:51:09 ph10 Exp $


Change log file for Exim from version 4.21
-------------------------------------------
@@ -305,6 +305,8 @@

   PH/60 When a VRFY deferred or FAILED, the log message rather than the user
         message was being sent as an SMTP response.
  +
  +PH/61 Add -l and -k options to exicyclog.



Exim version 4.60

  Index: NewStuff
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
  retrieving revision 1.96
  retrieving revision 1.97
  diff -u -r1.96 -r1.97
  --- NewStuff    9 Mar 2006 15:10:16 -0000    1.96
  +++ NewStuff    16 Mar 2006 11:51:09 -0000    1.97
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.96 2006/03/09 15:10:16 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.97 2006/03/16 11:51:09 ph10 Exp $


New Features in Exim
--------------------
@@ -183,6 +183,15 @@

         Note that a 5xx response to STARTTLS is a permanent error.


  +PH/20 There are now two options for the exicyclog script:
  +
  +      -k <days> specifies the number of old logs to keep, overriding the
  +                default that is set when Exim is built.
  +
  +      -l <path> specifies the log file path, in the same format as the
  +                log_file_path option (e.g. /var/log/exim_%slog), again,
  +                overriding the script's default - which is to find the setting
  +                from Exim's configuration.



Version 4.60

  Index: ACKNOWLEDGMENTS
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- ACKNOWLEDGMENTS    23 Feb 2006 12:41:22 -0000    1.42
  +++ ACKNOWLEDGMENTS    16 Mar 2006 11:51:09 -0000    1.43
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.42 2006/02/23 12:41:22 ph10 Exp $
  +$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.43 2006/03/16 11:51:09 ph10 Exp $


EXIM ACKNOWLEDGEMENTS

@@ -20,7 +20,7 @@
Philip Hazel

Lists created: 20 November 2002
-Last updated: 23 February 2006
+Last updated: 16 March 2006


   THE OLD LIST
  @@ -244,6 +244,7 @@
                               PostgreSQL functionality
                             Patch for hosts_avoid_esmtp
   Stephen Wilcox            Patch for ignore_enotdir problem
  +Alain Williams            Suggested patch for exicyclog options
   David Woodhouse           SQLite support proof of concept code
                             control=freeze/no_tell basic code



  Index: exicyclog.src
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/exicyclog.src,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- exicyclog.src    16 Jun 2005 15:48:58 -0000    1.4
  +++ exicyclog.src    16 Mar 2006 11:51:10 -0000    1.5
  @@ -1,9 +1,13 @@
   #! /bin/sh
  -# $Cambridge: exim/exim-src/src/exicyclog.src,v 1.4 2005/06/16 15:48:58 ph10 Exp $
  +# $Cambridge: exim/exim-src/src/exicyclog.src,v 1.5 2006/03/16 11:51:10 ph10 Exp $


-# Copyright (c) 2004 University of Cambridge.
+# Copyright (c) 2006 University of Cambridge.
# See the file NOTICE for conditions of use and distribution.

  +# This script takes the following command line arguments:
  +# -l dir    Log file directory
  +# -k days    Number of days to keep the log files
  +
   # Except when they appear in comments, the following placeholders in this
   # source are replaced when it is turned into a runnable script:
   #
  @@ -38,9 +42,10 @@
   # this source is built into a script, but you can subsequently edit them
   # without rebuilding things, as long are you are careful not to overwrite
   # the script in the next Exim rebuild/install. "Keep" is the number of old log
  -# files that are required to be kept. "Compress" and "suffix" define your
  -# chosen compression method. The others are provided because the location
  -# of certain commands varies from OS to OS. Sigh.
  +# files that are required to be kept. Its value can be overridden by the -k
  +# command line option. "Compress" and "suffix" define your chosen compression
  +# method. The others are provided because the location of certain commands
  +# varies from OS to OS. Sigh.


keep=EXICYCLOG_MAX
compress=COMPRESS_COMMAND
@@ -54,6 +59,23 @@
# End of editable lines
#########################################################################

  +# Sort out command line options.
  +
  +while [ $# -gt 0 ] ; do
  +  case "$1" in
  +  -l) log_file_path=$2
  +      shift
  +      ;;
  +  -k) keep=$2
  +      shift
  +      ;;
  +   *) echo "** exicyclog: unknown option $1"
  +      exit 1
  +      ;;
  +   esac
  +   shift
  +done
  +
   # Some operating systems have different versions in which the commands live
   # in different places. We have a fudge that will search the usual suspects if
   # requested.
  @@ -112,16 +134,20 @@
   # Determine if the log file path is set, and where the spool directory is.
   # Search for an exim_path setting in the configure file; otherwise use the bin
   # directory. Call that version of Exim to find the spool directory and log file
  -# path. BEWARE: a tab character is needed in the command below. It has had a
  -# nasty tendency to get lost in the past. Use a variable to hold a space and a
  -# tab to keep the tab in one place.
  +# path, unless log_file_path was set above by a command line option. BEWARE: a
  +# tab character is needed in the command below. It has had a nasty tendency to
  +# get lost in the past. Use a variable to hold a space and a tab to keep the
  +# tab in one place.


   st='     '
   exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
   if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi


spool_directory=`$exim_path -C $config -bP spool_directory | sed 's/.*=[ ]*//'`
-log_file_path=`$exim_path -C $config -bP log_file_path | sed 's/.*=[ ]*//'`
+
+if [ "$log_file_path" = "" ] ; then
+ log_file_path=`$exim_path -C $config -bP log_file_path | sed 's/.*=[ ]*//'`
+fi

# If log_file_path contains only "syslog" then no Exim log files are in use.
# We can't cycle anything. Complain and give up.
@@ -166,7 +192,7 @@

# Get into the log directory to do the business.

-cd $logdir
+cd $logdir || exit 1

# If there is no main log file, do nothing.