Add Apache WSGI logging parameters for pipe/syslog

Add parameters for advanced logging configurations in Apache to
support piped logging and support for syslog (via mod_syslog
available in Apache >= 2.5.0)

Co-Authored-By: Andy Botting <andy@andybotting.com>
Change-Id: Idb3d73309588a7436cd2e067121119c5878eee18
This commit is contained in:
Takashi Kajinami 2022-08-26 16:45:19 +09:00
parent 1516806fc5
commit bd92c63d41
6 changed files with 88 additions and 0 deletions

View File

@ -70,6 +70,14 @@
# The log file name for the virtualhost.
# Optional. Defaults to undef.
#
# [*access_log_pipe*]
# Specifies a pipe where Apache sends access logs for the virtualhost.
# Optional. Defaults to undef.
#
# [*access_log_syslog*]
# Sends the virtualhost access log messages to syslog.
# Optional. Defaults to undef.
#
# [*access_log_format*]
# The log format for the virtualhost.
# Optional. Defaults to undef.
@ -78,6 +86,14 @@
# The error log file name for the virtualhost.
# Optional. Defaults to undef.
#
# [*error_log_pipe*]
# Specifies a pipe where Apache sends error logs for the virtualhost.
# Optional. Defaults to undef.
#
# [*error_log_syslog*]
# Sends the virtualhost error log messages to syslog.
# Optional. Defaults to undef.
#
# [*custom_wsgi_process_options*]
# (optional) gives you the opportunity to add custom process options or to
# overwrite the default options for the WSGI main process.
@ -128,8 +144,12 @@ define heat::wsgi::apache (
$threads = 1,
$priority = 10,
$access_log_file = undef,
$access_log_pipe = undef,
$access_log_syslog = undef,
$access_log_format = undef,
$error_log_file = undef,
$error_log_pipe = undef,
$error_log_syslog = undef,
$custom_wsgi_process_options = {},
$wsgi_process_display_name = undef,
$headers = undef,
@ -175,7 +195,11 @@ define heat::wsgi::apache (
custom_wsgi_process_options => $custom_wsgi_process_options,
allow_encoded_slashes => 'on',
access_log_file => $access_log_file,
access_log_pipe => $access_log_pipe,
access_log_syslog => $access_log_syslog,
access_log_format => $access_log_format,
error_log_file => $error_log_file,
error_log_pipe => $error_log_pipe,
error_log_syslog => $error_log_syslog,
}
}

View File

@ -65,6 +65,14 @@
# The log file name for the virtualhost.
# Optional. Defaults to undef.
#
# [*access_log_pipe*]
# Specifies a pipe where Apache sends access logs for the virtualhost.
# Optional. Defaults to undef.
#
# [*access_log_syslog*]
# Sends the virtualhost access log messages to syslog.
# Optional. Defaults to undef.
#
# [*access_log_format*]
# The log format for the virtualhost.
# Optional. Defaults to undef.
@ -73,6 +81,14 @@
# The error log file name for the virtualhost.
# Optional. Defaults to undef.
#
# [*error_log_pipe*]
# Specifies a pipe where Apache sends error logs for the virtualhost.
# Optional. Defaults to undef.
#
# [*error_log_syslog*]
# Sends the virtualhost error log messages to syslog.
# Optional. Defaults to undef.
#
# [*custom_wsgi_process_options*]
# (optional) gives you the opportunity to add custom process options or to
# overwrite the default options for the WSGI main process.
@ -124,8 +140,12 @@ class heat::wsgi::apache_api (
$threads = 1,
$priority = 10,
$access_log_file = undef,
$access_log_pipe = undef,
$access_log_syslog = undef,
$access_log_format = undef,
$error_log_file = undef,
$error_log_pipe = undef,
$error_log_syslog = undef,
$custom_wsgi_process_options = {},
$wsgi_process_display_name = undef,
$headers = undef,
@ -150,8 +170,12 @@ class heat::wsgi::apache_api (
threads => $threads,
priority => $priority,
access_log_file => $access_log_file,
access_log_pipe => $access_log_pipe,
access_log_syslog => $access_log_syslog,
access_log_format => $access_log_format,
error_log_file => $error_log_file,
error_log_pipe => $error_log_pipe,
error_log_syslog => $error_log_syslog,
custom_wsgi_process_options => $custom_wsgi_process_options,
wsgi_process_display_name => $wsgi_process_display_name,
headers => $headers,

View File

@ -65,6 +65,14 @@
# The log file name for the virtualhost.
# Optional. Defaults to undef.
#
# [*access_log_pipe*]
# Specifies a pipe where Apache sends access logs for the virtualhost.
# Optional. Defaults to undef.
#
# [*access_log_syslog*]
# Sends the virtualhost access log messages to syslog.
# Optional. Defaults to undef.
#
# [*access_log_format*]
# The log format for the virtualhost.
# Optional. Defaults to undef.
@ -73,6 +81,14 @@
# The error log file name for the virtualhost.
# Optional. Defaults to undef.
#
# [*error_log_pipe*]
# Specifies a pipe where Apache sends error logs for the virtualhost.
# Optional. Defaults to undef.
#
# [*error_log_syslog*]
# Sends the virtualhost error log messages to syslog.
# Optional. Defaults to undef.
#
# [*custom_wsgi_process_options*]
# (optional) gives you the opportunity to add custom process options or to
# overwrite the default options for the WSGI main process.
@ -125,8 +141,12 @@ class heat::wsgi::apache_api_cfn (
$threads = 1,
$priority = 10,
$access_log_file = undef,
$access_log_pipe = undef,
$access_log_syslog = undef,
$access_log_format = undef,
$error_log_file = undef,
$error_log_pipe = undef,
$error_log_syslog = undef,
$custom_wsgi_process_options = {},
$wsgi_process_display_name = undef,
$headers = undef,
@ -163,8 +183,12 @@ class heat::wsgi::apache_api_cfn (
threads => $threads,
priority => $priority,
access_log_file => $access_log_file,
access_log_pipe => $access_log_pipe,
access_log_syslog => $access_log_syslog,
access_log_format => $access_log_format,
error_log_file => $error_log_file,
error_log_pipe => $error_log_pipe,
error_log_syslog => $error_log_syslog,
custom_wsgi_process_options => $custom_wsgi_process_options,
wsgi_process_display_name => $wsgi_process_display_name,
headers => $headers,

View File

@ -0,0 +1,6 @@
---
features:
- |
Added parameters for advanced configuration of httpd access and error log
destinations including piped logging and syslog (see `mod_syslog`). Note
that mod_syslog requires Apache2 >= 2.5.0.

View File

@ -26,7 +26,12 @@ describe 'heat::wsgi::apache_api_cfn' do
:request_headers => ['set Content-Type "application/json"'],
:custom_wsgi_process_options => {},
:access_log_file => nil,
:access_log_pipe => nil,
:access_log_syslog => nil,
:access_log_format => nil,
:error_log_file => nil,
:error_log_pipe => nil,
:error_log_syslog => nil,
)}
end
end

View File

@ -26,7 +26,12 @@ describe 'heat::wsgi::apache_api' do
:request_headers => nil,
:custom_wsgi_process_options => {},
:access_log_file => nil,
:access_log_pipe => nil,
:access_log_syslog => nil,
:access_log_format => nil,
:error_log_file => nil,
:error_log_pipe => nil,
:error_log_syslog => nil,
)}
end
end