Changeset 8012

Timestamp:

03/17/08 11:42:21 (5 years ago)

Author:

tokuhirom

Message:

タイムアウト関連の設定は config.yaml にもたせるように。

Location:

lang/perl/App-MadEye/trunk

Files:

• config.yaml (modified) (1 diff)
• lib/App/MadEye/Plugin/Worker/Gearman.pm (modified) (5 diffs)

lang/perl/App-MadEye/trunk/config.yaml

@@ -17 +17 @@
     config:
       fork_num: 3
+      task_timeout: 20
+      child_timeout: 7
       gearman_servers:
         - 127.0.0.1

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

@@ -16 +16 @@
 __PACKAGE__->mk_accessors(qw/task_set child_pids gearman_client/);
 
-our $TASK_TIMEOUT = 60;  # TODO: configurable
 our $CHILD_TIMEOUT = 60;  # TODO: configurable
 
@@ -65 +64 @@
         'watch',
         freeze($args), +{
-            timeout => $TASK_TIMEOUT,
+            timeout => $self->task_timeout(),
             on_fail => sub {
                 warn "GEARMAN ERROR: " . Dump($args);
@@ -136 +135 @@
 
             $context->log( debug => "watching $args->{target} by $args->{plugin}" );
-
             my $result = \undef;
-            timeout $TASK_TIMEOUT, "watching $args->{target} $args->{plugin}", sub {
+            timeout $self->task_timeout(), "watching $args->{target} $args->{plugin}", sub {
                 if ( my $message = $args->{plugin}->is_dead( $args->{target} ) ) {
                     $result = +{
@@ -151 +149 @@
     );
 
-    timeout $CHILD_TIMEOUT, 'work child', sub {
+    timeout $self->child_timeout(), 'work child', sub {
         $worker->work while 1;
     };
+}
+
+sub task_timeout {
+    my $self = shift;
+    $self->config->{config}->{task_timeout} || 10;
+}
+
+sub child_timeout {
+    my $self = shift;
+    $self->config->{config}->{child_timeout} || 60;
 }
 
@@ -177 +185 @@
                 - type: str
             required: yes
+        task_timeout:
+            type: int
+            required: no
+        child_timeout:
+            type: int
+            required: no
 
 =head1 AUTHOR