Jalle19 / tvheadend-status-manager

src/cli/Database/Base/InputQuery.php

Doc Comments +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
      * $obj  = $c->findPk(12, $con);
      * </code>
      *
-     * @param mixed $key Primary key to use for the query
+     * @param string $key Primary key to use for the query
      * @param ConnectionInterface $con an optional connection object
      *
      * @return ChildInput|array|mixed the result, formatted by the current formatter
@@ -510,7 +510,7 @@ 
     /**
      * Filter the query by a related \Jalle19\StatusManager\Database\Instance object
      *
-     * @param \Jalle19\StatusManager\Database\Instance|ObjectCollection $instance The related object(s) to use as filter
+     * @param Instance $instance The related object(s) to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @throws \Propel\Runtime\Exception\PropelException

src/cli/Database/Base/SubscriptionQuery.php

Doc Comments +7 added lines, -7 removed lines

@@ -424,7 +424,7 @@ 
      *
      * @see       filterByUser()
      *
-     * @param     mixed $userId The value to use as filter.
+     * @param     integer|null $userId The value to use as filter.
      *              Use scalar values for equality.
      *              Use array values for in_array() equivalent.
      *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
@@ -508,7 +508,7 @@ 
      * $query->filterBySubscriptionId(array('min' => 12)); // WHERE subscription_id > 12
      * </code>
      *
-     * @param     mixed $subscriptionId The value to use as filter.
+     * @param     integer $subscriptionId The value to use as filter.
      *              Use scalar values for equality.
      *              Use array values for in_array() equivalent.
      *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
@@ -549,7 +549,7 @@ 
      * $query->filterByStarted(array('max' => 'yesterday')); // WHERE started > '2011-03-13'
      * </code>
      *
-     * @param     mixed $started The value to use as filter.
+     * @param     integer $started The value to use as filter.
      *              Values can be integers (unix timestamps), DateTime objects, or strings.
      *              Empty strings are treated as NULL.
      *              Use scalar values for equality.
@@ -686,7 +686,7 @@ 
     /**
      * Filter the query by a related \Jalle19\StatusManager\Database\Instance object
      *
-     * @param \Jalle19\StatusManager\Database\Instance|ObjectCollection $instance The related object(s) to use as filter
+     * @param Instance $instance The related object(s) to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @throws \Propel\Runtime\Exception\PropelException
@@ -763,7 +763,7 @@ 
     /**
      * Filter the query by a related \Jalle19\StatusManager\Database\Input object
      *
-     * @param \Jalle19\StatusManager\Database\Input|ObjectCollection $input The related object(s) to use as filter
+     * @param Input $input The related object(s) to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @throws \Propel\Runtime\Exception\PropelException
@@ -840,7 +840,7 @@ 
     /**
      * Filter the query by a related \Jalle19\StatusManager\Database\User object
      *
-     * @param \Jalle19\StatusManager\Database\User|ObjectCollection $user The related object(s) to use as filter
+     * @param User $user The related object(s) to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @throws \Propel\Runtime\Exception\PropelException
@@ -917,7 +917,7 @@ 
     /**
      * Filter the query by a related \Jalle19\StatusManager\Database\Channel object
      *
-     * @param \Jalle19\StatusManager\Database\Channel|ObjectCollection $channel The related object(s) to use as filter
+     * @param Channel $channel The related object(s) to use as filter
      * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
      *
      * @throws \Propel\Runtime\Exception\PropelException

src/cli/PersistenceManager.php

Doc Comments +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
 
 
 	/**
-	 * @param                  $instanceName
+	 * @param                  string $instanceName
 	 * @param ConnectionStatus $connectionStatus
 	 *
 	 * @return bool whether the connection exists in the database

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();
 			}
 		}