Default command is restart and not reload ...

ddurieux · Dec 10, 2015 · 74754f6 · 74754f6
1 parent 3bf5816
commit 74754f6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/front/restartshinken.form.php b/front/restartshinken.form.php
@@ -47,7 +47,7 @@
 $pmShinkenwebservice = new PluginMonitoringShinkenwebservice();
 if (isset($_GET["tag"])) {
    Toolbox::logInFile("pm-restart", "call sendRestartArbiter, tag: " . $_GET["tag"] . "\n");
-   $pmShinkenwebservice->sendRestartArbiter(1, $_GET["tag"], isset($_GET["action"]) ? $_GET["action"] : 'reload');
+   $pmShinkenwebservice->sendRestartArbiter(1, $_GET["tag"], isset($_GET["action"]) ? $_GET["action"] : 'restart');
 } else {
    Toolbox::logInFile("pm-restart", "call sendRestartArbiter, no tag\n");
    $pmShinkenwebservice->sendRestartArbiter(1);

diff --git a/inc/message.class.php b/inc/message.class.php
@@ -220,7 +220,6 @@ class='msgboxmonit msgboxmonit-grey' id='updated_elements'>";
          // Try to restart Shinken via webservice
          $pmShinkenwebservice = new PluginMonitoringShinkenwebservice();
          $pmShinkenwebservice->sendRestartArbiter();
-         Toolbox::logInFile("pm-restart", "sendRestartArbiter, command : $command, tag: $tag, force: $force\n");
          $input .= __('Shinken is restarted automatically', 'monitoring');
          //$input .= __('Restart Shinken to reload this new configuration', 'monitoring');
       }

diff --git a/inc/shinkenwebservice.class.php b/inc/shinkenwebservice.class.php
@@ -142,12 +142,14 @@ function sendDowntime($host_id=-1, $service_id=-1, $author= '', $comment='', $fl
    }
 
 
-   function sendRestartArbiter($force=0, $tag=0, $command='reload') {
+   function sendRestartArbiter($force=0, $tag=0, $command='restart') {
 
       $pmTag = new PluginMonitoringTag();
       $pmLog = new PluginMonitoringLog();
 
       Toolbox::logInFile("pm-restart", "sendRestartArbiter, command : $command, tag: $tag, force: $force\n");
+      // We should specify delay instead of default 20 minutes ...
+      // if (!$pmLog->isRestartRecent(1200)
       if (!$pmLog->isRestartRecent()
               || $force) {
          if ($tag > 0) {