Merge pull request #42 from glenouvel/fix_wrong_channel_name

Ticket 354099 - fix wrong channelName when channel is locked
itkg · Feb 13, 2017 · dbf20e0 · dbf20e0
2 parents 0bb6a0e + 8521cca
commit dbf20e0
Showing 1 changed file with 25 additions and 15 deletions.
diff --git a/Command/LoggerStateChannelCommand.php b/Command/LoggerStateChannelCommand.php
@@ -107,31 +107,41 @@ protected function execute(InputInterface $input, OutputInterface $output)
         foreach ($locks as $lock) {
             if ($lock->isCommandLocked()) {
                 foreach ($this->channels as $key => $channel) {
-                    $this->loadChannelInfomation($key, $lock, $channel);
-                }
+                    if ($this->isLockedChannelInfomation($key, $lock, $channel, $output)) {
+
+                        $dateWithMaxTime = $lock->getLockedAt();
 
-                $dateWithMaxTime = $lock->getLockedAt();
-                $dateWithMaxTime->add(new DateInterval('PT' . $this->timeLimit . 'S'));
-                if (new \DateTime() > ($dateWithMaxTime)) {
-                    $this->notifier->process($this->channelName);
+                        $time = $channel['duration_limit_per_run'] + $this->extraTime;
+                        $dateWithMaxTime->add(
+                            new DateInterval('PT' . $time . 'S')
+                        );
+                        if (new \DateTime() > ($dateWithMaxTime)) {
+                            $this->notifier->process($key);
+                        }
+
+                        break;
+                    }
                 }
+
+
             }
         }
     }
 
     /**
-     * @param string $key
-     * @param Lock   $lock
-     * @param array  $channel
+     * @param      $key
+     * @param Lock $lock
+     * @param      $channel
+     * @return bool
      */
-    private function loadChannelInfomation($key, Lock $lock, $channel)
+    private function isLockedChannelInfomation($key, Lock $lock, $channel)
     {
-        $this->channelName = $key;
-        $this->timeLimit = $channel['duration_limit_per_run'] + $this->extraTime;
 
-        if (preg_match(sprintf('/^%s/', $key), $lock->getChannel()) && true === $channel['dynamic']) {
-            $this->channelName = $lock->getChannel();
-            $this->timeLimit = $channel['duration_limit_per_run'] + $this->extraTime;
+        if (preg_match(sprintf('/^%s/', $key), $lock->getChannel()) && true === $channel['dynamic'] || $key == $lock->getChannel() && false === $channel['dynamic']) {
+
+            return true;
         }
+
+        return false;
     }
 }