[Devmon-devel] SF.net SVN: devmon:[251] trunk/modules/dm_tests.pm

[<buc...@us...>]

Revision: 251
          http://sourceforge.net/p/devmon/code/251
Author:   buchanmilne
Date:     2015-06-02 15:28:36 +0000 (Tue, 02 Jun 2015)
Log Message:
-----------
Dont add ignored repeaters to the 'Alarming on' message

Modified Paths:
--------------
    trunk/modules/dm_tests.pm

Modified: trunk/modules/dm_tests.pm
===================================================================
--- trunk/modules/dm_tests.pm	2015-06-02 15:13:49 UTC (rev 250)
+++ trunk/modules/dm_tests.pm	2015-06-02 15:28:36 UTC (rev 251)
@@ -1983,6 +1983,7 @@
         T_LEAF: for my $leaf (@table_leaves) {
 
           my $row_data = $line;
+	  my $alarm_int;
 
          # Do some alarm logic
           my $pri_val = $oids->{$pri}{'val'}{$leaf};
@@ -2047,12 +2048,10 @@
               }
               
              # If this is our primary oid, and we are have an alarm
-             # variable defined, add this to our alarm header if we are
-             # alarming on it; Wrap our header at 60 chars
-              if(!defined $t_opts{'noalarmsmsg'} and $alarm) {
-                $alarm_ints =~ s/(.{60,}),$/$1)\nAlarming on (/; 
-                $alarm_ints .= "$val,";
-              }
+             # variable defined, save it so we can add it later
+                $alarm_int = $val;
+	     #
+	     #
             }
 
            # See if we have a valid flag, if so, replace the
@@ -2122,6 +2121,12 @@
             }
 
           }
+	  # add the primary repeater to our alarm header if we are
+	  # alarming on it; Wrap our header at 60 chars
+	  if(!defined $t_opts{'noalarmsmsg'} and $alarm) {
+		  $alarm_ints =~ s/(.{60,}),$/$1)\nAlarming on (/; 
+		  $alarm_ints .= "$alarm_int,";
+	  }
 
          # Finished with this row (signified by the primary leaf id)
           if(defined $t_opts{'nonhtml'} || defined $t_opts{'plain'}) {

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