Changeset 1675 for branches/fc13-dev/server/fedora/config/etc/nagios/check_ldap_mmr.real

Timestamp:

Sep 26, 2010, 3:24:23 PM (14 years ago)

Author:

ezyang

Message:

Merge changes from trunk.

Location:

branches/fc13-dev

Files:

• . (modified) (1 prop)
• server/fedora/config/etc/nagios/check_ldap_mmr.real (modified) (5 diffs)

branches/fc13-dev/server/fedora/config/etc/nagios/check_ldap_mmr.real

@@ -6 +6 @@
 use Net::LDAP;
 use strict;
+
+my $nl  = $ENV{'USE_NEWLINES'} ? "\n" : "";
+my $tab = $ENV{'USE_NEWLINES'} ? "  " : "";
 
 # Nagios codes
@@ -25 +28 @@
 my $replicaErrors = 0;
 my $conflictErrors = 0;
-my $errorstring = "Replication error(s): ";
+my $errorstring = "Replication error(s): $nl";
 foreach my $entr ( @entries ) {
     my $servername=$entr->get_value($server);
@@ -35 +38 @@
     $serverlaststart =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
     $serverlastend =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
-    print "Replication to $servername last operation $serverlaststart ";
-    print "Status: $serverstatus.     ";
+    print "Replication to $servername last operation $serverlaststart $nl";
+    print $tab . "Status: $serverstatus.     $nl";
     if ($statuscode) {
         $replicaErrors++;
@@ -42 +45 @@
     }
 }
+print "$nl";
 
 $result=LDAPSearch($ldap,"nsds5ReplConflict=*",["nsds5ReplConflict"],$replicatedBase);
@@ -48 +52 @@
     my $conflictingDN=$entr->dn();
     my $conflictDesc=$entr->get_value("nsds5ReplConflict");
-    print "Conflict found for DN $conflictingDN ";
-    print "Reason: $conflictDesc.     ";
+    print "Conflict found for DN $conflictingDN $nl";
+    print $tab . "Reason: $conflictDesc.     $nl";
     $conflictErrors++;
     $errorstring = $errorstring . $conflictDesc . ", ";
 }
+print "$nl";
 
 if ($conflictErrors > 0) {