4 patches from the debian package

Willi Mann <[email protected]>
Newsgroups gmane.comp.log.logwatch.devel
Message-ID <[email protected]>
Hi,

There are 4 patches from the current debian package that I think would
be worth applying:

Support nginx logfiles in httpd:

http://patch-tracker.debian.org/patch/series/view/logwatch/7.4.0+svn20131108rev175-1/0004-Bug-624271-Add-nginx-log-file-location-to-httpd.patch

Cope with another time format in PHP logs:

http://patch-tracker.debian.org/patch/series/view/logwatch/7.4.0+svn20131108rev175-1/0005-s-s-php-Accept-time-format-with-specification-of-tim.patch

Recognize more test types from smartd logs:

this patch is attached as I extended it as compared to the current
version of the patch in the Debian unstable package: I added support for
yet another test type (selective self-test), so all test types that
might be reported by current smartmontools should be reported
(cross-checked with smartmontools sources)

Fix documentation of --logdir parameter:

http://patch-tracker.debian.org/patch/series/view/logwatch/7.4.0+svn20131108rev175-1/0007-man-page-Fix-documentation-of-logdir-parameter.patch

thanks
Willi

------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk

_______________________________________________
Logwatch-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/logwatch-devel
0006-smartd-Add-Support-for-parsing-additional-test-types.patch (text/x-diff, 2.1 KB)
From: Willi Mann <[email protected]>
Date: Thu, 28 Nov 2013 19:49:40 +0100
Subject: smartd: Add Support for parsing additional test types

Version 2 of this patch: Also support Selective Self-Test

Bug: http://bugs.debian.org/636322
---
 scripts/services/smartd | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/services/smartd b/scripts/services/smartd
index 7c79c6a..d6c5858 100755
--- a/scripts/services/smartd
+++ b/scripts/services/smartd
@@ -54,7 +54,7 @@ my $StartupFailed = 0;
 my %NotInDatabase = ();
 my %CantMonitor = ();
 my $UnableToMonitor = 0;
-my %SelfTest = ();
+my %DriveTest = ();
 my %Failed = ();
 my %OtherList = ();
 my $DLine = 0;
@@ -162,8 +162,8 @@ while (defined(my $ThisLine = <STDIN>)) {
    } elsif ( my ($Device, $Num) = ($ThisLine =~ /^Device: ([^,]+), (\d+) Offline uncorrectable sectors/) ) {
       $Offsectors{$Device}++;
       $NumOffsectors{$Device} = $Num;
-   } elsif ( my ($Device,$TestType) = ($ThisLine =~ /^Device: ([^,]+), starting scheduled (Short|Long) Self-Test/) ) {
-      $SelfTest{$Device}{$TestType}++;
+   } elsif ( my ($Device,$TestType) = ($ThisLine =~ /^Device: ([^,]+), starting scheduled ((?:Short|Long|Conveyance|Selective) Self-|Offline Immediate )Test/) ) {
+      $DriveTest{$Device}{$TestType}++;
    } elsif ( my ($Device,$AttribType,$Code,$Name) = ($ThisLine =~ /^Device: ([^,]+), Failed SMART ([A-Za-z]+) Attribute: ([0-9]+) ([A-Za-z_]+)/)) {
       $Failed{$Device}{"$AttribType attribute: $Name ($Code)"}++;
    } elsif ( my ($Device, $Text) = ($ThisLine =~ /^Device: ([^,]+), failed (.*)$/) ) {
@@ -313,11 +313,11 @@ if (keys %Failed) {
    }
 }
 
-if (keys %SelfTest) {
-   foreach my $Device (sort keys %SelfTest) {
+if (keys %DriveTest) {
+   foreach my $Device (sort keys %DriveTest) {
       print "\n$Device :\n";
-      foreach my $Type (sort keys %{$SelfTest{$Device}}) {
-         print "   started scheduled $Type self-test " . $SelfTest{$Device}{$Type} . " Time(s)\n";
+      foreach my $Type (sort keys %{$DriveTest{$Device}}) {
+         print "   started scheduled ${Type}Test " . $DriveTest{$Device}{$Type} . " Time(s)\n";
       }
    }
 }
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.