Add TimeoutException

pmvc-plugin · Apr 6, 2021 · e3ad475 · e3ad475
1 parent f389075
commit e3ad475
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/demos/demoTimeout.php b/demos/demoTimeout.php
@@ -9,12 +9,9 @@
  */
 PMVC\Load::plug(
     [ 
-        'error'=>['all'],
-        'debug'=>['output'=>'debug_cli', 'level'=> 'debug'],
-        'dev'=>null,
-        'supervisor'=>null,
+        'supervisor'=>['debug' => 'debug'],
     ],
-    ['../../']
+    ['../../',  __DIR__.'/../vendor/pmvc-plugin/', ]
 );
 
 $parallel = new Parallel(function(){
@@ -30,9 +27,9 @@
       'pid' => $parallel->getPid()
     ]);
   }, 
-  'onFinish'=> function($parallel, $isCancel) {
+  'onFinish'=> function($parallel, $result) {
     \PMVC\v([
-      'cancel' => $isCancel,
+      'result' => $result,
       'pid' => $parallel->getPid()
     ]);
   }

diff --git a/src/Timeout.php b/src/Timeout.php
@@ -2,8 +2,14 @@
 
 namespace PMVC\PlugIn\supervisor;
 
+use RuntimeException;
+
+class TimeoutException extends RuntimeException {}
+
 class Timeout extends Parallel
 {
+    public $type = TIMEOUT;  
+
     public function __construct($pid, $props)
     {
         parent::__construct(
@@ -26,6 +32,7 @@ function () {
                     return $plug->log('Kill by timeout...' . $pid);
                 }, DEBUG);
                 pcntl_signal_dispatch();
+                throw new TimeoutException($pid.' Timeout.');
             },
             [
                 SIGNAL => SIGKILL,