SF.net SVN: logwatch:[131] scripts/services

Revision: 131
          http://logwatch.svn.sourceforge.net/logwatch/?rev=131&view=rev
Author:   stefjakobs
Date:     2013-01-28 09:45:37 +0000 (Mon, 28 Jan 2013)
Log Message:
-----------
dovecot: fix regex to remove hostname from logline (wrong behaviour was
introdused with r125) (Thanks: Willy Mann)
mysql-mmm: report additional error message

Revision Links:
--------------
    http://logwatch.svn.sourceforge.net/logwatch/?rev=125&view=rev

Modified Paths:
--------------
    scripts/services/dovecot
    scripts/services/mysql-mmm

Modified: scripts/services/dovecot
===================================================================
--- scripts/services/dovecot	2013-01-10 16:05:45 UTC (rev 130)
+++ scripts/services/dovecot	2013-01-28 09:45:37 UTC (rev 131)
@@ -135,7 +135,7 @@
 while (defined($ThisLine = <STDIN>)) {
      # remove timestamp.  We can't use *RemoveHeaders because we need the
      # service name
-     $ThisLine =~ s/^\w{3} .\d \d\d:\d\d:\d\d //;
+     $ThisLine =~ s/^\w{3} .\d \d\d:\d\d:\d\d (?:[^\s:]* |)//;
      if ( ($ThisLine =~ /(?:ssl-build-param|ssl-params): SSL parameters regeneration completed/) or
           ($ThisLine =~ /ssl-params: Generating SSL parameters/) or
           ($ThisLine =~ /auth-worker/) or

Modified: scripts/services/mysql-mmm
===================================================================
--- scripts/services/mysql-mmm	2013-01-10 16:05:45 UTC (rev 130)
+++ scripts/services/mysql-mmm	2013-01-28 09:45:37 UTC (rev 131)
@@ -61,7 +61,7 @@
      $mon_error{"$2: $1: $3"}++;
    } elsif ($ThisLine =~ /^ERROR The (status of the (?:system|agent on host) '\S+' could not be determined)/) {
      $mon_error{"$1"}++;
-   } elsif ($ThisLine =~ /^ERROR (Can't reach agent on host '\S+')/) {
+   } elsif ($ThisLine =~ /^ERROR (Can't (?:reach agent on host|send offline status notification to) '\S+')/) {
      $mon_error{"$1"}++;
    } elsif ( $ThisLine =~ /^WARN (.*)/) {
      $warn{"$1"}++;

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


------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d