Merge "Expose use_json logging option"
This commit is contained in:
commit
413599748d
|
@ -12,6 +12,10 @@
|
|||
# (Optional) Use syslog for logging.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*use_json*]
|
||||
# (Optional) Use json for logging.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*use_stderr*]
|
||||
# (optional) Use stderr for logging
|
||||
# Defaults to $::os_service_default
|
||||
|
@ -87,6 +91,7 @@
|
|||
#
|
||||
class designate::logging(
|
||||
$use_syslog = $::os_service_default,
|
||||
$use_json = $::os_service_default,
|
||||
$use_stderr = $::os_service_default,
|
||||
$log_facility = $::os_service_default,
|
||||
$log_dir = $::designate::params::log_dir,
|
||||
|
@ -121,6 +126,7 @@ class designate::logging(
|
|||
oslo::log { 'designate_config':
|
||||
debug => $debug_real,
|
||||
use_syslog => $use_syslog_real,
|
||||
use_json => $use_json,
|
||||
use_stderr => $use_stderr_real,
|
||||
log_dir => $log_dir_real,
|
||||
syslog_log_facility => $log_facility_real,
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
features:
|
||||
- |
|
||||
Expose use_json logging parameter, which enables JSON formatted logging.
|
|
@ -24,6 +24,7 @@ describe 'designate::logging' do
|
|||
:instance_uuid_format => '[instance: %(uuid)s] ',
|
||||
:log_date_format => '%Y-%m-%d %H:%M:%S',
|
||||
:use_syslog => true,
|
||||
:use_json => true,
|
||||
:use_stderr => false,
|
||||
:log_facility => 'LOG_FOO',
|
||||
:log_dir => '/var/log',
|
||||
|
@ -56,11 +57,12 @@ describe 'designate::logging' do
|
|||
shared_examples 'basic default logging settings' do
|
||||
it 'configures designate logging settings with default values' do
|
||||
is_expected.to contain_oslo__log('designate_config').with(
|
||||
:use_syslog => '<SERVICE DEFAULT>',
|
||||
:use_stderr => '<SERVICE DEFAULT>',
|
||||
:use_syslog => '<SERVICE DEFAULT>',
|
||||
:use_json => '<SERVICE DEFAULT>',
|
||||
:use_stderr => '<SERVICE DEFAULT>',
|
||||
:syslog_log_facility => '<SERVICE DEFAULT>',
|
||||
:log_dir => '/var/log/designate',
|
||||
:debug => '<SERVICE DEFAULT>',
|
||||
:log_dir => '/var/log/designate',
|
||||
:debug => '<SERVICE DEFAULT>',
|
||||
)
|
||||
end
|
||||
end
|
||||
|
@ -68,11 +70,12 @@ describe 'designate::logging' do
|
|||
shared_examples 'basic non-default logging settings' do
|
||||
it 'configures designate logging settings with non-default values' do
|
||||
is_expected.to contain_oslo__log('designate_config').with(
|
||||
:use_syslog => true,
|
||||
:use_stderr => false,
|
||||
:use_syslog => true,
|
||||
:use_json => true,
|
||||
:use_stderr => false,
|
||||
:syslog_log_facility => 'LOG_FOO',
|
||||
:log_dir => '/var/log',
|
||||
:debug => true,
|
||||
:log_dir => '/var/log',
|
||||
:debug => true,
|
||||
)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue