Merge pull request #1 from maksimru/fix/worker-stability

Fix/worker stability

Author: martianoff

README.md

@@ -51,6 +51,44 @@ In your ```config/queue.php``` file you have to provide the following:
 In your ```config/app.php``` add ```'Forumhouse\LaravelAmqp\ServiceProvider\LaravelAmqpServiceProvider'``` to the list of service 
 providers registered.
 
+Improved worker stability (PHP 7.1+ is required)
+------------
+
+For better stability please add following code in app/Exceptions/Handler.php:
+
+```php
+class Handler extends ExceptionHandler
+{
+```
+
+to
+
+```php
+class Handler extends ExceptionHandler
+{
+    use AMQPFailureDetector;
+```
+
+And
+
+```php
+public function report(Exception $exception)
+{
+    parent::report($exception);
+}
+```
+
+to
+
+```php
+public function report(Exception $exception)
+{
+    $this->catchAMQPConnectionFailure($exception);
+    parent::report($exception);
+}
+```
+
+
 Usage
 ------------
 

composer.json

@@ -4,7 +4,7 @@
   "minimum-stability": "stable",
   "license": "GPL-2.0",
   "require": {
-    "php": ">=7",
+    "php": ">=7.1",
     "php-amqplib/php-amqplib": "2.6.*"
   },
   "require-dev": {

src/Jobs/AMQPJob.php

@@ -125,11 +125,14 @@ public function getQueue()
      * Get the job identifier.
      *
      * @return string
-     * @throws \OutOfBoundsException
      */
     public function getJobId()
     {
-        return $this->amqpMessage->get('message_id');
+        try {
+            return $this->amqpMessage->get('message_id');
+        } catch (\OutOfBoundsException $exception){
+            return null;
+        }
     }
 
 }

src/Traits/AMQPFailureDetector.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Forumhouse\LaravelAmqp\Traits;
+use Exception;
+use Illuminate\Support\Str;
+
+trait AMQPFailureDetector
+{
+
+    public function catchAMQPConnectionFailure(Exception $exception)
+    {
+        if(\App::runningInConsole() && $this->causedByLostConnection($exception) && extension_loaded('posix')){
+            posix_kill(getmypid(), SIGTERM);
+        }
+    }
+
+    protected function causedByLostConnection(Exception $e)
+    {
+        $message = $e->getMessage();
+
+        return Str::contains($message, [
+            'server has gone away',
+            'no connection to the server',
+            'Lost connection',
+            'is dead or not enabled',
+            'Error while sending',
+            'decryption failed or bad record mac',
+            'server closed the connection unexpectedly',
+            'SSL connection has been closed unexpectedly',
+            'Error writing data to the connection',
+            'Resource deadlock avoided',
+            'Transaction() on null',
+            'child connection forced to terminate due to client_idle_limit',
+        ]);
+    }
+}