[Logcheck-commits] CVS logcheck/src

CVS User maks-guest logcheck-devel@lists.alioth.debian.org
Thu, 10 Jun 2004 03:24:59 -0600


Update of /cvsroot/logcheck/logcheck/src
In directory haydn:/tmp/cvs-serv3062/src

Modified Files:
	logcheck logtail 
Log Message:

first bits of a minimal testing mode,
that does not change the offset in logtails 'database'.
new planned -l change still needed.


--- /cvsroot/logcheck/logcheck/src/logcheck	2004/06/08 06:59:09	1.58
+++ /cvsroot/logcheck/logcheck/src/logcheck	2004/06/10 09:24:59	1.59
@@ -22,7 +22,7 @@
 # along with Logcheck; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-# $Id: logcheck,v 1.58 2004/06/08 06:59:09 maks-guest Exp $
+# $Id: logcheck,v 1.59 2004/06/10 09:24:59 maks-guest Exp $
 
 
 # Set the umask
@@ -376,7 +376,8 @@
  -R           = adds Reboot: to email subject
  -s           = runlevel "server"
  -S           = overrule default state directory
- -t           = do not remove the TMPDIR 
+ -t	      = testing mode
+ -T           = do not remove the TMPDIR 
  -u           = enable syslog-summary
  -v           = print version
  -w           = runlevel "workstation"
@@ -397,7 +398,7 @@
 	    usage
 	    exit 0
 	    ;;
-	t)
+	T)
 	    debug "Setting NOCLEANUP to 1"
 	    NOCLEANUP=1
 	    ;;
@@ -474,11 +475,10 @@
 	    debug "Setting SYSLOGSUMMARY to 1"
 	    SYSLOGSUMMARY="1"
 	    ;;
-	T)
+	t)
 	    debug "Setting LOGTAIL_OPTS to -t"
 	    LOGTAIL_OPTS=' -t'
 	    debug "setting TESTFILE to $OPTARG"
-	    TESTFILE="$OPTARG"
 	    ;;
 	w)
 	    debug "Setting REPORTLEVEL to workstation"
--- /cvsroot/logcheck/logcheck/src/logtail	2004/05/15 08:28:21	1.5
+++ /cvsroot/logcheck/logcheck/src/logtail	2004/06/10 09:24:59	1.6
@@ -42,9 +42,7 @@
 unless ($offsetfile) {
     # offsetfile not given, use .offset/$logfile in the same directory
     # unless we're in test mode
-    unless($TEST_MODE) {
     $offsetfile = $logfile . '.offset';
-    }
 }
 
 unless (open(LOGFILE, $logfile)) {
@@ -54,7 +52,7 @@
 
 my ($inode, $ino, $offset) = (0, 0, 0);
 
-unless ($TEST_MODE and not $offsetfile) {
+unless (not $offsetfile) {
     if (open(OFFSET, $offsetfile)) {
         $_ = <OFFSET>;
         unless (! defined $_) {