openstack/puppet-murano
Code Issues Proposed changes

Add log_file parameter

Browse Source 
Change-Id: I6bcb99e07d4093600d9a2305eeaf526fb89c3eaf
Closes-Bug: #1819417
This commit is contained in:
ZhongShengping 2019-03-12 10:37:39 +08:00
parent bf5ec224f3
commit 138b384332
5 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/logging.pp
View File

@ -33,6 +33,10 @@
# If set to $::os_service_default, it will not log to any directory.
# Defaults to '/var/log/murano'
#
# [*log_file*]
# (Optional) File where logs should be stored.
# Defaults to $::os_service_default
#
# [*logging_context_format_string*]
# (Optional) Format string to use for log messages with context.
# Defaults to $::os_service_default.
@ -101,6 +105,7 @@ class murano::logging(
$use_stderr = $::os_service_default,
$log_facility = $::os_service_default,
$log_dir = '/var/log/murano',
$log_file = $::os_service_default,
$logging_context_format_string = $::os_service_default,
$logging_default_format_string = $::os_service_default,
$logging_debug_format_suffix = $::os_service_default,
@ -123,6 +128,7 @@ class murano::logging(
use_journal => $use_journal,
use_stderr => $use_stderr,
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,

6
manifests/logging_cfapi.pp
View File

@ -33,6 +33,10 @@
# If set to $::os_service_default, it will not log to any directory.
# Defaults to '/var/log/murano_cfapi'
#
# [*log_file*]
# (Optional) File where logs should be stored.
# Defaults to $::os_service_default
#
# [*logging_context_format_string*]
# (Optional) Format string to use for log messages with context.
# Defaults to $::os_service_default.
@ -101,6 +105,7 @@ class murano::logging_cfapi(
$use_stderr = $::os_service_default,
$log_facility = $::os_service_default,
$log_dir = '/var/log/murano_cfapi',
$log_file = $::os_service_default,
$logging_context_format_string = $::os_service_default,
$logging_default_format_string = $::os_service_default,
$logging_debug_format_suffix = $::os_service_default,
@ -123,6 +128,7 @@ class murano::logging_cfapi(
use_journal => $use_journal,
use_stderr => $use_stderr,
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,

4
releasenotes/notes/add-log_file-for-logging-bccdaf36fd38f45d.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
Add the log_file option for logging.

3
spec/classes/murano_logging_cfapi_spec.rb
View File

@ -16,6 +16,7 @@ describe 'murano::logging_cfapi' do
:use_stderr => 'false',
:log_facility => 'LOG_LOCAL0',
:log_dir => '/tmp/murano_cfapi',
:log_file => '/tmp/murano_cfapi/murano.log',
:logging_context_format_string => '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s',
:logging_default_format_string => '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s',
:logging_debug_format_suffix => '%(funcName)s %(pathname)s:%(lineno)d',
@ -68,6 +69,7 @@ describe 'murano::logging_cfapi' do
:use_journal => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>',
:log_dir => '/var/log/murano_cfapi',
:log_file => '<SERVICE DEFAULT>',
:debug => '<SERVICE DEFAULT>',
)}
end
@ -93,6 +95,7 @@ describe 'murano::logging_cfapi' do
:use_stderr => false,
:syslog_log_facility => 'LOG_LOCAL0',
:log_dir => '/tmp/murano_cfapi',
:log_file => '/tmp/murano_cfapi/murano.log',
:debug => true,
)}
end

3
spec/classes/murano_logging_spec.rb
View File

@ -16,6 +16,7 @@ describe 'murano::logging' do
:use_stderr => 'false',
:log_facility => 'LOG_LOCAL0',
:log_dir => '/tmp/murano',
:log_file => '/tmp/murano/murano.log',
:logging_context_format_string => '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s',
:logging_default_format_string => '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s',
:logging_debug_format_suffix => '%(funcName)s %(pathname)s:%(lineno)d',
@ -68,6 +69,7 @@ describe 'murano::logging' do
:use_journal => '<SERVICE DEFAULT>',
:use_stderr => '<SERVICE DEFAULT>',
:log_dir => '/var/log/murano',
:log_file => '<SERVICE DEFAULT>',
:debug => '<SERVICE DEFAULT>',
)}
end
@ -93,6 +95,7 @@ describe 'murano::logging' do
:use_stderr => false,
:syslog_log_facility => 'LOG_LOCAL0',
:log_dir => '/tmp/murano',
:log_file => '/tmp/murano/murano.log',
:debug => true,
)}
end