Dont let the application catch timeout exception

php-runtime · Oct 8, 2021 · ceb19a5 · ceb19a5
1 parent 67af5b7
commit ceb19a5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 22 deletions.
diff --git a/src/bref/src/BrefRunner.php b/src/bref/src/BrefRunner.php
@@ -4,6 +4,7 @@
 
 use Bref\Event\Handler;
 use Runtime\Bref\Lambda\LambdaClient;
+use Runtime\Bref\Timeout\Timeout;
 use Symfony\Component\Runtime\RunnerInterface;
 
 /**
@@ -27,7 +28,7 @@ public function run(): int
         $lambda = LambdaClient::fromEnvironmentVariable('symfony-runtime');
 
         $loops = 0;
-        while (true) {
+        while (!Timeout::$_tiggered) {
             if (++$loops > $this->loopMax) {
                 return 0;
             }
@@ -41,5 +42,7 @@ public function run(): int
                 return 0;
             }
         }
+
+        return 0;
     }
 }
diff --git a/src/bref/src/ConsoleApplicationRunner.php b/src/bref/src/ConsoleApplicationRunner.php
@@ -3,6 +3,7 @@
 namespace Runtime\Bref;
 
 use Runtime\Bref\Lambda\LambdaClient;
+use Runtime\Bref\Timeout\Timeout;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Runtime\RunnerInterface;
 
@@ -24,8 +25,10 @@ public function run(): int
     {
         $lambda = LambdaClient::fromEnvironmentVariable('symfony-runtime-console');
 
-        while (true) {
+        while (!Timeout::$_tiggered) {
             $lambda->processNextEvent($this->handler);
         }
+
+        return 0;
     }
 }
diff --git a/src/bref/src/Timeout/Timeout.php b/src/bref/src/Timeout/Timeout.php
@@ -13,8 +13,11 @@ final class Timeout
     /** @var bool */
     private static $initialized = false;
 
-    /** @var string|null */
-    private static $stackTrace = null;
+    /**
+     * @var bool
+     * @internal
+     */
+    public static $_tiggered = false;
 
     /**
      * @internal
@@ -44,8 +47,6 @@ public static function enable(int $remainingTimeInMillis): void
      */
     private static function init(): void
     {
-        self::$stackTrace = null;
-
         if (self::$initialized) {
             return;
         }
@@ -60,25 +61,16 @@ private static function init(): void
         // Setup a handler for SIGALRM that throws an exception
         // This will interrupt any running PHP code, including `sleep()` or code stuck waiting for I/O.
         pcntl_signal(SIGALRM, function (): void {
-            if (null !== Timeout::$stackTrace) {
-                // we have already thrown an exception, do a harder exit.
-                error_log('Lambda timed out');
-                error_log((new LambdaTimeoutException())->getTraceAsString());
-                error_log('Original stack trace');
-                error_log(Timeout::$stackTrace);
-
-                exit(1);
-            }
-
+            Timeout::$_tiggered = true;
             $exception = new LambdaTimeoutException('Maximum AWS Lambda execution time reached');
-            Timeout::$stackTrace = $exception->getTraceAsString();
-
-            // Trigger another alarm after 1 second to do a hard exit.
-            pcntl_alarm(1);
+            // we have already thrown an exception, do a harder exit.
+            error_log($exception->getMessage());
+            error_log($exception->getTraceAsString());
 
-            throw $exception;
+            exit(1);
         });
 
+        self::$_tiggered = false;
         self::$initialized = true;
     }
 
@@ -91,7 +83,6 @@ public static function reset(): void
     {
         if (self::$initialized) {
             pcntl_alarm(0);
-            self::$stackTrace = null;
         }
     }
 }