[2.x] Allows persisting database sessions between queue jobs (#97)

* Allows to persist database connections on queue lambda * Apply fixes from StyleCI * Fixes comparision * Update QueueHandler.php * Update QueueHandler.php Co-authored-by: Taylor Otwell <[email protected]> Co-authored-by: Taylor Otwell <[email protected]>
laravel · Sep 30, 2021 · 102d032 · 102d032
1 parent 1dbee6c
commit 102d032
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/Console/Commands/WritesQueueEventMessages.php b/src/Console/Commands/WritesQueueEventMessages.php
@@ -35,7 +35,7 @@ protected function listenForEvents()
      * Write the status output for the queue worker.
      *
      * @param  \Illuminate\Contracts\Queue\Job  $job
-     * @param  string $status
+     * @param  string  $status
      * @return void
      */
     protected function writeOutput(Job $job, $status)

diff --git a/src/Runtime/Fpm/FpmRequest.php b/src/Runtime/Fpm/FpmRequest.php
@@ -110,7 +110,7 @@ protected static function getUriAndQueryString(array $event)
     /**
      * Get the query string from the event.
      *
-     * @param  array $event
+     * @param  array  $event
      * @return string
      */
     protected static function getQueryString(array $event)

diff --git a/src/Runtime/Handlers/CliHandler.php b/src/Runtime/Handlers/CliHandler.php
@@ -14,7 +14,7 @@ class CliHandler implements LambdaEventHandler
     /**
      * Handle an incoming Lambda event.
      *
-     * @param  array $event
+     * @param  array  $event
      * @param  \Laravel\Vapor\Contracts\LambdaResponse
      * @return ArrayLambdaResponse
      */

diff --git a/src/Runtime/Handlers/FpmHandler.php b/src/Runtime/Handlers/FpmHandler.php
@@ -13,7 +13,7 @@ class FpmHandler implements LambdaEventHandler
      * Handle an incoming Lambda event.
      *
      * @param  array  $event
-     * @return  \Laravel\Vapor\Contracts\LambdaResponse
+     * @return \Laravel\Vapor\Contracts\LambdaResponse
      */
     public function handle(array $event)
     {

diff --git a/src/Runtime/Handlers/QueueHandler.php b/src/Runtime/Handlers/QueueHandler.php
@@ -79,7 +79,7 @@ public function handle(array $event)
      */
     protected function terminate()
     {
-        if (static::$app->resolved('db')) {
+        if (static::$app->resolved('db') && ($_ENV['VAPOR_QUEUE_DATABASE_SESSION_PERSIST'] ?? false) !== 'true') {
             collect(static::$app->make('db')->getConnections())->each->disconnect();
         }
     }

diff --git a/src/VaporJobTimedOutException.php b/src/VaporJobTimedOutException.php
@@ -10,8 +10,8 @@ class VaporJobTimedOutException extends Exception
     /**
      * Create a new exception instance.
      *
-     * @param string $name
-     * @param Throwable|null $previous
+     * @param  string  $name
+     * @param  Throwable|null  $previous
      */
     public function __construct($name, Throwable $previous = null)
     {