From e4862af5dc5d029fc6b24b5eaa0424cdeb736b8e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 22 Sep 2024 12:33:37 +0900 Subject: [PATCH] Drop hard-coded log_file Because the service config file is shared among multiple services, we should not set the option without any specific reason. In case the option is not set (and no --log-file argument is passed) then log file name is determined according to the process name, and each service creates its own file. Change-Id: Iadaf4eceb0a052bef437603d6cbe6422f4ee9b13 --- puppet-{{cookiecutter.project_name}}/manifests/logging.pp | 4 ++-- .../classes/{{cookiecutter.project_name}}_logging_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/puppet-{{cookiecutter.project_name}}/manifests/logging.pp b/puppet-{{cookiecutter.project_name}}/manifests/logging.pp index ac13e1d..5be39bb 100644 --- a/puppet-{{cookiecutter.project_name}}/manifests/logging.pp +++ b/puppet-{{cookiecutter.project_name}}/manifests/logging.pp @@ -35,7 +35,7 @@ # # [*log_file*] # (Optional) File where logs should be stored. -# Defaults to '/var/log/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}.log' +# Defaults to $facts['os_service_default'] # # [*logging_context_format_string*] # (Optional) Format string to use for log messages with context. @@ -108,7 +108,7 @@ class {{cookiecutter.project_name}}::logging( $use_stderr = $facts['os_service_default'], $syslog_log_facility = $facts['os_service_default'], $log_dir = '/var/log/{{cookiecutter.project_name}}', - $log_file = '/var/log/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}.log', + $log_file = $facts['os_service_default'], $debug = $facts['os_service_default'], $logging_context_format_string = $facts['os_service_default'], $logging_default_format_string = $facts['os_service_default'], diff --git a/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_logging_spec.rb b/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_logging_spec.rb index ce4a673..1da0feb 100644 --- a/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_logging_spec.rb +++ b/puppet-{{cookiecutter.project_name}}/spec/classes/{{cookiecutter.project_name}}_logging_spec.rb @@ -66,7 +66,7 @@ describe '{{cookiecutter.project_name}}::logging' do :use_stderr => '', :syslog_log_facility => '', :log_dir => '/var/log/{{cookiecutter.project_name}}', - :log_file => '/var/log/{{cookiecutter.project_name}}/{{cookiecutter.project_name}}.log', + :log_file => '', :debug => '', )} end