tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace `MonitoringBackend::createBackend()` with `MonitoringBackend::instance()`

This commit is contained in:
Sukhwinder Dhillon 2022-05-02 15:55:30 +02:00 committed by Johannes Meyer
parent 49bea36345
commit 60756afa34
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/monitoring/application/clicommands/ListCommand.php
View File

@ -25,8 +25,7 @@ class ListCommand extends Command
public function init() public function init()
{ {
$this->app->setupZendAutoloader(); $this->backend = Backend::instance($this->params->shift('backend'));
$this->backend = Backend::createBackend($this->params->shift('backend'));
$this->dumpSql = $this->params->shift('showsql'); $this->dumpSql = $this->params->shift('showsql');
} }

4
modules/monitoring/application/controllers/ConfigController.php
View File

@ -215,7 +215,7 @@ class ConfigController extends Controller
$form->setTitle(sprintf($this->translate('Edit Command Transport %s'), $transportName)); $form->setTitle(sprintf($this->translate('Edit Command Transport %s'), $transportName));
$form->setIniConfig($this->Config('commandtransports')); $form->setIniConfig($this->Config('commandtransports'));
$form->setInstanceNames( $form->setInstanceNames(
Backend::createBackend()->select()->from('instance', array('instance_name'))->fetchColumn() Backend::instance()->select()->from('instance', array('instance_name'))->fetchColumn()
); );
$form->setOnSuccess(function (TransportConfigForm $form) use ($transportName) { $form->setOnSuccess(function (TransportConfigForm $form) use ($transportName) {
try { try {
@ -259,7 +259,7 @@ class ConfigController extends Controller
$form->setTitle($this->translate('Create New Command Transport')); $form->setTitle($this->translate('Create New Command Transport'));
$form->setIniConfig($this->Config('commandtransports')); $form->setIniConfig($this->Config('commandtransports'));
$form->setInstanceNames( $form->setInstanceNames(
Backend::createBackend()->select()->from('instance', array('instance_name'))->fetchColumn() Backend::instance()->select()->from('instance', array('instance_name'))->fetchColumn()
); );
$form->setOnSuccess(function (TransportConfigForm $form) { $form->setOnSuccess(function (TransportConfigForm $form) {
try { try {

2
modules/monitoring/library/Monitoring/Controller.php
View File

@ -28,7 +28,7 @@ class Controller extends IcingaWebController
protected function moduleInit() protected function moduleInit()
{ {
$this->backend = Backend::createBackend($this->_getParam('backend')); $this->backend = Backend::instance($this->_getParam('backend'));
$this->view->url = Url::fromRequest(); $this->view->url = Url::fromRequest();
} }

2
modules/monitoring/test/php/regression/Bug7043Test.php
View File

@ -53,7 +53,7 @@ class Bug7043Test extends BaseTestCase
) )
))); )));
$defaultBackend = Backend::createBackend(); $defaultBackend = Backend::instance();
$this->assertEquals('backendName', $defaultBackend->getName(), 'Default backend has name set'); $this->assertEquals('backendName', $defaultBackend->getName(), 'Default backend has name set');
} }