itrukhin / bxconsole

src/Cron.php

Spacing +42 added lines, -42 removed lines

@@ -37,45 +37,45 @@ 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $logger = EnvHelper::getLogger('bx_cron');
-        if($logger) {
+        if ($logger) {
             $this->setLogger($logger);
         }
 
         $showStatus = $input->getOption('status');
         $byTime = $input->getOption('bytime');
-        if($showStatus) {
+        if ($showStatus) {
             $sort = ($byTime ? self::SORT_TIME : self::SORT_NAME);
             $this->showStatus($output, $sort);
             return 0;
         }
 
-        if(EnvHelper::getSwitch('BX_CRONTAB_RUN', EnvHelper::SWITCH_STATE_OFF)) {
-            if($this->logger) {
+        if (EnvHelper::getSwitch('BX_CRONTAB_RUN', EnvHelper::SWITCH_STATE_OFF)) {
+            if ($this->logger) {
                 $this->logger->alert('BxCron switch off');
             }
             return 0;
         }
 
-        if(!$this->lock()) {
+        if (!$this->lock()) {
             $msg = 'The command is already running in another process.';
             $output->writeln($msg);
-            if($this->logger) {
+            if ($this->logger) {
                 $this->logger->warning($msg);
             }
             return 0;
         }
 
-        if($sleepInterval = EnvHelper::checkSleepInterval()) {
+        if ($sleepInterval = EnvHelper::checkSleepInterval()) {
             $msg = sprintf("Sleep in interval %s", $sleepInterval);
             $output->writeln($msg);
-            if($this->logger) {
+            if ($this->logger) {
                 $this->logger->warning($msg);
             }
             return 0;
         }
 
         $clean = $input->getOption('clean');
-        if($clean) {
+        if ($clean) {
             $command = $this->getApplication()->find($clean);
             $this->cleanJob($command->getName());
             $output->writeln($command->getName() . " will be executed now");
@@ -99,10 +99,10 @@ 
         $lastExec = 0;
         $hasError = false;
 
-        foreach($jobs as $cmd => $job) {
+        foreach ($jobs as $cmd => $job) {
             $execTime = $job['last_exec'];
-            if($execTime > $lastExec) $lastExec = $execTime;
-            if(!empty($job['error'])) {
+            if ($execTime > $lastExec) $lastExec = $execTime;
+            if (!empty($job['error'])) {
                 $hasError = true;
             }
         }
@@ -121,7 +121,7 @@ 
             'Status',
         ];
 
-        if($hasError) {
+        if ($hasError) {
             $header[] = 'Error';
         }
 
@@ -131,15 +131,15 @@ 
         ]);
 
         $cnt = 1;
-        foreach($jobs as $cmd => $job) {
-            if($cnt > 1) $table->addRow(new TableSeparator());
+        foreach ($jobs as $cmd => $job) {
+            if ($cnt > 1) $table->addRow(new TableSeparator());
             $row = [
                 $cmd,
                 $job['period'],
                 ($job['last_exec'] ? date("d.m.Y H:i:s", $job['last_exec']) : 'NONE'),
                 $job['status'],
             ];
-            if($hasError) {
+            if ($hasError) {
                 $row[] = $job['error'];
             }
             $table->addRow($row);
@@ -168,11 +168,11 @@ 
          */
         $this->minAgentPeriod = (count($jobs) + 1) * EnvHelper::getBxCrontabPeriod();
 
-        if(!empty($jobs)) {
+        if (!empty($jobs)) {
 
-            foreach($jobs as $cmd => $job) {
+            foreach ($jobs as $cmd => $job) {
 
-                if($this->isActualJob($job)) {
+                if ($this->isActualJob($job)) {
 
                     $job['status'] = self::EXEC_STATUS_WORK;
                     $this->updaateJob($cmd, $job);
@@ -184,12 +184,12 @@ 
                         $timeStart = microtime(true);
                         $returnCode = $command->run($cmdInput, $output);
 
-                        if(!$returnCode) {
+                        if (!$returnCode) {
 
                             $job['status'] = self::EXEC_STATUS_SUCCESS;
 
                             $msg = sprintf("%s: SUCCESS [%.2f s]", $cmd, microtime(true) - $timeStart);
-                            if($this->logger) {
+                            if ($this->logger) {
                                 $this->logger->alert($msg);
                             }
                             $output->writeln(PHP_EOL . $msg);
@@ -200,7 +200,7 @@ 
                             $job['error_code'] = $returnCode;
 
                             $msg = sprintf("%s: ERROR [%.2f s]", $cmd, microtime(true) - $timeStart);
-                            if($this->logger) {
+                            if ($this->logger) {
                                 $this->logger->alert($msg);
                             }
                             $output->writeln(PHP_EOL . $msg);
@@ -212,7 +212,7 @@ 
                         $job['error'] = $e->getMessage();
 
 
-                        if($this->logger) {
+                        if ($this->logger) {
                             $this->logger->error($e, ['command' => $cmd]);
                         }
                         $output->writeln(PHP_EOL . 'ERROR: ' . $e->getMessage());
@@ -234,21 +234,21 @@ 
 
     protected function isActualJob(&$job) {
 
-        if(isset($job['status']) && $job['status'] !== self::EXEC_STATUS_SUCCESS) {
+        if (isset($job['status']) && $job['status'] !== self::EXEC_STATUS_SUCCESS) {
             return false;
         }
 
         $period = intval($job['period']);
 
-        if($period > 0) {
-            if($period < $this->minAgentPeriod) {
+        if ($period > 0) {
+            if ($period < $this->minAgentPeriod) {
                 $job['orig_period'] = $period;
                 $period = $job['period'] = $this->minAgentPeriod;
             }
-            if(time() - $job['last_exec'] >= $period) {
+            if (time() - $job['last_exec'] >= $period) {
                 return true;
             }
-        } else if(!empty($job['times'])) {
+        } else if (!empty($job['times'])) {
             //TODO:
         }
 
@@ -263,9 +263,9 @@ 
         $commands = $app->all();
 
         $selfCommands = [];
-        foreach($commands as $command) {
+        foreach ($commands as $command) {
             /** @var BxCommand $command */
-            if($command instanceof BxCommand) {
+            if ($command instanceof BxCommand) {
                 $name = $command->getName();
                 $selfCommands[$name] = [
                     'object' => $command,
@@ -275,12 +275,12 @@ 
 
         $agents = [];
         $reader = new AnnotationReader();
-        foreach($selfCommands as $cmd => $selfCommand) {
+        foreach ($selfCommands as $cmd => $selfCommand) {
             $reflectionClass = new \ReflectionClass($selfCommand['object']);
             $annotations = $reader->getClassAnnotations($reflectionClass);
 
-            foreach($annotations as $annotation) {
-                if($annotation instanceof Agent) {
+            foreach ($annotations as $annotation) {
+                if ($annotation instanceof Agent) {
                     $agents[$cmd] = $annotation->toArray();
                 }
             }
@@ -288,8 +288,8 @@ 
 
         $crontab = $this->getCronTab();
 
-        foreach($crontab as $cmd => $job) {
-            if(is_array($job) && isset($agents[$cmd])) {
+        foreach ($crontab as $cmd => $job) {
+            if (is_array($job) && isset($agents[$cmd])) {
                 $agents[$cmd] = array_merge($job, $agents[$cmd]);
             }
         }
@@ -323,7 +323,7 @@ 
         $fh = fopen($filename, 'c');
         if (flock($fh, LOCK_EX)) {
             ftruncate($fh, 0);
-            if(!fwrite($fh, json_encode($agents, JSON_PRETTY_PRINT))) {
+            if (!fwrite($fh, json_encode($agents, JSON_PRETTY_PRINT))) {
                 throw new \Exception('Unable to write BX_CRONTAB : ' . $filename);
             }
         }
@@ -341,10 +341,10 @@ 
         $filename = EnvHelper::getCrontabFile();
 
         $fh = fopen($filename, 'r');
-        if(flock($fh, LOCK_SH)) {
-            if($data = @fread($fh, filesize($filename))) {
+        if (flock($fh, LOCK_SH)) {
+            if ($data = @fread($fh, filesize($filename))) {
                 $decoded = json_decode($data, true);
-                if(is_array($decoded)) {
+                if (is_array($decoded)) {
                     $cronTab = $decoded;
                 }
             }
@@ -357,14 +357,14 @@ 
 
     protected function sortCronTab(array &$crontab, $sort = self::SORT_NAME) {
 
-        if($sort == self::SORT_TIME) {
+        if ($sort == self::SORT_TIME) {
             $sorting = [];
-            foreach($crontab as $cmd => $data) {
+            foreach ($crontab as $cmd => $data) {
                 $sorting[$cmd] = $data['last_exec'];
             }
             arsort($sorting, SORT_NUMERIC);
             $sorted = [];
-            foreach($sorting as $cmd => $time) {
+            foreach ($sorting as $cmd => $time) {
                 $sorted[$cmd] = $crontab[$cmd];
             }
             $crontab = $sorted;

Braces +6 added lines, -2 removed lines

@@ -101,7 +101,9 @@ 
 
         foreach($jobs as $cmd => $job) {
             $execTime = $job['last_exec'];
-            if($execTime > $lastExec) $lastExec = $execTime;
+            if($execTime > $lastExec) {
+                $lastExec = $execTime;
+            }
             if(!empty($job['error'])) {
                 $hasError = true;
             }
@@ -132,7 +134,9 @@ 
 
         $cnt = 1;
         foreach($jobs as $cmd => $job) {
-            if($cnt > 1) $table->addRow(new TableSeparator());
+            if($cnt > 1) {
+                $table->addRow(new TableSeparator());
+            }
             $row = [
                 $cmd,
                 $job['period'],