@@ -129,12 +129,12 @@ |
||
| 129 | 129 | ? 100 / $oJobEntity->successCount * $oJobEntity->errorCount |
| 130 | 130 | : 100; |
| 131 | 131 | |
| 132 | - $_aJobInfoText[] = 'errors rate: ' . round($_fErrorRate, 2) . '%'; |
|
| 132 | + $_aJobInfoText[] = 'errors rate: '.round($_fErrorRate, 2).'%'; |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | if ($oJobEntity->errorsSinceLastSuccess > 0) |
| 136 | 136 | { |
| 137 | - $_aJobInfoText[] = 'errors since last success:' . $oJobEntity->errorsSinceLastSuccess; |
|
| 137 | + $_aJobInfoText[] = 'errors since last success:'.$oJobEntity->errorsSinceLastSuccess; |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | return (!empty($_aJobInfoText)) |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | $this->loadParameterConfig($this->getWorkingDir(), '.chapiconfig', $_oContainer); |
| 100 | 100 | |
| 101 | 101 | // load services |
| 102 | - $_oLoader = new YamlFileLoader($_oContainer, new FileLocator(__DIR__ . self::FOLDER_RESOURCES)); |
|
| 102 | + $_oLoader = new YamlFileLoader($_oContainer, new FileLocator(__DIR__.self::FOLDER_RESOURCES)); |
|
| 103 | 103 | $_oLoader->load('services.yml'); |
| 104 | 104 | |
| 105 | 105 | self::$oContainer = $_oContainer; |
@@ -114,8 +114,8 @@ discard block |
||
| 114 | 114 | protected function isAppRunable() |
| 115 | 115 | { |
| 116 | 116 | if ( |
| 117 | - !file_exists($this->getHomeDir() . DIRECTORY_SEPARATOR . 'parameters.yml') |
|
| 118 | - && !file_exists($this->getWorkingDir() . DIRECTORY_SEPARATOR . '.chapiconfig') |
|
| 117 | + !file_exists($this->getHomeDir().DIRECTORY_SEPARATOR.'parameters.yml') |
|
| 118 | + && !file_exists($this->getWorkingDir().DIRECTORY_SEPARATOR.'.chapiconfig') |
|
| 119 | 119 | ) // one file have to exist |
| 120 | 120 | { |
| 121 | 121 | $this->oOutput->writeln(sprintf( |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | $_sHomeDir = getenv('CHAPI_HOME'); |
| 142 | 142 | if (!$_sHomeDir) |
| 143 | 143 | { |
| 144 | - $_sHomeDir = CommandUtils::getOsHomeDir() . DIRECTORY_SEPARATOR . '.chapi'; |
|
| 144 | + $_sHomeDir = CommandUtils::getOsHomeDir().DIRECTORY_SEPARATOR.'.chapi'; |
|
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | CommandUtils::hasCreateDirectoryIfNotExists($_sHomeDir); |
@@ -154,7 +154,7 @@ discard block |
||
| 154 | 154 | */ |
| 155 | 155 | protected function getCacheDir() |
| 156 | 156 | { |
| 157 | - $_sCacheDir = $this->getHomeDir() . DIRECTORY_SEPARATOR . 'cache'; |
|
| 157 | + $_sCacheDir = $this->getHomeDir().DIRECTORY_SEPARATOR.'cache'; |
|
| 158 | 158 | CommandUtils::hasCreateDirectoryIfNotExists($_sCacheDir); |
| 159 | 159 | |
| 160 | 160 | return $_sCacheDir; |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | private function loadParameterConfig($sPath, $sFile, $oContainer) |
| 177 | 177 | { |
| 178 | 178 | // load local parameters |
| 179 | - if (file_exists($sPath . DIRECTORY_SEPARATOR . $sFile)) |
|
| 179 | + if (file_exists($sPath.DIRECTORY_SEPARATOR.$sFile)) |
|
| 180 | 180 | { |
| 181 | 181 | $_oLoader = new YamlFileLoader($oContainer, new FileLocator($sPath)); |
| 182 | 182 | $_oLoader->load($sFile); |
@@ -116,12 +116,14 @@ |
||
| 116 | 116 | if ( |
| 117 | 117 | !file_exists($this->getHomeDir() . DIRECTORY_SEPARATOR . 'parameters.yml') |
| 118 | 118 | && !file_exists($this->getWorkingDir() . DIRECTORY_SEPARATOR . '.chapiconfig') |
| 119 | - ) // one file have to exist |
|
| 119 | + ) { |
|
| 120 | + // one file have to exist |
|
| 120 | 121 | { |
| 121 | 122 | $this->oOutput->writeln(sprintf( |
| 122 | 123 | '<error>%s</error>', |
| 123 | 124 | 'No parameter file found. Please run "configure" command for initial setup or add a local `.chapiconfig` to your working directory.' |
| 124 | 125 | )); |
| 126 | + } |
|
| 125 | 127 | return false; |
| 126 | 128 | } |
| 127 | 129 | |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | $_iStartTime = ($_sStartTime == null) ? $_iCurrentTime : strtotime($_sStartTime); |
| 74 | 74 | if ($_sStartTime != null && $_iStartTime < $_iCurrentTime) |
| 75 | 75 | { |
| 76 | - $_iStartTime = strtotime($_sStartTime . ' + 24 hours'); |
|
| 76 | + $_iStartTime = strtotime($_sStartTime.' + 24 hours'); |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | $_iEndTime = ($_sEndTime == null) ? $_iStartTime + 7200 : strtotime($_sEndTime); |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | $_oTable = new Table($this->oOutput); |
| 96 | 96 | $_oTable->setHeaders(array( |
| 97 | 97 | 'Job', |
| 98 | - 'Timeline for ' . date('Y-m-d H:i', $iStartTime) . ' till ' . date('Y-m-d H:i', $iEndTime) |
|
| 98 | + 'Timeline for '.date('Y-m-d H:i', $iStartTime).' till '.date('Y-m-d H:i', $iEndTime) |
|
| 99 | 99 | )); |
| 100 | 100 | |
| 101 | 101 | $_aJobs = $this->getJobsWhichShouldStartInPeriod($iStartTime, $iEndTime); |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | |
| 164 | 164 | $oTable->addRow( |
| 165 | 165 | array( |
| 166 | - str_repeat(' ', $iCurrentChildLevel) . '|_ ' . $_sChildJobName, |
|
| 166 | + str_repeat(' ', $iCurrentChildLevel).'|_ '.$_sChildJobName, |
|
| 167 | 167 | $this->getTimelineStr( |
| 168 | 168 | $oDisplayPeriod, |
| 169 | 169 | $oJobDatePeriod, |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | { |
| 318 | 318 | if ($iJobStartTimeDelay > 0) |
| 319 | 319 | { |
| 320 | - $_oJobTime->add(new \DateInterval('PT' . $iJobStartTimeDelay . 'S')); |
|
| 320 | + $_oJobTime->add(new \DateInterval('PT'.$iJobStartTimeDelay.'S')); |
|
| 321 | 321 | } |
| 322 | 322 | |
| 323 | 323 | $_aStartTimes[$_oJobTime->format('YmdHi')] = $_oJobTime; |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | md5($sCachePrefix), |
| 37 | 37 | 0, |
| 38 | 38 | 6 |
| 39 | - ) . '.'; |
|
| 39 | + ).'.'; |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | /** |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | */ |
| 48 | 48 | public function set($sKey, $mValue, $iTTL = 0) |
| 49 | 49 | { |
| 50 | - return $this->oDoctrineCache->save($this->sCachePrefix . $sKey, $mValue, $iTTL); |
|
| 50 | + return $this->oDoctrineCache->save($this->sCachePrefix.$sKey, $mValue, $iTTL); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /** |
@@ -56,8 +56,8 @@ discard block |
||
| 56 | 56 | */ |
| 57 | 57 | public function get($sKey) |
| 58 | 58 | { |
| 59 | - return ($this->oDoctrineCache->contains($this->sCachePrefix . $sKey)) |
|
| 60 | - ? $this->oDoctrineCache->fetch($this->sCachePrefix . $sKey) |
|
| 59 | + return ($this->oDoctrineCache->contains($this->sCachePrefix.$sKey)) |
|
| 60 | + ? $this->oDoctrineCache->fetch($this->sCachePrefix.$sKey) |
|
| 61 | 61 | : null |
| 62 | 62 | ; |
| 63 | 63 | } |
@@ -68,6 +68,6 @@ discard block |
||
| 68 | 68 | */ |
| 69 | 69 | public function delete($sKey) |
| 70 | 70 | { |
| 71 | - return $this->oDoctrineCache->delete($this->sCachePrefix . $sKey); |
|
| 71 | + return $this->oDoctrineCache->delete($this->sCachePrefix.$sKey); |
|
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | \ No newline at end of file |
@@ -57,9 +57,11 @@ discard block |
||
| 57 | 57 | $_oDateIntervalEpsilon = new \DateInterval($oJobEntity->epsilon); |
| 58 | 58 | $_iIntervalEpsilon = (int) $_oDateIntervalEpsilon->format('%Y%M%D%H%I%S'); |
| 59 | 59 | |
| 60 | - if ($_iIntervalEpsilon > 30) // if epsilon > "PT30S" |
|
| 60 | + if ($_iIntervalEpsilon > 30) { |
|
| 61 | + // if epsilon > "PT30S" |
|
| 61 | 62 | { |
| 62 | 63 | $_oIso8601Entity = $this->oDatePeriodFactory->createIso8601Entity($oJobEntity->schedule); |
| 64 | + } |
|
| 63 | 65 | |
| 64 | 66 | $_oDateIntervalScheduling = new \DateInterval($_oIso8601Entity->sInterval); |
| 65 | 67 | $_iIntervalScheduling = (int) $_oDateIntervalScheduling->format('%Y%M%D%H%I%S'); |
@@ -69,8 +71,7 @@ discard block |
||
| 69 | 71 | |
| 70 | 72 | // if epsilon is less or equal than 30sec the not empty check is enough |
| 71 | 73 | return true; |
| 72 | - } |
|
| 73 | - catch (\Exception $_oException) |
|
| 74 | + } catch (\Exception $_oException) |
|
| 74 | 75 | { |
| 75 | 76 | // can't init \DateInterval instance |
| 76 | 77 | return false; |
@@ -62,8 +62,7 @@ |
||
| 62 | 62 | { |
| 63 | 63 | $_oDataPeriod = $this->oDatePeriodFactory->createDatePeriod($oJobEntity->schedule, $oJobEntity->scheduleTimeZone); |
| 64 | 64 | return (false !== $_oDataPeriod); |
| 65 | - } |
|
| 66 | - catch (\Exception $oException) |
|
| 65 | + } catch (\Exception $oException) |
|
| 67 | 66 | { |
| 68 | 67 | // invalid: Iso8601 is not valid and/or DatePeriodFactory is able to create a valid DatePeriod |
| 69 | 68 | } |
@@ -347,6 +347,9 @@ |
||
| 347 | 347 | } |
| 348 | 348 | |
| 349 | 349 | |
| 350 | + /** |
|
| 351 | + * @param string $sJobFile |
|
| 352 | + */ |
|
| 350 | 353 | private function dumpFileWithGroup($sJobFile, JobEntityInterface $oJobEntity, $bAdd = true) |
| 351 | 354 | { |
| 352 | 355 | $_sGroupConfig = file_get_contents($sJobFile); |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | $_sJobPath = $oJobEntity->getKey(); |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | - return $this->sRepositoryDir . DIRECTORY_SEPARATOR . $_sJobPath . '.json'; |
|
| 164 | + return $this->sRepositoryDir.DIRECTORY_SEPARATOR.$_sJobPath.'.json'; |
|
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | /** |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | throw new \RuntimeException(sprintf('Path "%s" is not valid', $sPath)); |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | - $_aTemp = Glob::glob(rtrim($sPath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . '*'); |
|
| 179 | + $_aTemp = Glob::glob(rtrim($sPath, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR.'*'); |
|
| 180 | 180 | |
| 181 | 181 | foreach ($_aTemp as $_sPath) |
| 182 | 182 | { |
@@ -183,7 +183,8 @@ discard block |
||
| 183 | 183 | if (is_file($_sPath) && preg_match('~\.json~i', $_sPath)) |
| 184 | 184 | { |
| 185 | 185 | $aJobFiles[] = $_sPath; |
| 186 | - } elseif (is_dir($_sPath)) |
|
| 186 | + } |
|
| 187 | + elseif (is_dir($_sPath)) |
|
| 187 | 188 | { |
| 188 | 189 | $this->getJobFilesFromFileSystem($_sPath, $aJobFiles); |
| 189 | 190 | } |
@@ -268,17 +269,23 @@ discard block |
||
| 268 | 269 | |
| 269 | 270 | if ($_aTemp) |
| 270 | 271 | { |
| 271 | - if (property_exists($_aTemp, 'name')) // chronos |
|
| 272 | + if (property_exists($_aTemp, 'name')) { |
|
| 273 | + // chronos |
|
| 272 | 274 | { |
| 273 | 275 | $_aJobEntities[] = new ChronosJobEntity($_aTemp); |
| 276 | + } |
|
| 274 | 277 | |
| 275 | - } else if (property_exists($_aTemp, 'id')) //marathon |
|
| 278 | + } |
|
| 279 | + else if (property_exists($_aTemp, 'id')) { |
|
| 280 | + //marathon |
|
| 276 | 281 | { |
| 277 | 282 | foreach ($this->getMarathonEntitiesForConfig($_aTemp) as $_oApp) |
| 278 | 283 | { |
| 279 | 284 | $_aJobEntities[] = $_oApp; |
| 285 | + } |
|
| 280 | 286 | } |
| 281 | - } else { |
|
| 287 | + } |
|
| 288 | + else { |
|
| 282 | 289 | throw new JobLoadException( |
| 283 | 290 | 'Could not distinguish job as either chronos or marathon', |
| 284 | 291 | JobLoadException::ERROR_CODE_UNKNOWN_ENTITY_TYPE |
@@ -385,7 +392,8 @@ discard block |
||
| 385 | 392 | } |
| 386 | 393 | return false; |
| 387 | 394 | } |
| 388 | - } else { |
|
| 395 | + } |
|
| 396 | + else { |
|
| 389 | 397 | $_oDecodedConfig->apps[$key] = $oJobEntity; |
| 390 | 398 | } |
| 391 | 399 | $_bAppFound = true; |
@@ -10,7 +10,6 @@ |
||
| 10 | 10 | namespace Chapi\Service\JobValidator\PropertyValidator; |
| 11 | 11 | |
| 12 | 12 | |
| 13 | -use Chapi\Entity\Chronos\JobEntity; |
|
| 14 | 13 | use Chapi\Entity\JobEntityInterface; |
| 15 | 14 | use Chapi\Service\JobValidator\PropertyValidatorInterface; |
| 16 | 15 | |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | */ |
| 28 | 28 | public static function setAllPossibleProperties($oData, $oTarget) |
| 29 | 29 | { |
| 30 | - foreach($oData as $attrName => $attrValue) |
|
| 30 | + foreach ($oData as $attrName => $attrValue) |
|
| 31 | 31 | { |
| 32 | 32 | // dont set array or objects. |
| 33 | 33 | // Because this would need further type information to properly set. |