opnsense/plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2025-12-11 05:44:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

databases/redis: service handling consolidation

Browse Source
This commit is contained in:
Franco Fichtner 2017-12-25 10:41:21 +01:00
parent b3f9954d8e
commit 5480dbc3b9
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
databases/redis/src/opnsense/mvc/app/controllers/OPNsense/Redis/Api/ServiceController.php
View File

@ -1,30 +1,29 @@
<?php <?php
/**
* Copyright (C) 2017 Fabian Franz /*
* Copyright (C) 2017 Fabian Franz
* All rights reserved.
* *
* All rights reserved. * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* *
* Redistribution and use in source and binary forms, with or without * 1. Redistributions of source code must retain the above copyright notice,
* modification, are permitted provided that the following conditions are met: * this list of conditions and the following disclaimer.
* *
* 1. Redistributions of source code must retain the above copyright notice, * 2. Redistributions in binary form must reproduce the above copyright
* this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer in the
* * documentation and/or other materials provided with the distribution.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
* *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
* OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/ */
namespace OPNsense\Redis\Api; namespace OPNsense\Redis\Api;
@ -35,7 +34,6 @@ use \OPNsense\Redis\Redis;
class ServiceController extends ApiControllerBase class ServiceController extends ApiControllerBase
{ {
/** /**
* restart redis service * restart redis service
* @return array * @return array
@ -43,6 +41,8 @@ class ServiceController extends ApiControllerBase
public function restartAction() public function restartAction()
{ {
if ($this->request->isPost()) { if ($this->request->isPost()) {
// close session for long running action
$this->sessionClose();
$backend = new Backend(); $backend = new Backend();
$response = $backend->configdRun('redis restart'); $response = $backend->configdRun('redis restart');
return array('response' => $response); return array('response' => $response);
@ -115,6 +115,8 @@ class ServiceController extends ApiControllerBase
public function stopAction() public function stopAction()
{ {
if ($this->request->isPost()) { if ($this->request->isPost()) {
// close session for long running action
$this->sessionClose();
$backend = new Backend(); $backend = new Backend();
$response = $backend->configdRun('redis stop'); $response = $backend->configdRun('redis stop');
return array('response' => $response); return array('response' => $response);
@ -129,6 +131,8 @@ class ServiceController extends ApiControllerBase
public function startAction() public function startAction()
{ {
if ($this->request->isPost()) { if ($this->request->isPost()) {
// close session for long running action
$this->sessionClose();
$backend = new Backend(); $backend = new Backend();
$response = $backend->configdRun('redis start'); $response = $backend->configdRun('redis start');
return array('response' => $response); return array('response' => $response);

9
databases/redis/src/opnsense/mvc/app/views/OPNsense/Redis/index.volt
View File

@ -77,12 +77,9 @@
draggable: true draggable: true
}); });
} else { } else {
// request service status after successful save and update status box (wait a few seconds before update) ajaxCall(url="/api/redis/service/status", sendData={}, callback=function(data,status) {
setTimeout(function(){ updateServiceStatusUI(data['status']);
ajaxCall(url="/api/redis/service/status", sendData={}, callback=function(data,status) { });
updateServiceStatusUI(data['status']);
});
},3000);
} }
}); });
}); });