fix(broker): fix wizard broker configuration with one peer retention #6959

kduret · 2018-11-08T15:34:12Z

callapa · 2018-12-04T16:16:36Z

src/Centreon/Domain/Repository/CfgCentreonBrokerRepository.php

+use Centreon\Domain\Repository\Interfaces\CfgCentreonBrokerInterface;
+use Centreon\Infrastructure\Service\Exception\NotFoundException;
+
+class CfgCentreonBrokerRepository extends ServiceEntityRepository implements CfgCentreonBrokerInterface


Add comment for this class header

callapa · 2018-12-04T16:18:37Z

src/Centreon/Domain/Repository/CfgCentreonBrokerRepository.php

+        return $result;
+    }
+
+    public function truncate()


Add comments to explain which tables are affected

callapa · 2018-12-04T16:22:56Z

src/CentreonRemote/Application/Clapi/CentreonWorker.php

+
+        echo "{$datetime} - Checking for pending export tasks: " . count($tasks) . " task(s) found\n";
+
+        foreach ($tasks as $x => $task) {


If you don't use keys in foreach use array_values($tasks) as $task instead

callapa · 2018-12-04T16:28:28Z

src/CentreonRemote/Application/Clapi/CentreonWorker.php

+            try {
+                $this->getDi()['centreon_remote.export']->export($commitment);
+            } catch (\Exception $e) {
+                echo $e->__toString() . "\n";


This will show the stack trace also, is it expected?

callapa · 2018-12-04T16:29:38Z

src/CentreonRemote/Application/Clapi/CentreonWorker.php

+
+        echo "{$datetime} - Checking for pending import tasks: " . count($tasks) . " task(s) found\n";
+
+        foreach ($tasks as $x => $task) {


If you don't use keys in foreach use array_values($tasks) as $task instead

callapa · 2018-12-04T17:11:34Z

src/CentreonRemote/Domain/Service/PollerDefaultsOverwriteService.php

+            $data,
+            'ns_nagios_server',
+            'CentreonRemote\Domain\Resources\DefaultConfig\CfgCentreonBroker'
+        );
    }

    public function setCfgCentreonBrokerInfo(array $data)


Please add comments in the header of this method.

callapa · 2018-12-04T17:15:40Z

src/CentreonRemote/Domain/Service/TaskService.php

@@ -148,13 +186,13 @@ public function getStatusByParent(int $parentId)
     */
    public function updateStatus(string $taskId, string $status)


Don't forget to explain the returned array structure.
When the returned value may not have the same structure, you can use this annotation @return type1 | type2

callapa · 2018-12-04T17:16:28Z

src/CentreonRemote/Domain/Value/ServerWizardIdentity.php

@@ -17,7 +17,7 @@ public function requestConfigurationIsPoller()
        return !static::requestConfigurationIsRemote();
    }

-    public function fetchIfServerInstalledBam($ip, $centreonPath)
+    public function checkBamOnRemoteServer($ip, $centreonPath)


Don't forget to add comments in the header of this method.

callapa · 2018-12-04T17:19:24Z

src/CentreonRemote/Infrastructure/Export/ExportCommitment.php

@@ -42,8 +42,14 @@
     * @param string $path
     * @param array $exporters
     */
-    public function __construct(int $remote = null, array $pollers = null, array $meta = null, ExportParserInterface $parser = null, string $path = null, array $exporters = null)


Don't forget to explain parameters

callapa · 2018-12-04T17:22:07Z

src/CentreonRemote/Domain/Resources/DefaultConfig/CfgCentreonBrokerInfo.php

+
+class CfgCentreonBrokerInfo
+{
+    public static function getConfiguration()


Don't forget to describe the returned array structure

…mode

Refs: #6910 #6978 #6987

* fix(remote-server): Update authorizedMaster value using enableRemote * enh(remote-server): authorize multiple master

…6959) * fix(broker): fix wizard broker configuration with one peer retention mode * enh(broker): add poller name in one peer retention configuration name Refs: #6910 #6978 #6987 * add comments * fix broker configuration methods * Remote server add multiple authorized master (#7063) * fix(remote-server): Update authorizedMaster value using enableRemote * enh(remote-server): authorize multiple master * fix syntax error * improve centcore debug * fix bam broker configuration on remote server * test(ut): fix unit tests of remote server * test(ut): update value of mocked constants

leoncx approved these changes Nov 8, 2018

View reviewed changes

sc979 requested review from v-radev, callapa and victorvassilev and removed request for v-radev November 8, 2018 15:53

victorvassilev approved these changes Nov 9, 2018

View reviewed changes

lpinsivy added kind/bug area/configuration priority/major labels Nov 13, 2018

kduret force-pushed the MON-3171-fix-wizard-one-peer-retention branch 2 times, most recently from a7442a0 to b192b2b Compare November 29, 2018 16:32

kduret force-pushed the MON-3171-fix-wizard-one-peer-retention branch from 2713890 to a90c1fa Compare December 4, 2018 16:08

callapa suggested changes Dec 4, 2018

View reviewed changes

kduret force-pushed the MON-3171-fix-wizard-one-peer-retention branch from 9798dc9 to b8bb937 Compare December 6, 2018 15:37

lpinsivy mentioned this pull request Dec 17, 2018

Remote server add multiple authorized master #7063

Merged

kduret force-pushed the MON-3171-fix-wizard-one-peer-retention branch 2 times, most recently from 1cfb343 to 567ef3f Compare December 31, 2018 10:24

kduret and others added 10 commits December 31, 2018 11:25

fix(broker): fix wizard broker configuration with one peer retention …

a6316df

…mode

enh(broker): add poller name in one peer retention configuration name

4297dc6

Refs: #6910 #6978 #6987

add comments

82aca05

fix broker configuration methods

1e6029c

Remote server add multiple authorized master (#7063)

2ed15c4

* fix(remote-server): Update authorizedMaster value using enableRemote * enh(remote-server): authorize multiple master

fix syntax error

e313f3d

improve centcore debug

6198f9c

fix bam broker configuration on remote server

567ef3f

test(ut): fix unit tests of remote server

267b31e

test(ut): update value of mocked constants

916e9ec

kduret merged commit ebe36ac into master Jan 14, 2019

kduret deleted the MON-3171-fix-wizard-one-peer-retention branch January 14, 2019 17:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(broker): fix wizard broker configuration with one peer retention #6959

fix(broker): fix wizard broker configuration with one peer retention #6959

kduret commented Nov 8, 2018 •

edited

Loading

callapa Dec 4, 2018

callapa Dec 4, 2018

callapa Dec 4, 2018

callapa Dec 4, 2018

callapa Dec 4, 2018

callapa Dec 4, 2018

callapa Dec 4, 2018

callapa Dec 4, 2018

callapa Dec 4, 2018

callapa Dec 4, 2018


		echo "{$datetime} - Checking for pending export tasks: " . count($tasks) . " task(s) found\n";

		foreach ($tasks as $x => $task) {

		@@ -148,13 +186,13 @@ public function getStatusByParent(int $parentId)
		*/
		public function updateStatus(string $taskId, string $status)

fix(broker): fix wizard broker configuration with one peer retention #6959

fix(broker): fix wizard broker configuration with one peer retention #6959

Conversation

kduret commented Nov 8, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kduret commented Nov 8, 2018 •

edited

Loading