X-Git-Url: https://git.cweiske.de/phancap.git/blobdiff_plain/12fc66e66288365731ad40bf2016633d0569bf81..fc937c3b2eec973b2699e5d2f3a7e6c732bb9eee:/src/phancap/Executor.php

diff --git a/src/phancap/Executor.php b/src/phancap/Executor.php
index 5b59094..63931f8 100644
--- a/src/phancap/Executor.php
+++ b/src/phancap/Executor.php
@@ -29,19 +29,41 @@ class Executor
     /**
      * Run a shell command and check exit code.
      *
-     * @param string $cmd Full command including parameters and options
+     * @param string $cmd  Full command including parameters and options
+     * @param string $name Command name for exception
      *
      * @return void
      * @throws \Exception When the exit code is not 0
      */
-    public static function run($cmd)
+    public static function run($cmd, $name)
     {
         exec($cmd . ' 2>&1', $arOutput, $exitcode);
         if ($exitcode != 0) {
             //FIXME: do something with $arOutput
-            echo implode("\n", $arOutput) . "\n";
-            throw new \Exception('Error running cutycapt', $exitcode);
+            //echo implode("\n", $arOutput) . "\n";
+            throw new \Exception('Error running ' . $name, $exitcode);
         }
     }
+
+    /**
+     * Let the command run for some time. Kill it if it did not exit itself.
+     *
+     * We use the GNU coreutils "timeout" utility instead of the pcntl
+     * extension since pcntl is disabled on mod_php.
+     *
+     * @param string $cmd     Full command including parameters and options
+     * @param int    $seconds Number of seconds after which the cmd is killed
+     * @param string $name    Command name for exception
+     *
+     * @return void
+     * @throws \Exception When the exit code is not 0
+     */
+    public static function runForSomeTime($cmd, $seconds, $name)
+    {
+        return static::run(
+            'timeout --signal=9 ' . $seconds . 's ' . $cmd,
+            $name
+        );
+    }
 }
 ?>