Changeset 8241 for lang/perl/App-MadEye

Timestamp:

03/21/08 13:01:33 (9 months ago)

Author:

tokuhirom

Message:

タイムアウトエラーが、通常エラーとしてカウントされないためにルールなどの影響をうけなくて残念なので、通常エラー扱いにした。

Location:

lang/perl/App-MadEye/trunk/lib/App/MadEye

Files:

• Plugin/Worker/Simple.pm (modified) (2 diffs)
• Util.pm (modified) (3 diffs)

lang/perl/App-MadEye/trunk/lib/App/MadEye/Plugin/Worker/Simple.pm

@@ -12 +12 @@
 
     my $timeout = $self->config->{config}->{task_timeout} or die "missing task_timeout";
-    timeout $timeout, "watching $args->{target} $args->{plugin}", sub {
+
+    my $error = timeout $timeout, "watching $args->{target} $args->{plugin}", sub {
         if ( my $message = $args->{plugin}->is_dead( $args->{target} ) ) {
             $context->add_result(
@@ -21 +22 @@
         }
     };
+
+    if ($error) {
+        $context->add_result(
+            plugin  => $args->{plugin},
+            target  => $args->{target},
+            message => $error,
+        );
+    }
 
     $context->log( debug => "finished $args->{target} by $args->{plugin}" );

lang/perl/App-MadEye/trunk/lib/App/MadEye/Util.pm

@@ -4 +4 @@
 use base qw/Exporter/;
 
-our @EXPORT = qw/timeout get_schema_from_pod snmp_session/;
+our @EXPORT = qw/timeout get_schema_from_pod context snmp_session/;
 
 use Sys::Syslog qw/:DEFAULT/;
@@ -13 +13 @@
 use Net::SNMP;
 
+sub context () { App::MadEye->context }
+
 sub timeout($$&) {    ## no critic.
     my ( $secs, $msg, $code ) = @_;
-    App::MadEye->context->log(debug => "run timer: '$msg', $secs");;
+
+    context->log(debug => "run timer: '$msg', $secs");;
+
     my $last_alarm = 0;
+    my $err;
     eval {
         local $SIG{ALRM} = sub { die "Time out error: $msg" };
@@ -23 +28 @@
         my $start_time = gettimeofday();
             $code->();
-        App::MadEye->context->log('debug' => "stopwatch: " . (gettimeofday() - $start_time));
+        context->log('debug' => "stopwatch: " . (gettimeofday() - $start_time));
     };
     if ($@) {
-        my $err = $@;
-        App::MadEye->context->log('error' => $err);
-        warn $err;
+        $err = $@;
+
+        context->log('error' => $err);
     }
     alarm $last_alarm; # restore
+
+    return $err;
 }