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

Merge branch 'bugfix/log-disable-broken-4595' 

fixes #4595
This commit is contained in:
Johannes Meyer 2013-09-02 12:16:46 +02:00
parent fff746bdb3 18d021d104
commit a01559f6e5
2 changed files with 69 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/Icinga/Application/Logger.php
View File

@ -120,14 +120,15 @@ final class Logger
{
$this->clearLog();
try {
if ($config->debug && $config->debug->enable == 1) {
if ($config->debug && $config->debug->enable == '1') {
$this->setupDebugLog($config);
}
} catch (ConfigurationError $e) {
$this->warn('Could not create debug log: ' . $e->getMessage());
}
$this->setupLog($config);
if ($config->get('enable', '1') != '0') {
$this->setupLog($config);
}
$this->flushQueue();
return $this;

65
test/php/regression/Regression4595Test.php Normal file
View File

@ -0,0 +1,65 @@
<?php
// {{{ICINGA_LICENSE_HEADER}}}
/**
* This file is part of Icinga 2 Web.
*
* Icinga 2 Web - Head for multiple monitoring backends.
* Copyright (C) 2013 Icinga Development Team
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* @copyright 2013 Icinga Development Team <info@icinga.org>
* @license http://www.gnu.org/licenses/gpl-2.0.txt GPL, version 2
* @author Icinga Development Team <info@icinga.org>
*/
// {{{ICINGA_LICENSE_HEADER}}}
namespace Tests\Icinga\Regression;
use \Icinga\Test\BaseTestCase;
use \Icinga\Application\Logger;
use \Zend_Config;
require_once 'Zend/Log.php';
require_once 'Zend/Config.php';
require_once 'Zend/Log/Writer/Mock.php';
require_once 'Zend/Log/Writer/Null.php';
require_once 'Zend/Log/Filter/Priority.php';
require_once realpath(__DIR__ . '/../../../library/Icinga/Test/BaseTestCase.php');
require_once realpath(BaseTestCase::$libDir.'/Application/Logger.php');
/**
* Bug 4595 : "If log disabled, default target (./var/log) is not writable / no path exist"
*
* This is caused because the logger ignored the 'enable' parameter
*/
class Regression4595 extends BaseTestCase {
public function testDisableLogging()
{
$cfg = new Zend_Config(
array(
'enable' => '0',
'type' => 'mock',
'target' => 'target2'
)
);
$logger = new Logger($cfg);
$writers = $logger->getWriters();
$this->assertEquals(0, count($writers), 'Assert that loggers aren\'t registered when "enable" is set to false');
}
}