Jalle19 / tvheadend-status-manager

src/cli/Event/Events.php

Indentation +7 added lines, -7 removed lines

@@ -12,13 +12,13 @@
 final class Events
 {
 
-    const MAIN_LOOP_STARTING      = 'mainLoop.starting';
-    const INSTANCE_STATUS_UPDATES = 'status.instanceUpdates';
+	const MAIN_LOOP_STARTING      = 'mainLoop.starting';
+	const INSTANCE_STATUS_UPDATES = 'status.instanceUpdates';
 
-    const INSTANCE_SEEN             = 'persistence.instanceSeen';
-    const CONNECTION_SEEN           = 'persistence.connectionSeen';
-    const INPUT_SEEN                = 'persistence.inputSeen';
-    const SUBSCRIPTION_SEEN         = 'persistence.subscriptionSeen';
-    const SUBSCRIPTION_STATE_CHANGE = 'persistence.subscriptionStateChange';
+	const INSTANCE_SEEN             = 'persistence.instanceSeen';
+	const CONNECTION_SEEN           = 'persistence.connectionSeen';
+	const INPUT_SEEN                = 'persistence.inputSeen';
+	const SUBSCRIPTION_SEEN         = 'persistence.subscriptionSeen';
+	const SUBSCRIPTION_STATE_CHANGE = 'persistence.subscriptionStateChange';
 
 }

src/cli/PersistenceManager.php

Braces +21 added lines, -14 removed lines

@@ -72,8 +72,9 @@ 
 	{
 		$instance = $event->getInstance();
 
-		if ($this->hasInstance($instance))
-			return;
+		if ($this->hasInstance($instance)) {
+					return;
+		}
 
 		$instanceModel = new Database\Instance();
 		$instanceModel->setPrimaryKey($instance->getHostname());
@@ -104,8 +105,9 @@ 
 		$instanceName     = $event->getInstance();
 		$connectionStatus = $event->getConnection();
 
-		if ($this->hasConnection($instanceName, $connectionStatus))
-			return;
+		if ($this->hasConnection($instanceName, $connectionStatus)) {
+					return;
+		}
 
 		$user = null;
 
@@ -177,8 +179,9 @@ 
 		$status       = $event->getSubscription();
 
 		// Ignore certain subscriptions
-		if (in_array($status->getType(), [SubscriptionStatus::TYPE_EPGGRAB, SubscriptionStatus::TYPE_SERVICE_OR_MUX]))
-			return;
+		if (in_array($status->getType(), [SubscriptionStatus::TYPE_EPGGRAB, SubscriptionStatus::TYPE_SERVICE_OR_MUX])) {
+					return;
+		}
 
 		// Determine the username to store for the subscription
 		$username = $status->username;
@@ -198,8 +201,9 @@ 
 		$this->onChannelSeen($instanceName, $status->channel);
 		$channel = ChannelQuery::create()->filterByInstance($instance)->filterByName($status->channel)->findOne();
 
-		if ($this->hasSubscription($instance, $user, $channel, $status))
-			return;
+		if ($this->hasSubscription($instance, $user, $channel, $status)) {
+					return;
+		}
 
 		// Try to determine which input is used by the subscription
 		$input = InputQuery::create()->filterBySubscriptionStatus($instanceName, $status)->findOne();
@@ -238,8 +242,9 @@ 
 		$stateChange  = $event->getStateChange();
 
 		// We only need to persist subscription stops
-		if ($stateChange->getState() === StateChange::STATE_SUBSCRIPTION_STARTED)
-			return;
+		if ($stateChange->getState() === StateChange::STATE_SUBSCRIPTION_STARTED) {
+					return;
+		}
 
 		// Find the latest matching subscription
 		$subscription = SubscriptionQuery::create()->filterByInstanceName($instanceName)
@@ -280,8 +285,9 @@ 
 	 */
 	private function onUserSeen($instanceName, $userName)
 	{
-		if ($this->hasUser($instanceName, $userName))
-			return;
+		if ($this->hasUser($instanceName, $userName)) {
+					return;
+		}
 
 		$user = new User();
 		$user->setInstanceName($instanceName)->setName($userName);
@@ -302,8 +308,9 @@ 
 	 */
 	private function onChannelSeen($instanceName, $channelName)
 	{
-		if ($this->hasChannel($instanceName, $channelName))
-			return;
+		if ($this->hasChannel($instanceName, $channelName)) {
+					return;
+		}
 
 		$channel = new Channel();
 		$channel->setInstanceName($instanceName)->setName($channelName);

src/cli/StatusManager.php

Braces +13 added lines, -12 removed lines

@@ -80,8 +80,9 @@ 
 		$this->_instances     = new \SplObjectStorage();
 
 		// Attach a state to each instance
-		foreach ($this->_configuration->getInstances() as $instance)
-			$this->_instances->attach($instance, new InstanceState());
+		foreach ($this->_configuration->getInstances() as $instance) {
+					$this->_instances->attach($instance, new InstanceState());
+		}
 
 		// Create manager instances
 		$this->_persistenceManager = new PersistenceManager($logger);
@@ -109,8 +110,9 @@ 
 			[Events::SUBSCRIPTION_STATE_CHANGE, $this->_persistenceManager, 'onSubscriptionStateChange'],
 		];
 
-		foreach ($eventDefinitions as $eventDefinition)
-			$this->_eventDispatcher->addListener($eventDefinition[0], [$eventDefinition[1], $eventDefinition[2]]);
+		foreach ($eventDefinitions as $eventDefinition) {
+					$this->_eventDispatcher->addListener($eventDefinition[0], [$eventDefinition[1], $eventDefinition[2]]);
+		}
 	}
 
 
@@ -192,8 +194,9 @@ 
 			}
 
 			// Persist inputs
-			foreach ($instanceStatus->getInputs() as $input)
-				$this->_eventDispatcher->dispatch(Events::INPUT_SEEN, new InputSeenEvent($instanceName, $input));
+			foreach ($instanceStatus->getInputs() as $input) {
+							$this->_eventDispatcher->dispatch(Events::INPUT_SEEN, new InputSeenEvent($instanceName, $input));
+			}
 
 			// Persist running subscriptions
 			foreach ($instanceStatus->getSubscriptions() as $subscription)
@@ -255,8 +258,7 @@ 
 
 						$instanceState->setReachability(InstanceState::REACHABLE);
 					}
-				}
-				catch (\Exception $e)
+				} catch (\Exception $e)
 				{
 					// Mark the instance as unreachable
 					$message = 'Instance {instanceName} not reachable, will wait for {cycles} cycles before retrying.
@@ -270,8 +272,7 @@ 
 
 					$instanceState->setReachability(InstanceState::UNREACHABLE);
 				}
-			}
-			else
+			} else
 			{
 				// Wait for some cycles and then mark unreachable instances as maybe reachable
 				if ($instanceState->getRetryCount() === self::UNREACHABLE_CYCLES_UNTIL_RETRY - 1)
@@ -282,9 +283,9 @@ 
 					$this->_logger->info('Retrying instance {instanceName} during next cycle', [
 						'instanceName' => $instanceName,
 					]);
+				} else {
+									$instanceState->incrementRetryCount();
 				}
-				else
-					$instanceState->incrementRetryCount();
 			}
 		}