From 66e678f50cf89aceafd7b6a3390aba272fdd3118 Mon Sep 17 00:00:00 2001
From: max-baranikov <max.baranikov@gmail.com>
Date: Thu, 31 Dec 2020 12:00:22 +0300
Subject: [PATCH] Clearing CURRENT_TASK on JobManager shutdown, remove
 CONTEXT_ALL and use global values instead

---
 retailcrm/cli.php                     |  1 +
 retailcrm/lib/RetailcrmCli.php        | 16 ++------------
 retailcrm/lib/RetailcrmJobManager.php | 30 ++++++++++-----------------
 3 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/retailcrm/cli.php b/retailcrm/cli.php
index d49eff0..22fff2c 100644
--- a/retailcrm/cli.php
+++ b/retailcrm/cli.php
@@ -55,6 +55,7 @@ function retailcrmCliInterruptHandler($signo)
         print_r($signo, true)
     ));
     RetailcrmCli::clearCurrentJob(null);
+    RetailcrmJobManager::clearCurrentJob(null);
     exit(1);
 }
 
diff --git a/retailcrm/lib/RetailcrmCli.php b/retailcrm/lib/RetailcrmCli.php
index 897e89f..cb8bfd0 100644
--- a/retailcrm/lib/RetailcrmCli.php
+++ b/retailcrm/lib/RetailcrmCli.php
@@ -113,10 +113,6 @@ class RetailcrmCli
         $jobName = isset($options['j']) ? $options['j'] : (isset($options['job']) ? $options['job'] : null);
         $shopId = isset($options['s']) ? $options['s'] : (isset($options['shop']) ? $options['shop'] : null);
 
-        if (Shop::isFeatureActive()) {
-            Shop::setContext(Shop::CONTEXT_ALL);
-        }
-
         if (isset($options['reset-job-manager'])) {
             $this->resetJobManager();
         } elseif (isset($options['reset-all'])) {
@@ -170,10 +166,6 @@ class RetailcrmCli
                 $result ? 'true' : 'false'
             ));
         } catch (\Exception $exception) {
-            if (Shop::isFeatureActive()) {
-                Shop::setContext(Shop::CONTEXT_ALL);
-            }
-
             if ($exception instanceof RetailcrmJobManagerException && $exception->getPrevious() instanceof \Exception) {
                 $this->printStack($exception->getPrevious());
             } else {
@@ -183,10 +175,6 @@ class RetailcrmCli
             self::clearCurrentJob($jobName);
         }
 
-        if (Shop::isFeatureActive()) {
-            Shop::setContext(Shop::CONTEXT_ALL);
-        }
-
         if (isset($result) && $result) {
             self::clearCurrentJob($jobName);
         }
@@ -327,7 +315,7 @@ class RetailcrmCli
      */
     public static function setCurrentJob($job)
     {
-        return (bool) Configuration::updateValue(self::CURRENT_TASK_CLI, $job);
+        return (bool) Configuration::updateGlobalValue(self::CURRENT_TASK_CLI, $job);
     }
 
     /**
@@ -337,7 +325,7 @@ class RetailcrmCli
      */
     public static function getCurrentJob()
     {
-        return (string) Configuration::get(self::CURRENT_TASK_CLI);
+        return (string) Configuration::getGlobalValue(self::CURRENT_TASK_CLI);
     }
 
     /**
diff --git a/retailcrm/lib/RetailcrmJobManager.php b/retailcrm/lib/RetailcrmJobManager.php
index c3f5c97..e9ce2ed 100644
--- a/retailcrm/lib/RetailcrmJobManager.php
+++ b/retailcrm/lib/RetailcrmJobManager.php
@@ -108,10 +108,6 @@ class RetailcrmJobManager
         $current = date_create('now');
         $lastRuns = array();
 
-        if (Shop::isFeatureActive()) {
-            Shop::setContext(Shop::CONTEXT_ALL);
-        }
-
         try {
             $lastRuns = static::getLastRuns();
         } catch (Exception $exception) {
@@ -176,10 +172,6 @@ class RetailcrmJobManager
                     $lastRuns[$job] = new \DateTime('now');
                 }
             } catch (\Exception $exception) {
-                if (Shop::isFeatureActive()) {
-                    Shop::setContext(Shop::CONTEXT_ALL);
-                }
-
                 if ($exception instanceof RetailcrmJobManagerException
                     && $exception->getPrevious() instanceof \Exception
                 ) {
@@ -201,10 +193,6 @@ class RetailcrmJobManager
                 self::clearCurrentJob($job);
             }
 
-            if (Shop::isFeatureActive()) {
-                Shop::setContext(Shop::CONTEXT_ALL);
-            }
-
             if (isset($result) && $result) {
                 self::clearCurrentJob($job);
             }
@@ -233,7 +221,7 @@ class RetailcrmJobManager
      */
     private static function getLastRuns()
     {
-        $lastRuns = json_decode((string)Configuration::get(self::LAST_RUN_NAME), true);
+        $lastRuns = json_decode((string)Configuration::getGlobalValue(self::LAST_RUN_NAME), true);
 
         if (json_last_error() != JSON_ERROR_NONE) {
             $lastRuns = array();
@@ -280,7 +268,7 @@ class RetailcrmJobManager
             );
         }
 
-        Configuration::updateValue(self::LAST_RUN_NAME, (string)json_encode($lastRuns));
+        Configuration::updateGlobalValue(self::LAST_RUN_NAME, (string)json_encode($lastRuns));
     }
 
     /**
@@ -341,7 +329,7 @@ class RetailcrmJobManager
      */
     public static function setCurrentJob($job)
     {
-        return (bool)Configuration::updateValue(self::CURRENT_TASK, $job);
+        return (bool)Configuration::updateGlobalValue(self::CURRENT_TASK, $job);
     }
 
     /**
@@ -351,7 +339,7 @@ class RetailcrmJobManager
      */
     public static function getCurrentJob()
     {
-        return (string)Configuration::get(self::CURRENT_TASK);
+        return (string)Configuration::getGlobalValue(self::CURRENT_TASK);
     }
 
     /**
@@ -430,6 +418,10 @@ class RetailcrmJobManager
     {
         if (is_callable(self::$customShutdownHandler)) {
             call_user_func_array(self::$customShutdownHandler, array($error));
+        } else {
+            if (null !== $error) {
+                self::clearCurrentJob(null);
+            }
         }
 
         RetailcrmLogger::writeCaller(
@@ -591,7 +583,7 @@ class RetailcrmJobManager
      */
     private static function isLocked()
     {
-        $inProcess = (bool)Configuration::get(self::IN_PROGRESS_NAME);
+        $inProcess = (bool)Configuration::getGlobalValue(self::IN_PROGRESS_NAME);
         $lastRan = static::getLastRun();
         $lastRanSeconds = $lastRan->format('U');
 
@@ -615,7 +607,7 @@ class RetailcrmJobManager
     {
         if (!static::isLocked()) {
             RetailcrmLogger::writeDebug(__METHOD__, 'Acquiring lock...');
-            Configuration::updateValue(self::IN_PROGRESS_NAME, true);
+            Configuration::updateGlobalValue(self::IN_PROGRESS_NAME, true);
             RetailcrmLogger::writeDebug(__METHOD__, 'Lock acquired.');
 
             return true;
@@ -632,7 +624,7 @@ class RetailcrmJobManager
     private static function unlock()
     {
         RetailcrmLogger::writeDebug(__METHOD__, 'Removing lock...');
-        Configuration::updateValue(self::IN_PROGRESS_NAME, false);
+        Configuration::updateGlobalValue(self::IN_PROGRESS_NAME, false);
         RetailcrmLogger::writeDebug(__METHOD__, 'Lock removed.');
 
         return false;