SF.net SVN: logwatch:[153]

Revision: 153
          http://sourceforge.net/p/logwatch/code/153
Author:   stefjakobs
Date:     2013-07-30 15:50:32 +0000 (Tue, 30 Jul 2013)
Log Message:
-----------
fix: typo
recognize more warnings

Modified Paths:
--------------
    conf/services/mysql-mmm.conf
    scripts/services/mysql-mmm

Modified: conf/services/mysql-mmm.conf
===================================================================
--- conf/services/mysql-mmm.conf	2013-07-30 15:20:07 UTC (rev 152)
+++ conf/services/mysql-mmm.conf	2013-07-30 15:50:32 UTC (rev 153)
@@ -12,7 +12,7 @@
 # Yes = True  = On  = 1
 # No  = False = Off = 0
 
-Title = "MySQL Mulit-Master Replication Manager"
+Title = "MySQL Multi-Master Replication Manager"
 
 # Which logfile group...
 LogFile = mysql-mmm

Modified: scripts/services/mysql-mmm
===================================================================
--- scripts/services/mysql-mmm	2013-07-30 15:20:07 UTC (rev 152)
+++ scripts/services/mysql-mmm	2013-07-30 15:50:32 UTC (rev 153)
@@ -47,8 +47,12 @@
    ) {
       # ignore
 
-   } elsif ($ThisLine =~ /^FATAL State of host '(\S+)' changed from (\S+) to (\S+)(?: (.*))?/) {
-     $mon_fatal{"State change"}{"$1: $2 -> $3 $4"}++;
+   } elsif ($ThisLine =~ /^FATAL State of host '(\S+)' changed from (\S+) to (\S+)(?: .* for (?:only )?(\d+) seconds)?/) {
+     my $sec = "";
+     if ( $4 > 0 ) {
+        $sec = "(for $4 s)";
+     }
+     $mon_fatal{"State change"}{"$1: $2 -> $3 $sec"}++;
    } elsif ($ThisLine =~ /^FATAL Agent on host '(\S+)' (.*)/) {
      $mon_fatal{"Agent on host"}{"$1: $2"}++;
    } elsif ($ThisLine =~ /^FATAL Can't reach agent on host '(\S+)'/) {
@@ -57,13 +61,16 @@
      $mon_fatal{"$1"}{"$2"}++;
    } elsif ($ThisLine =~ /^FATAL ([^\:]+)(?:: ERROR: (.*))?/) {
      $fatal{"$1"}{"$2"}++;
-   } elsif ($ThisLine =~ /^ERROR Check '(\S+)' on '(\S+)' has (.*)/) {
-     $mon_error{"$2: $1: $3"}++;
+   } elsif ( (my ($srv, $host, $err, $msg) ) = 
+        ($ThisLine =~ /^ERROR Check '(\S+)' on '(\S+)' has (.*) Message: ERROR: ([^(]*)/) ) {
+     $mon_error{"$host: $srv: $err $msg"}++;
    } 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|send offline status notification to) '\S+')/) {
-     $mon_error{"$1"}++;
-   } elsif ( $ThisLine =~ /^WARN (.*)/) {
+   } elsif ($ThisLine =~ /^ERROR (Can't (?:reach agent on host|send offline status notification to)) '(\S+)'/) {
+     $mon_error{"$2: $1"}++;
+   } elsif ( $ThisLine =~ /^WARN (.*) Message: (UNKNOWN:) ([^(]*)/) {
+     $warn{"$2: $1 $3"}++;
+   } elsif ( $ThisLine =~ /^WARN (.*)/ ) {
      $warn{"$1"}++;
    } elsif ( $ThisLine =~ /^INFO (.*)/) {
      $info{"$1"}++;

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


------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent 
caught up. So what steps can you take to put your SQL databases under 
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk