Ignore:
Timestamp:
Sep 26, 2010, 3:23:31 PM (14 years ago)
Author:
ezyang
Message:
Undo merge.
Location:
branches/fc13-dev
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/fc13-dev

    • Property svn:mergeinfo changed
      /trunkremoved
  • branches/fc13-dev/server/fedora/config/etc/nagios/check_ldap_mmr.real

    r1673 r1674  
    66use Net::LDAP;
    77use strict;
    8 
    9 my $nl  = $ENV{'USE_NEWLINES'} ? "\n" : "";
    10 my $tab = $ENV{'USE_NEWLINES'} ? "  " : "";
    118
    129# Nagios codes
     
    2825my $replicaErrors = 0;
    2926my $conflictErrors = 0;
    30 my $errorstring = "Replication error(s): $nl";
     27my $errorstring = "Replication error(s): ";
    3128foreach my $entr ( @entries ) {
    3229    my $servername=$entr->get_value($server);
     
    3835    $serverlaststart =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
    3936    $serverlastend =~ s/(....)(..)(..)(..)(..)(..)./$1-$2-$3\ $4:$5:$6/;
    40     print "Replication to $servername last operation $serverlaststart $nl";
    41     print $tab . "Status: $serverstatus.     $nl";
     37    print "Replication to $servername last operation $serverlaststart ";
     38    print "Status: $serverstatus.     ";
    4239    if ($statuscode) {
    4340        $replicaErrors++;
     
    4542    }
    4643}
    47 print "$nl";
    4844
    4945$result=LDAPSearch($ldap,"nsds5ReplConflict=*",["nsds5ReplConflict"],$replicatedBase);
     
    5248    my $conflictingDN=$entr->dn();
    5349    my $conflictDesc=$entr->get_value("nsds5ReplConflict");
    54     print "Conflict found for DN $conflictingDN $nl";
    55     print $tab . "Reason: $conflictDesc.     $nl";
     50    print "Conflict found for DN $conflictingDN ";
     51    print "Reason: $conflictDesc.     ";
    5652    $conflictErrors++;
    5753    $errorstring = $errorstring . $conflictDesc . ", ";
    5854}
    59 print "$nl";
    6055
    6156if ($conflictErrors > 0) {
Note: See TracChangeset for help on using the changeset viewer.