openstack/puppet-trove
Code Issues Proposed changes

Remove deprecated logging

Browse Source 
Change-Id: Idfd90ce310f7a43907b93e924d3bbd8f5eab0f31
This commit is contained in:
Tobias Urdin 2018-11-29 11:05:35 +01:00
parent ff52d5f8a5
commit ad1aa1611c
3 changed files with 11 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
manifests/api.pp
View File

@ -29,32 +29,6 @@
# (optional) Whether the trove api package will be installed
# Defaults to 'present'
#
# [*debug*]
# (optional) Rather to log the trove api service at debug level.
# Defaults to undef
#
# [*log_file*]
# (optional) The path of file used for logging
# If set to $::os_service_default, it will not log to any file.
# Defaults to undef
#
# [*log_dir*]
# (optional) directory to which trove logs are sent.
# If set to $::os_service_default, it will not log to any directory.
# Defaults to undef
#
# [*use_syslog*]
# (optional) Use syslog for logging.
# Defaults to undef
#
# [*use_stderr*]
# (optional) Use stderr for logging
# Defaults to undef
#
# [*log_facility*]
# (optional) Syslog facility to receive log lines.
# Defaults to undef.
#
# [*bind_host*]
# (optional) The address of the host to bind to.
# Default: 0.0.0.0
@ -121,12 +95,6 @@
# Defaults to 'taskmanager'.
#
class trove::api(
$debug = undef,
$log_file = undef,
$log_dir = undef,
$use_syslog = undef,
$use_stderr = undef,
$log_facility = undef,
$bind_host = '0.0.0.0',
$bind_port = '8779',
$backlog = '4096',
@ -150,7 +118,6 @@ class trove::api(
include ::trove::deps
include ::trove::db
include ::trove::db::sync
include ::trove::logging
include ::trove::params
# basic service config

29
manifests/logging.pp
View File

@ -122,32 +122,15 @@ class trove::logging(
include ::trove::deps
# NOTE(spredzy): In order to keep backward compatibility we rely on the pick function
# to use trove::<myparam> first then trove::logging::<myparam>.
$use_syslog_real = pick($::trove::api::use_syslog, $use_syslog)
$use_stderr_real = pick($::trove::api::use_stderr, $use_stderr)
$log_facility_real = pick($::trove::api::log_facility, $log_facility)
if $log_dir != '' {
$log_dir_real = pick($::trove::api::log_dir,$log_dir)
} else {
$log_dir_real = $log_dir
}
if $log_file != '' {
$log_file_real = pick($::trove::api::log_file,$log_file)
} else {
$log_file_real = $log_file
}
$debug_real = pick($::trove::api::debug, $debug)
oslo::log { 'trove_config':
debug => $debug_real,
use_stderr => $use_stderr_real,
use_syslog => $use_syslog_real,
debug => $debug,
use_stderr => $use_stderr,
use_syslog => $use_syslog,
use_json => $use_json,
use_journal => $use_journal,
log_dir => $log_dir_real,
log_file => $log_file_real,
syslog_log_facility => $log_facility_real,
log_dir => $log_dir,
log_file => $log_file,
syslog_log_facility => $log_facility,
logging_context_format_string => $logging_context_format_string,
logging_default_format_string => $logging_default_format_string,
logging_debug_format_suffix => $logging_debug_format_suffix,

5
releasenotes/notes/remove-deprecated-logging-89cb2fcbedb06176.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The deprecated parameters use_syslog, use_stderr, log_facility, log_dir, log_file
and debug in the api class is now removed. Please set them in the logging class.