Cleanup events and stuff before processing job in worker

1 files changed, 13 insertions, 1 deletions

diff --git a/app/Core/Queue/JobHandler.php b/app/Core/Queue/JobHandler.php
index 326f3cef..11c1fb69 100644
--- a/app/Core/Queue/JobHandler.php
+++ b/app/Core/Queue/JobHandler.php
@@ -43,8 +43,8 @@ class JobHandler extends Base
 
         try {
             $className = $payload['class'];
-            $this->memoryCache->flush();
             $this->prepareJobSession($payload['user_id']);
+            $this->prepareJobEnvironment();
 
             if (DEBUG) {
                 $this->logger->debug(__METHOD__.' Received job => '.$className.' ('.getmypid().')');
@@ -75,4 +75,16 @@ class JobHandler extends Base
             $this->userSession->initialize($user);
         }
     }
+
+    /**
+     * Flush in-memory caching and specific events
+     *
+     * @access protected
+     */
+    protected function prepareJobEnvironment()
+    {
+        $this->memoryCache->flush();
+        $this->actionManager->removeEvents();
+        $this->dispatcher->dispatch('app.bootstrap');
+    }
 }