tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-23 05:44:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

logging config: Support 'log' 'none'

Browse Source
This commit is contained in:
Eric Lippmann 2014-10-16 16:13:00 +02:00
parent 6c59c22044
commit 5ca97c14d6
1 changed files with 48 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
application/forms/Config/General/LoggingConfigForm.php
View File

@ -5,6 +5,7 @@
namespace Icinga\Form\Config\General; namespace Icinga\Form\Config\General;
use Icinga\Application\Icinga; use Icinga\Application\Icinga;
use Icinga\Logger\Logger;
use Icinga\Web\Form; use Icinga\Web\Form;
use Icinga\Web\Form\Validator\WritablePathValidator; use Icinga\Web\Form\Validator\WritablePathValidator;
@ -19,29 +20,14 @@ class LoggingConfigForm extends Form
} }
/** /**
* @see Form::createElements() * (non-PHPDoc)
* @see Form::createElements() For the method documentation.
*/ */
public function createElements(array $formData) public function createElements(array $formData)
{ {
$this->addElement( $this->addElement(
'select', 'select',
'logging_level', 'logging_log',
array(
'required' => true,
'label' => t('Logging Level'),
'description' => t('The maximum loglevel to emit.'),
'multiOptions' => array(
0 => t('None'),
1 => t('Error'),
2 => t('Warning'),
3 => t('Information'),
4 => t('Debug')
)
)
);
$this->addElement(
'select',
'logging_type',
array( array(
'required' => true, 'required' => true,
'class' => 'autosubmit', 'class' => 'autosubmit',
@ -49,13 +35,32 @@ class LoggingConfigForm extends Form
'description' => t('The type of logging to utilize.'), 'description' => t('The type of logging to utilize.'),
'multiOptions' => array( 'multiOptions' => array(
'syslog' => 'Syslog', 'syslog' => 'Syslog',
'file' => t('File') 'file' => t('File'),
'none' => t('None')
) )
) )
); );
if (false === isset($formData['logging_type']) || $formData['logging_type'] === 'syslog') { if (! isset($formData['logging_log']) || $formData['logging_log'] !== 'none') {
$this->addElement( $this->addElement(
'select',
'logging_level',
array(
'required' => true,
'label' => t('Logging Level'),
'description' => t('The maximum logging level to emit.'),
'multiOptions' => array(
Logger::$levels[Logger::ERROR] => t('Error'),
Logger::$levels[Logger::WARNING] => t('Warning'),
Logger::$levels[Logger::INFO] => t('Information'),
Logger::$levels[Logger::DEBUG] => t('Debug')
)
)
);
}
if (isset($formData['logging_log']) && $formData['logging_log'] === 'syslog') {
$this->addElement(
'text', 'text',
'logging_application', 'logging_application',
array( array(
@ -77,26 +82,30 @@ class LoggingConfigForm extends Form
) )
) )
); );
$this->addElement( /*
'select', * Note(el): Since we provide only one possible value for the syslog facility, I opt against exposing
'logging_facility', * this configuration.
array( */
'required' => true, // $this->addElement(
'label' => t('Facility'), // 'select',
'description' => t('The Syslog facility to utilize.'), // 'logging_facility',
'multiOptions' => array( // array(
'LOG_USER' => 'LOG_USER' // 'required' => true,
) // 'label' => t('Facility'),
) // 'description' => t('The syslog facility to utilize.'),
); // 'multiOptions' => array(
} elseif ($formData['logging_type'] === 'file') { // 'user' => 'LOG_USER'
// )
// )
// );
} elseif (isset($formData['logging_log']) && $formData['logging_log'] === 'file') {
$this->addElement( $this->addElement(
'text', 'text',
'logging_target', 'logging_file',
array( array(
'required' => true, 'required' => true,
'label' => t('Filepath'), 'label' => t('File path'),
'description' => t('The logfile to write messages to.'), 'description' => t('The full path to the log file to write messages to.'),
'value' => $this->getDefaultLogDir(), 'value' => $this->getDefaultLogDir(),
'validators' => array(new WritablePathValidator()) 'validators' => array(new WritablePathValidator())
) )
@ -107,9 +116,9 @@ class LoggingConfigForm extends Form
} }
/** /**
* Return the default logging directory for type "file" * Return the default logging directory for type 'file'
* *
* @return string * @return string
*/ */
protected function getDefaultLogDir() protected function getDefaultLogDir()
{ {