openstack/puppet-keystone
Code Issues Proposed changes

add access_log_env_var parameter to keystone::wsgi::apache

Browse Source 
Change-Id: I8cd405fab58da390c216de41a773635eae5a28d6
This commit is contained in:
Benedikt Trefzer
2024-10-23 15:32:08 +02:00
parent eedb105720
commit a26412fdcc
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/wsgi/apache.pp
View File

@@ -112,6 +112,11 @@
# (Optional) The log format for the virtualhost. # (Optional) The log format for the virtualhost.
# Defaults to undef # Defaults to undef
# #
# [*access_log_env_var*]
# (Optional) Specifies that only requests with particular
# environment variables be logged.
# Defaults to undef
#
# [*error_log_file*] # [*error_log_file*]
# (Optional) The error log file name for the virtualhost. # (Optional) The error log file name for the virtualhost.
# Defaults to undef # Defaults to undef
@@ -166,6 +171,7 @@ class keystone::wsgi::apache (
$access_log_pipe = undef, $access_log_pipe = undef,
$access_log_syslog = undef, $access_log_syslog = undef,
$access_log_format = undef, $access_log_format = undef,
$access_log_env_var = undef,
$error_log_file = undef, $error_log_file = undef,
$error_log_pipe = undef, $error_log_pipe = undef,
$error_log_syslog = undef, $error_log_syslog = undef,
@@ -215,6 +221,7 @@ class keystone::wsgi::apache (
access_log_pipe => $access_log_pipe, access_log_pipe => $access_log_pipe,
access_log_syslog => $access_log_syslog, access_log_syslog => $access_log_syslog,
access_log_format => $access_log_format, access_log_format => $access_log_format,
access_log_env_var => $access_log_env_var,
error_log_file => $error_log_file, error_log_file => $error_log_file,
error_log_pipe => $error_log_pipe, error_log_pipe => $error_log_pipe,
error_log_syslog => $error_log_syslog, error_log_syslog => $error_log_syslog,

5
releasenotes/notes/access_log_env_var-061dae2379ea550f.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
features:
- |
Add the ``access_log_env_var`` parameter to the ``keystone::wsgi::apache``
class to allow filtering logs (eg. suppress healthecks)

15
spec/classes/keystone_wsgi_apache_spec.rb
View File

@@ -40,6 +40,7 @@ describe 'keystone::wsgi::apache' do
:access_log_pipe => nil, :access_log_pipe => nil,
:access_log_syslog => nil, :access_log_syslog => nil,
:access_log_format => nil, :access_log_format => nil,
:access_log_env_var => nil,
:error_log_file => nil, :error_log_file => nil,
:error_log_pipe => nil, :error_log_pipe => nil,
:error_log_syslog => nil, :error_log_syslog => nil,
@@ -117,16 +118,18 @@ describe 'keystone::wsgi::apache' do
context 'with custom access logging' do context 'with custom access logging' do
let :params do let :params do
{ {
:access_log_format => 'foo', :access_log_format => 'foo',
:access_log_syslog => 'syslog:local0', :access_log_syslog => 'syslog:local0',
:error_log_syslog => 'syslog:local1', :error_log_syslog => 'syslog:local1',
:access_log_env_var => '!dontlog',
} }
end end
it { should contain_openstacklib__wsgi__apache('keystone_wsgi').with( it { should contain_openstacklib__wsgi__apache('keystone_wsgi').with(
:access_log_format => params[:access_log_format], :access_log_format => params[:access_log_format],
:access_log_syslog => params[:access_log_syslog], :access_log_syslog => params[:access_log_syslog],
:error_log_syslog => params[:error_log_syslog], :error_log_syslog => params[:error_log_syslog],
:access_log_env_var => params[:access_log_env_var],
)} )}
end end