[Devmon-devel] SF.net SVN: devmon:[172] trunk/modules/dm_snmp.pm

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

Revision: 172
          http://devmon.svn.sourceforge.net/devmon/?rev=172&view=rev
Author:   buchanmilne
Date:     2010-03-10 22:03:12 +0000 (Wed, 10 Mar 2010)

Log Message:
-----------
Clean up some logging, including identifying the affected fork if applicable

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

Modified: trunk/modules/dm_snmp.pm
===================================================================
--- trunk/modules/dm_snmp.pm	2010-03-10 21:13:24 UTC (rev 171)
+++ trunk/modules/dm_snmp.pm	2010-03-10 22:03:12 UTC (rev 172)
@@ -77,7 +77,7 @@
         while(<$sock>) {
           my ($device,$color,$line1) = split /\|/;
           my ($l1col) = ($line1 =~ /^(\w+)/);
-          do_log("$device has hobbit status $color ($l1col)") if $g{debug};
+          do_log("DEBUG SNMP: $device has hobbit status $color ($l1col)",2) if $g{debug};
           $g{'hobbit_color'}{$device} = $color ne "blue" && $color || $l1col;
         }
       }
@@ -260,10 +260,10 @@
             my $pid = $g{'forks'}{$fork}{'pid'};
            # See if we've exceeded our max poll time
             if((time - $g{'forks'}{$fork}{'time'}) > $g{'maxpolltime'}) {
-              do_log("Fork $fork ($pid) exceeded poll time polling $dev",0);
+              do_log("WARNING: Fork $fork ($pid) exceeded poll time polling $dev",0);
               # Kill it
-               do_log("Fork $fork ($pid) exceeded poll time polling $dev",0);
-               kill 15, $pid;
+               kill 15, $pid or do_log("WARNING: Sending fork $fork TERM signal failed: $!",0);
+	       close $g{'forks'}{$fork}{'CS'} or do_log("WARNING: Closing socket to fork $fork failed: $!",1);
                delete $g{'forks'}{$fork};
                --$active_forks;
                fork_queries();
@@ -475,9 +475,9 @@
       my $oids_num = keys %{$data_in{'nonreps'}};
 	my $ii = 0;
 
-	do_log("DEBUG SNMP: $oids_num",0) if $g{'debug'};
+	do_log("DEBUG SNMP($fork_num): $oids_num",0) if $g{'debug'};
       for my $oid (keys  %{$data_in{'nonreps'}}) {
-	do_log("DEBUG SNMP: $ii => $oid ",0) if $g{'debug'};
+	do_log("DEBUG SNMP($fork_num): $ii => $oid ",0) if $g{'debug'};
 	$ii++;
 	push @nrep_oids_my, $oid;
         push @nrep_oids, encode_oid(split /\./, $oid);
@@ -488,17 +488,17 @@
 for (my $index = 0; $index < $oids_num; $index++) { 
 ++$nrep_oids_temp_cpt;
 push @nrep_oids_temp, $nrep_oids[$index];
-do_log("DEBUG SNMP: Adding ID => $nrep_oids_temp_cpt OID =>$nrep_oids_my[$index]",0) if $g{'debug'};
+do_log("DEBUG SNMP($fork_num): Adding ID => $nrep_oids_temp_cpt OID =>$nrep_oids_my[$index]",0) if $g{'debug'};
 
 #if ($nrep_oids_temp_cpt == 10) {
-	do_log("DEBUG SNMP: Pooling $nrep_oids_temp_cpt oids",0) if $g{'debug'};
+	do_log("DEBUG SNMP($fork_num): Pooling $nrep_oids_temp_cpt oids",0) if $g{'debug'};
       if(@nrep_oids_temp) {
         if($session->get_request_response(@nrep_oids_temp)) {
           my $response = $session->pdu_buffer;
           my ($bindings) = $session->decode_get_response($response);
           if(!defined $bindings or $bindings eq '') {
             my $snmp_err;
-		do_log("DEBUG SNMP: $SNMP_Session::errmsg",0) if $g{'debug'};
+		do_log("DEBUG SNMP($fork_num): $SNMP_Session::errmsg",0) if $g{'debug'};
             ($snmp_err = $SNMP_Session::errmsg) =~ s/\n.*//s;
             my $error_str = "snmpget $dev ($snmp_err)";
             $data_out{'error'}{$error_str} = 0;
@@ -552,7 +552,7 @@
        # Catch any failures
         if(!defined $num_reps or $num_reps == 0) {
           my $snmp_err;
-	do_log("DEBUG SNMP: $SNMP_Session::errmsg",0) if $g{'debug'};
+	do_log("DEBUG SNMP($fork_num): $SNMP_Session::errmsg",0) if $g{'debug'};
           ($snmp_err = $SNMP_Session::errmsg) =~ s/\n.*//s;
 	  if ($snmp_err ne '') {
             my $error_str = 
@@ -566,7 +566,7 @@
           $data_out{'maxrep'}{$oid} = $num_reps + 1;
         }
 
-	do_log("DEBUG SNMP: Failed queries $failed_query",0) if $g{'debug'};
+	do_log("DEBUG SNMP($fork_num): Failed queries $failed_query",0) if $g{'debug'};
        # We dont want to do every table if we are failing alot of walks
         if($failed_query > 6) {
           my $error_str =


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