@@ -115,8 +115,7 @@ |
||
115 | 115 | { |
116 | 116 | $_aFilteredJobList[] = $_sJobName; |
117 | 117 | } |
118 | - } |
|
119 | - else |
|
118 | + } else |
|
120 | 119 | { |
121 | 120 | if (!$this->oJobIndexService->isJobInIndex($_sJobName)) |
122 | 121 | { |
@@ -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); |
@@ -155,8 +155,7 @@ discard block |
||
155 | 155 | DIRECTORY_SEPARATOR, |
156 | 156 | $oJobEntity->getKey() |
157 | 157 | ); |
158 | - } |
|
159 | - else |
|
158 | + } else |
|
160 | 159 | { |
161 | 160 | $_sJobPath = $oJobEntity->getKey(); |
162 | 161 | } |
@@ -268,15 +267,19 @@ discard block |
||
268 | 267 | |
269 | 268 | if ($_aTemp) |
270 | 269 | { |
271 | - if (property_exists($_aTemp, 'name')) // chronos |
|
270 | + if (property_exists($_aTemp, 'name')) { |
|
271 | + // chronos |
|
272 | 272 | { |
273 | 273 | $_aJobEntities[] = new ChronosJobEntity($_aTemp); |
274 | + } |
|
274 | 275 | |
275 | - } else if (property_exists($_aTemp, 'id')) //marathon |
|
276 | + } else if (property_exists($_aTemp, 'id')) { |
|
277 | + //marathon |
|
276 | 278 | { |
277 | 279 | foreach ($this->getMarathonEntitiesForConfig($_aTemp) as $_oApp) |
278 | 280 | { |
279 | 281 | $_aJobEntities[] = $_oApp; |
282 | + } |
|
280 | 283 | } |
281 | 284 | } else { |
282 | 285 | throw new JobLoadException( |
@@ -297,8 +300,7 @@ discard block |
||
297 | 300 | $_aJobs[] = $_oJobEntity; |
298 | 301 | } |
299 | 302 | |
300 | - } |
|
301 | - else |
|
303 | + } else |
|
302 | 304 | { |
303 | 305 | throw new JobLoadException( |
304 | 306 | sprintf('Unable to load json job data from "%s". Please check if the json is valid.', $_sJobFilePath), |
@@ -323,8 +325,7 @@ discard block |
||
323 | 325 | $this->aGroupedApps[] = $_oApp->id; |
324 | 326 | $_aRet[] = $_oGroupEntity; |
325 | 327 | } |
326 | - } |
|
327 | - else |
|
328 | + } else |
|
328 | 329 | { |
329 | 330 | $_aRet[] = new MarathonAppEntity($aEntityData); |
330 | 331 | } |
@@ -317,8 +317,7 @@ |
||
317 | 317 | { |
318 | 318 | $_oDateTime = new \DateTime(str_replace('Z', '', $_oIso8601Entity->sStartTime)); |
319 | 319 | $_oDateTime->setTimezone(new \DateTimeZone($sTimeZone)); |
320 | - } |
|
321 | - else |
|
320 | + } else |
|
322 | 321 | { |
323 | 322 | $_oDateTime = new \DateTime($_oIso8601Entity->sStartTime); |
324 | 323 | } |
@@ -99,10 +99,12 @@ |
||
99 | 99 | { |
100 | 100 | if ($this->oRepositoryBridge->addJob($oJobEntity)) |
101 | 101 | { |
102 | - if (!is_null($this->oJobCollection)) // if no collection inited the new job will init by chronos request |
|
102 | + if (!is_null($this->oJobCollection)) { |
|
103 | + // if no collection inited the new job will init by chronos request |
|
103 | 104 | { |
104 | 105 | $this->oJobCollection->offsetSet($oJobEntity->getKey(), $oJobEntity); |
105 | 106 | } |
107 | + } |
|
106 | 108 | |
107 | 109 | return true; |
108 | 110 | } |
@@ -55,8 +55,7 @@ |
||
55 | 55 | $_mValue = (!empty($_mValue)) |
56 | 56 | ? json_encode($_mValue, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) |
57 | 57 | : $_sEmptyString; |
58 | - } |
|
59 | - elseif (is_bool($_mValue)) |
|
58 | + } elseif (is_bool($_mValue)) |
|
60 | 59 | { |
61 | 60 | $_mValue = (true === $_mValue) |
62 | 61 | ? 'true' |
@@ -133,6 +133,9 @@ |
||
133 | 133 | return !(count($arr) == count(array_unique($arr))); |
134 | 134 | } |
135 | 135 | |
136 | + /** |
|
137 | + * @param integer $iImmediateChildren |
|
138 | + */ |
|
136 | 139 | private function isDependencyCircular(MarathonAppEntity $oEntity, $iImmediateChildren, &$path=[]) |
137 | 140 | { |
138 | 141 | // Invariant: path will not have duplicates for acyclic dependency tree |
@@ -83,8 +83,7 @@ |
||
83 | 83 | )); |
84 | 84 | return false; |
85 | 85 | } |
86 | - } |
|
87 | - catch(\Exception $e) |
|
86 | + } catch(\Exception $e) |
|
88 | 87 | { |
89 | 88 | $this->oLogger->error(sprintf( |
90 | 89 | 'Job %s cannot be added to remote : %s',$sAppId, $e->getMessage() |
@@ -98,8 +98,8 @@ |
||
98 | 98 | } |
99 | 99 | |
100 | 100 | /** |
101 | - * @param $sMethod |
|
102 | - * @param $sUrl |
|
101 | + * @param string $sMethod |
|
102 | + * @param string $sUrl |
|
103 | 103 | * @param $mData |
104 | 104 | * @return HttpGuzzlResponse |
105 | 105 | */ |
@@ -59,48 +59,42 @@ |
||
59 | 59 | { |
60 | 60 | $_oResponse = $this->oGuzzelClient->request('GET', $sUrl, $_aRequestOptions); |
61 | 61 | return new HttpGuzzlResponse($_oResponse); |
62 | - } |
|
63 | - catch (ClientException $oException) // 400 level errors |
|
62 | + } catch (ClientException $oException) // 400 level errors |
|
64 | 63 | { |
65 | 64 | throw new HttpConnectionException( |
66 | 65 | sprintf('Client error: Calling %s returned %d', $this->oGuzzelClient->getConfig('base_uri') . $sUrl, $oException->getCode()), |
67 | 66 | $oException->getCode(), |
68 | 67 | $oException |
69 | 68 | ); |
70 | - } |
|
71 | - catch (ServerException $oException) // 500 level errors |
|
69 | + } catch (ServerException $oException) // 500 level errors |
|
72 | 70 | { |
73 | 71 | throw new HttpConnectionException( |
74 | 72 | sprintf('Server error: Calling %s returned %d', $this->oGuzzelClient->getConfig('base_uri') . $sUrl, $oException->getCode()), |
75 | 73 | $oException->getCode(), |
76 | 74 | $oException |
77 | 75 | ); |
78 | - } |
|
79 | - catch (TooManyRedirectsException $oException) // too many redirects to follow |
|
76 | + } catch (TooManyRedirectsException $oException) // too many redirects to follow |
|
80 | 77 | { |
81 | 78 | throw new HttpConnectionException( |
82 | 79 | sprintf('Request to %s failed due to too many redirects', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
83 | 80 | HttpConnectionException::ERROR_CODE_TOO_MANY_REDIRECT_EXCEPTION, |
84 | 81 | $oException |
85 | 82 | ); |
86 | - } |
|
87 | - catch (ConnectException $oException) // networking error |
|
83 | + } catch (ConnectException $oException) // networking error |
|
88 | 84 | { |
89 | 85 | throw new HttpConnectionException( |
90 | 86 | sprintf('Cannot connect to %s due to some networking error', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
91 | 87 | HttpConnectionException::ERROR_CODE_CONNECT_EXCEPTION, |
92 | 88 | $oException |
93 | 89 | ); |
94 | - } |
|
95 | - catch (RequestException $oException) // networking error (connection timeout, DNS errors, etc.) |
|
90 | + } catch (RequestException $oException) // networking error (connection timeout, DNS errors, etc.) |
|
96 | 91 | { |
97 | 92 | throw new HttpConnectionException( |
98 | 93 | sprintf('Cannot connect to %s due to networking error', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
99 | 94 | HttpConnectionException::ERROR_CODE_REQUEST_EXCEPTION, |
100 | 95 | $oException |
101 | 96 | ); |
102 | - } |
|
103 | - catch (\Exception $oException) |
|
97 | + } catch (\Exception $oException) |
|
104 | 98 | { |
105 | 99 | throw new HttpConnectionException( |
106 | 100 | sprintf('Can\'t get response from "%s"', $this->oGuzzelClient->getConfig('base_uri') . $sUrl), |
@@ -151,8 +151,7 @@ |
||
151 | 151 | if ($this->oJobComparisonBusinessCase->hasSameJobType($_oJobEntityLocal, $_oJobEntityChronos)) |
152 | 152 | { |
153 | 153 | $_bHasUpdatedJob = $this->oJobRepositoryRemote->updateJob($_oJobEntityLocal); |
154 | - } |
|
155 | - else |
|
154 | + } else |
|
156 | 155 | { |
157 | 156 | $_bHasUpdatedJob = ( |
158 | 157 | $this->oJobRepositoryRemote->removeJob($_oJobEntityChronos->getKey()) |
@@ -52,8 +52,7 @@ discard block |
||
52 | 52 | if (empty($aEntityNames)) |
53 | 53 | { |
54 | 54 | $_aRemoteEntities = $this->oJobRepositoryRemote->getJobs(); |
55 | - } |
|
56 | - else |
|
55 | + } else |
|
57 | 56 | { |
58 | 57 | $_aRemoteEntities = []; |
59 | 58 | foreach ($aEntityNames as $_sJobName) |
@@ -85,8 +84,7 @@ discard block |
||
85 | 84 | 'Entity %s stored in local repository', |
86 | 85 | $oAppRemote->getKey() |
87 | 86 | )); |
88 | - } |
|
89 | - else { |
|
87 | + } else { |
|
90 | 88 | $this->oLogger->error(sprintf( |
91 | 89 | 'Failed to store %s in local repository', |
92 | 90 | $oAppRemote->getKey() |
@@ -116,8 +114,7 @@ discard block |
||
116 | 114 | 'Entity %s is updated in local repository', |
117 | 115 | $oAppRemote->getKey() |
118 | 116 | )); |
119 | - } |
|
120 | - else { |
|
117 | + } else { |
|
121 | 118 | $this->oLogger->error(sprintf( |
122 | 119 | 'Failed to update app %s in local repository', |
123 | 120 | $oAppRemote->getKey() |