Jalle19 / tvheadend-status-manager

src/cli/StatusManager.php

Braces +19 added lines, -16 removed lines

@@ -70,8 +70,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());
+		}
 
 		// Start the persistence manager
 		$this->_persistenceManager = new PersistenceManager($logger);
@@ -147,20 +148,24 @@ 
 			]);
 
 			// Persist connections
-			foreach ($instanceStatus->getConnections() as $connection)
-				$this->_persistenceManager->onConnectionSeen($instanceName, $connection);
+			foreach ($instanceStatus->getConnections() as $connection) {
+							$this->_persistenceManager->onConnectionSeen($instanceName, $connection);
+			}
 
 			// Persist inputs
-			foreach($instanceStatus->getInputs() as $input)
-				$this->_persistenceManager->onInputSeen($instanceName, $input);
+			foreach($instanceStatus->getInputs() as $input) {
+							$this->_persistenceManager->onInputSeen($instanceName, $input);
+			}
 
 			// Persist running subscriptions
-			foreach ($instanceStatus->getSubscriptions() as $subscription)
-				$this->_persistenceManager->onSubscriptionSeen($instanceName, $subscription);
+			foreach ($instanceStatus->getSubscriptions() as $subscription) {
+							$this->_persistenceManager->onSubscriptionSeen($instanceName, $subscription);
+			}
 
 			// Handle subscription state changes
-			foreach ($instanceStatus->getSubscriptionStateChanges() as $subscriptionStateChange)
-				$this->_persistenceManager->onSubscriptionStateChange($instanceName, $subscriptionStateChange);
+			foreach ($instanceStatus->getSubscriptionStateChanges() as $subscriptionStateChange) {
+							$this->_persistenceManager->onSubscriptionStateChange($instanceName, $subscriptionStateChange);
+			}
 		}
 
 		// Broadcast the status messages to all connected clients
@@ -208,8 +213,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.
@@ -223,8 +227,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)
@@ -235,9 +238,9 @@ 
 					$this->_logger->info('Retrying instance {instanceName} during next cycle', [
 						'instanceName' => $instanceName,
 					]);
+				} else {
+									$instanceState->incrementRetryCount();
 				}
-				else
-					$instanceState->incrementRetryCount();
 			}
 		}