SF.net SVN: logwatch:[59] scripts/shared

Revision: 59
          http://logwatch.svn.sourceforge.net/logwatch/?rev=59&view=rev
Author:   stefjakobs
Date:     2011-06-25 17:21:13 +0000 (Sat, 25 Jun 2011)

Log Message:
-----------
fix: One variant startup message that needs correcting, plus two minor
spacing improvements. Patch from John Wilcock
fix: remove date and time from clamav logs
fix: make the timefilter in applystddate configurable

Modified Paths:
--------------
    conf/services/clamav.conf
    scripts/services/dovecot
    scripts/shared/applystddate

Modified: conf/services/clamav.conf
===================================================================
--- conf/services/clamav.conf	2011-06-22 16:06:18 UTC (rev 58)
+++ conf/services/clamav.conf	2011-06-25 17:21:13 UTC (rev 59)
@@ -12,6 +12,8 @@
 
 # If you log to syslog, you probably want...
 LogFile = messages
+
+*applystddate
 *OnlyService = clamd
 
 # If clamd logs to a file directly, you want only...

Modified: scripts/services/dovecot
===================================================================
--- scripts/services/dovecot	2011-06-22 16:06:18 UTC (rev 58)
+++ scripts/services/dovecot	2011-06-25 17:21:13 UTC (rev 59)
@@ -121,7 +121,7 @@
          # We don't care about these
      } elsif ( $ThisLine =~ /Killed with signal /) {
          $End++;
-     } elsif ( $ThisLine =~ /Dovecot (v\d[^ ]* |)starting up$/) {
+     } elsif ( $ThisLine =~ /Dovecot (v\d[^ ]* |)starting up( \(core dumps disabled\))?$/) {
          $Restarts++;
          $End = 0;
      } elsif ( ($User, $Host) = ( $ThisLine =~ /^pop3-login: Login: (.*?) \[(.*)\]/ ) ) {
@@ -261,7 +261,7 @@
 }
 
 if ( ( $Detail >=5 ) and $Restarts ) {
-   print "\nDovecot restarted $Restarts time(s).";
+   print "\nDovecot restarted $Restarts time(s).\n";
 }
 
 if ( ( $Detail >= 5 ) and (keys %Connection)) {
@@ -411,7 +411,7 @@
          print " $UserCount Time(s)";
       }
    }
-   print "\n\nTotal: $LoginCount successful logins";
+   print "\nTotal: $LoginCount successful logins";
 }
 
 if ( ( $Detail >= 10 ) and (keys %SieveLogin)) {

Modified: scripts/shared/applystddate
===================================================================
--- scripts/shared/applystddate	2011-06-22 16:06:18 UTC (rev 58)
+++ scripts/shared/applystddate	2011-06-25 17:21:13 UTC (rev 59)
@@ -22,7 +22,9 @@
 
 my $Debug = $ENV{'LOGWATCH_DEBUG'} || 0;
 
-$SearchDate = TimeFilter('%b %e %H:%M:%S');
+# customize the Timefilter by appending a string:
+# *ApplyStdDate = "%H:%M %d/%m/%Y"
+$SearchDate = TimeFilter($ARGV[0] || '%b %e %H:%M:%S');
 
 # The date might be "Dec 09", but it needs to be "Dec  9"...
 #$SearchDate =~ s/ 0/  /;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a 
definitive record of customers, application performance, security 
threats, fraudulent activity and more. Splunk takes this data and makes 
sense of it. Business sense. IT sense. Common sense.. 
http://p.sf.net/sfu/splunk-d2d-c1