RemoteApi: allow to restart the daemon

fixes #406

application/clicommands/DaemonCommand.php

@@ -3,6 +3,7 @@
 namespace Icinga\Module\Vspheredb\Clicommands;
 
 use gipfl\SimpleDaemon\Daemon;
+use Icinga\Module\Vspheredb\Daemon\RpcNamespace\RpcNamespaceProcess;
 use Icinga\Module\Vspheredb\Daemon\VsphereDbDaemon;
 
 class DaemonCommand extends Command
@@ -20,7 +21,11 @@ public function runAction()
  $this->assertNoVcenterParam();
  $daemon = new Daemon();
  $daemon->setLogger($this->logger);
- $daemon->attachTask(new VsphereDbDaemon());
+ $vSphereDb = new VsphereDbDaemon();
+ $vSphereDb->on(RpcNamespaceProcess::ON_RESTART, function () use ($daemon) {
+ $daemon->reload();
+ });
+ $daemon->attachTask($vSphereDb);
  $daemon->run($this->loop());
  $this->eventuallyStartMainLoop();
  }

application/controllers/DaemonController.php

@@ -7,12 +7,14 @@
 use gipfl\Web\Widget\Hint;
 use Icinga\Date\DateFormatter;
 use Icinga\Module\Vspheredb\Web\Form\LogLevelForm;
+use Icinga\Module\Vspheredb\Web\Form\RestartDaemonForm;
 use Icinga\Module\Vspheredb\Web\Table\ControlSocketConnectionsTable;
 use Icinga\Module\Vspheredb\Format;
 use Icinga\Module\Vspheredb\Web\Controller;
 use Icinga\Module\Vspheredb\Web\Table\VsphereApiConnectionTable;
 use Icinga\Module\Vspheredb\Web\Tabs\MainTabs;
 use Icinga\Module\Vspheredb\WebUtil;
+use Icinga\Web\Notification;
 use ipl\Html\Html;
 use ipl\Html\Table;
 
@@ -70,7 +72,14 @@ protected function prepareDaemonInfo()
  WebUtil::timeAgo($daemon->ts_last_refresh / 1000)
  ));
  } else {
- return $this->prepareProcessTable(JsonString::decode($daemon->process_info));
+ $restartForm = new RestartDaemonForm($this->remoteClient(), $this->loop());
+ $restartForm->on($restartForm::ON_SUCCESS, function () {
+ Notification::success('Daemon has been asked to restart');
+ $this->redirectNow($this->url());
+ });
+ $restartForm->handleRequest($this->getServerRequest());
+
+ return [$restartForm, $this->prepareProcessTable(JsonString::decode($daemon->process_info))];
  }
  } else {
  return Hint::error($this->translate('Daemon is either not running or not connected to the Database'));

doc/84-Changelog.md

@@ -14,6 +14,7 @@ place.
 
 ### UI
 * FEATURE: connection health icons now show more details (#400)
+* FEATURE: the daemon can now be restarted from the web UI (#406)
 * FIX: links pointing to the VMware HTML5 UI have now work on v6.7 and v7.x (#209)
 * FIX: issues with dark/light mode in Icinga Web have been addressed (#355)
 * FIX: Monitoring Rules documentation link was missing (#360)

library/Vspheredb/Daemon/RemoteApi.php

@@ -2,6 +2,8 @@
 
 namespace Icinga\Module\Vspheredb\Daemon;
 
+use Evenement\EventEmitterInterface;
+use Evenement\EventEmitterTrait;
 use Exception;
 use gipfl\Curl\CurlAsync;
 use gipfl\Log\Logger;
@@ -12,6 +14,7 @@
 use gipfl\Protocol\NetString\StreamWrapper;
 use gipfl\Socket\UnixSocketInspection;
 use gipfl\Socket\UnixSocketPeer;
+use Icinga\Module\Vspheredb\Daemon\RpcNamespace\RpcNamespaceProcess;
 use Icinga\Module\Vspheredb\Daemon\RpcNamespace\RpcNamespaceCurl;
 use Icinga\Module\Vspheredb\Daemon\RpcNamespace\RpcNamespaceInfluxDb;
 use Icinga\Module\Vspheredb\Daemon\RpcNamespace\RpcNamespaceLogger;
@@ -21,10 +24,13 @@
 use Psr\Log\LoggerInterface;
 use React\EventLoop\LoopInterface;
 use React\Socket\ConnectionInterface;
+use React\Stream\Util;
 use function posix_getegid;
 
-class RemoteApi
+class RemoteApi implements EventEmitterInterface
 {
+ use EventEmitterTrait;
+
  /** @var LoggerInterface */
  protected $logger;
 
@@ -106,7 +112,10 @@ protected function addSocketEventHandlers(ControlSocket $socket)
  return;
  }
 
+ $rpcProcess = new RpcNamespaceProcess($this->loop);
+ Util::forwardEvents($rpcProcess, $this, [RpcNamespaceProcess::ON_RESTART]);
  $handler = new NamespacedPacketHandler();
+ $handler->registerNamespace('process', $rpcProcess);
  $handler->registerNamespace('system', new RpcNamespaceSystem());
  $handler->registerNamespace('vsphere', new RpcNamespaceVsphere($this->apiConnectionHandler));
  $handler->registerNamespace('influxdb', new RpcNamespaceInfluxDb($this->curl, $this->loop, $this->logger));

library/Vspheredb/Daemon/RpcNamespace/RpcNamespaceProcess.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace Icinga\Module\Vspheredb\Daemon\RpcNamespace;
+
+use Evenement\EventEmitterInterface;
+use Evenement\EventEmitterTrait;
+use React\EventLoop\LoopInterface;
+
+class RpcNamespaceProcess implements EventEmitterInterface
+{
+ use EventEmitterTrait;
+
+ const ON_RESTART = 'restart';
+
+ /** @var LoopInterface */
+ protected $loop;
+
+ public function __construct(LoopInterface $loop)
+ {
+ $this->loop = $loop;
+ }
+
+ /*
+ public function infoRequest()
+ {
+ return $this->prepareProcessInfo($this->daemon);
+ }
+
+ protected function prepareProcessInfo(Daemon $daemon)
+ {
+ $details = $this->daemon->getProcessDetails()->getPropertiesToInsert();
+ $details['process_info'] = \json_decode($details['process_info']);
+
+ return (object) [
+ 'state' => $this->daemon->getProcessState()->getInfo(),
+ 'details' => (object) $details,
+ ];
+ }
+ */
+
+ /**
+ * @return bool
+ */
+ public function restartRequest()
+ {
+ // Grant some time to ship the response
+ $this->loop->addTimer(0.1, function () {
+ $this->emit(self::ON_RESTART);
+ });
+
+ return true;
+ }
+}

library/Vspheredb/Daemon/VsphereDbDaemon.php

@@ -2,6 +2,8 @@
 
 namespace Icinga\Module\Vspheredb\Daemon;
 
+use Evenement\EventEmitterInterface;
+use Evenement\EventEmitterTrait;
 use Exception;
 use gipfl\Cli\Process;
 use gipfl\Curl\CurlAsync;
@@ -17,6 +19,7 @@
 use Icinga\Data\ConfigObject;
 use Icinga\Module\Vspheredb\Application\MemoryLimit;
 use Icinga\Module\Vspheredb\Configuration;
+use Icinga\Module\Vspheredb\Daemon\RpcNamespace\RpcNamespaceProcess;
 use Icinga\Module\Vspheredb\Db;
 use Icinga\Module\Vspheredb\Db\DbUtil;
 use Icinga\Module\Vspheredb\DbObject\VCenter;
@@ -33,11 +36,13 @@
 use Ramsey\Uuid\Uuid;
 use Ramsey\Uuid\UuidInterface;
 use React\EventLoop\LoopInterface;
+use React\Stream\Util as StreamUtil;
 use RuntimeException;
 use function React\Promise\resolve;
 
-class VsphereDbDaemon implements DaemonTask, SystemdAwareTask, LoggerAwareInterface
+class VsphereDbDaemon implements DaemonTask, SystemdAwareTask, LoggerAwareInterface, EventEmitterInterface
 {
+ use EventEmitterTrait;
  use LoggerAwareTrait;
 
  const PROCESS_NAME = 'Icinga::vSphereDB';
@@ -419,6 +424,7 @@ protected function prepareApi(LoopInterface $loop, LoggerInterface $logger)
  $this->curl = $curl;
  $this->apiConnectionHandler = $connection = new ApiConnectionHandler($curl, $logger);
  $this->remoteApi = new RemoteApi($connection, $curl, $loop, $logger);
+ StreamUtil::forwardEvents($this->remoteApi, $this, [RpcNamespaceProcess::ON_RESTART]);
  $connection->on(
  ApiConnectionHandler::ON_INITIALIZED_SERVER,
  function (ServerInfo $server, AboutInfo $info, UuidInterface $uuid) {

library/Vspheredb/Web/Form/RestartDaemonForm.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Icinga\Module\Vspheredb\Web\Form;
+
+use gipfl\IcingaWeb2\Icon;
+use gipfl\Translation\TranslationHelper;
+use gipfl\Web\Form\Feature\NextConfirmCancel;
+use gipfl\Web\InlineForm;
+use Icinga\Module\Vspheredb\Daemon\RemoteClient;
+use React\EventLoop\LoopInterface;
+use function Clue\React\Block\await;
+
+class RestartDaemonForm extends InlineForm
+{
+ use TranslationHelper;
+
+ /** @var RemoteClient */
+ protected $client;
+
+ /** @var LoopInterface */
+ protected $loop;
+
+ public function __construct(RemoteClient $client, LoopInterface $loop)
+ {
+ $this->client = $client;
+ $this->loop = $loop;
+ }
+
+ protected function assemble()
+ {
+ (new NextConfirmCancel(
+ NextConfirmCancel::buttonNext($this->translate('Restart'), [
+ 'title' => $this->translate('Click to restart the vSphereDB background daemon'),
+ ]),
+ NextConfirmCancel::buttonConfirm($this->translate('Yes, please restart')),
+ NextConfirmCancel::buttonCancel($this->translate('Cancel'))
+ ))->addToForm($this);
+ }
+
+ protected function onSuccess()
+ {
+ await($this->client->request('process.restart'), $this->loop);
+ }
+}