Bugfixes

Pulchritudinous · Aug 5, 2020 · ea0e390 · ea0e390
1 parent 93d709d
commit ea0e390
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 19 deletions.
diff --git a/Console/Command/Labour.php b/Console/Command/Labour.php
@@ -106,7 +106,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->logger->critical($e);
             $msg = $e->getMessage();
             $output->writeln("<error>$msg</error>");
-            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+            return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+        } catch (\ParseError $e) {
+            $this->logger->critical($e);
+            $msg = $e->getMessage();
+            $output->writeln("<error>$msg</error>");
+            return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
+        } catch (\Error $e) {
+            $this->logger->critical($e);
+            $msg = $e->getMessage();
+            $output->writeln("<error>$msg</error>");
+            return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
         }
 
         return \Magento\Framework\Console\Cli::RETURN_SUCCESS;

diff --git a/Console/Command/Server.php b/Console/Command/Server.php
@@ -30,7 +30,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Process\Process as SymfonyProcess;
+use Symfony\Component\Process\Exception\ProcessFailedException;
 
 use Psr\Log\LoggerInterface;
 
@@ -263,20 +263,54 @@ protected function execute(InputInterface $input, OutputInterface $output)
                         continue;
                     }
 
-                    $process = $this->_getProcess($labour);
+                    try {
+                        $process = $this->_getProcess($labour);
 
-                    $process->start();
+                        $this->dbHelper->updateLabourField($labour, 'pid', (string) $process->getPid());
 
-                    $this->dbHelper->updateLabourField($labour, 'pid', (string) $process->getPid());
+                        $process->start();
 
-                    $processes[] = $process;
+                        if (!$process->isSuccessful()) {
+                            throw new ProcessFailedException($process);
+                        }
+
+                        $processes[] = $process;
+                    } catch (\Exception $e) {
+                        $this->logger->critical($e);
+                        $msg = $e->getMessage();
+                        $output->writeln("<error>$msg</error>");
+
+                        $labour->reschedule();
+                    } catch (\ParseError $e) {
+                        $this->logger->critical($e);
+                        $msg = $e->getMessage();
+                        $output->writeln("<error>$msg</error>");
+
+                        $labour->reschedule();
+                    } catch (\Error $e) {
+                        $this->logger->critical($e);
+                        $msg = $e->getMessage();
+                        $output->writeln("<error>$msg</error>");
+
+                        $labour->reschedule();
+                    }
                 }
             }
         } catch (\Exception $e) {
             $this->logger->critical($e);
             $msg = $e->getMessage();
             $output->writeln("<error>$msg</error>");
             return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+        } catch (\ParseError $e) {
+            $this->logger->critical($e);
+            $msg = $e->getMessage();
+            $output->writeln("<error>$msg</error>");
+            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
+        } catch (\Error $e) {
+            $this->logger->critical($e);
+            $msg = $e->getMessage();
+            $output->writeln("<error>$msg</error>");
+            return \Magento\Framework\Console\Cli::RETURN_FAILURE;
         }
 
         return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
@@ -330,19 +364,18 @@ protected function _getProcess(LabourModel $labour) : Process
 
         $labourCmd->configure();
 
-        $php = PHP_BINDIR ? PHP_BINDIR . '/php' : 'php';
+        $php = $_SERVER['_'];
         $magentoBinary = $php . " -f {$this->rootPath}/bin/magento";
         $labourCmdName = $labourCmd->getName();
         $arguments = $labour->getId();
 
         $process = (new Process([
-                $magentoBinary,
+                $php,
                 $labourCmdName,
                 $arguments,
             ]))
             ->setTimeout($this->arrHelper->get('timeout', $config))
-            ->setLabour($labour)
-            ->disableOutput();
+            ->setLabour($labour);
 
         return $process;
     }

diff --git a/Model/Labour.php b/Model/Labour.php
@@ -230,21 +230,21 @@ public function execute() : void
             $this->_execute();
             $this->_afterExecute();
         } catch (RescheduleException $e) {
-            $this->reschedule();
-
             $this->logger->critical($e);
-        } catch (\Exception $e) {
-            $this->reschedule();
 
-            $this->logger->critical($e);
-        } catch (\ParseError $e) {
             $this->reschedule();
-
+        } catch (\Exception $e) {
             $this->logger->critical($e);
-        } catch (\Error $e) {
+
             $this->reschedule();
+        } catch (\ParseError $e) {
+            $this->logger->critical($e);
 
+            $this->reschedule();
+        } catch (\Error $e) {
             $this->logger->critical($e);
+
+            $this->reschedule();
         }
     }
 

diff --git a/Model/Server/Process.php b/Model/Server/Process.php
@@ -35,7 +35,7 @@ class Process
      *
      * @var Labour
      */
-    private $labor;
+    private $labour;
 
     /**
      * Set Labour instance