Merge pull request #2 from mdhia/master

Add fallback for POSIX
Magenerds · May 23, 2018 · 8779850 · 8779850
2 parents a7b553c + 3a9a56e
commit 8779850
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/Console/Command/CronProcessCheckCommand.php b/Console/Command/CronProcessCheckCommand.php
@@ -40,9 +40,10 @@ class CronProcessCheckCommand extends Command
      *
      * @param ScheduleFactory $scheduleFactory
      */
-    public function __construct (
+    public function __construct(
         ScheduleFactory $scheduleFactory
-    ){
+    )
+    {
         $this->scheduleFactory = $scheduleFactory;
         parent::__construct();
     }
@@ -70,15 +71,17 @@ public function configure()
     public function execute(InputInterface $input, OutputInterface $output)
     {
         $cronList = $this->scheduleFactory->create()->getCollection()
-            ->addFieldToFilter( 'status', Schedule::STATUS_RUNNING)
-            ->addFieldToFilter( 'pid', ['neq' => 'NULL'])
+            ->addFieldToFilter('status', Schedule::STATUS_RUNNING)
+            ->addFieldToFilter('pid', ['neq' => 'NULL'])
             ->load();
 
         $cleanCount = 0;
 
         /** @var Schedule $cron */
         foreach ($cronList as $cron) {
-            if(posix_getpgid($cron->getPid()) === false) {
+            if ((function_exists('posix_getpgid') && posix_getpgid($cron->getPid()) === false) // try to use POSIX (Portable Operating System Interface)
+                || file_exists('/proc/' . $cron->getPid()) === false // check process pid in /proc/ folder
+            ) {
                 $cleanCount++;
                 $cron->setMessages(sprintf('Magenerds_CronProcessCheck: Process (PID: %s) is gone', $cron->getPid()));
                 $cron->setStatus(Schedule::STATUS_ERROR);

diff --git a/Plugin/Model/CronSchedulePlugin.php b/Plugin/Model/CronSchedulePlugin.php
@@ -35,7 +35,7 @@ class CronSchedulePlugin
      */
     public function afterTryLockJob(Schedule $subject, $canLock)
     {
-        if($canLock) {
+        if ($canLock) {
             $subject->setPid(getmypid());
         }
 
@@ -52,7 +52,7 @@ public function afterTryLockJob(Schedule $subject, $canLock)
      */
     public function beforeSetData(Schedule $subject, $key, $value = null)
     {
-        if($key === 'status' && $value !== Schedule::STATUS_RUNNING) {
+        if ($key === 'status' && $value !== Schedule::STATUS_RUNNING) {
             $subject->setPid(NULL);
         }
     }

diff --git a/README.md b/README.md
@@ -2,5 +2,6 @@
 Cron Process check for Magento 2. This modules checks if a cron job process crashed and sets its status to error.
 
 ### Setup
-1. Install `Magenerds/CronProcessCheck` Module
-2. Add System cronjob `* * * * * /var/www/magento/bin/magento magenerds:cronprocess:check > /dev/null 2>&1g`
+1. Activate POSIX module in your php.ini
+2. Install `Magenerds/CronProcessCheck` Module
+3. Add System cronjob `* * * * * /var/www/magento/bin/magento magenerds:cronprocess:check > /dev/null 2>&1g`
diff --git a/registration.php b/registration.php
@@ -7,6 +7,7 @@
  * @copyright  Copyright (c) 2018 TechDivision GmbH (http://www.techdivision.com)
  * @link       http://www.techdivision.com/
  */
+
 use Magento\Framework\Component\ComponentRegistrar;
 
 ComponentRegistrar::register(