From cdea6e5e14f2ff9269bfc5435abbee97226cb1b5 Mon Sep 17 00:00:00 2001 From: Thomas Herve Date: Tue, 25 Apr 2017 10:24:21 +0200 Subject: [PATCH] Use LOCAL2 consistently as default everywhere The log facility was still set sometimes to LOCAL0 and LOCAL1, let's use LOCAL2 everywhere for consistency and being able to fix redirects. Change-Id: Ibaac93743877daef29901a87792ab9beafa1a490 (cherry picked from commit 1a22b511fd16f5e1d2eb8b833797c7590f558c64) --- manifests/proxy.pp | 4 ++-- manifests/proxy/gatekeeper.pp | 4 ++-- .../notes/log-facility-81dd7fff80e5f2f1.yaml | 3 +++ spec/classes/swift_proxy_gatekeeper_spec.rb | 6 +++--- spec/classes/swift_proxy_spec.rb | 12 ++++++------ 5 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 releasenotes/notes/log-facility-81dd7fff80e5f2f1.yaml diff --git a/manifests/proxy.pp b/manifests/proxy.pp index 18db8393..87b1a671 100644 --- a/manifests/proxy.pp +++ b/manifests/proxy.pp @@ -59,7 +59,7 @@ # # [*log_facility*] # (optional) Log level -# Defaults to 'LOG_LOCAL1'. +# Defaults to 'LOG_LOCAL2'. # # [*log_handoffs*] # (optional) If True, the proxy will log whenever it has to failover to a handoff node @@ -141,7 +141,7 @@ class swift::proxy( $log_udp_port = undef, $log_address = '/dev/log', $log_level = 'INFO', - $log_facility = 'LOG_LOCAL1', + $log_facility = 'LOG_LOCAL2', $log_handoffs = true, $log_name = 'proxy-server', $cors_allow_origin = undef, diff --git a/manifests/proxy/gatekeeper.pp b/manifests/proxy/gatekeeper.pp index 104d50be..c818d0a5 100644 --- a/manifests/proxy/gatekeeper.pp +++ b/manifests/proxy/gatekeeper.pp @@ -13,7 +13,7 @@ # # [*log_facility*] # The log facility of gatekeeper. -# Default to LOG_LOCAL0. +# Default to LOG_LOCAL2. # # [*log_level*] # The log level of gatekeeper. @@ -37,7 +37,7 @@ # class swift::proxy::gatekeeper( $log_name = 'gatekeeper', - $log_facility = 'LOG_LOCAL0', + $log_facility = 'LOG_LOCAL2', $log_level = 'INFO', $log_headers = false, $log_address = '/dev/log' diff --git a/releasenotes/notes/log-facility-81dd7fff80e5f2f1.yaml b/releasenotes/notes/log-facility-81dd7fff80e5f2f1.yaml new file mode 100644 index 00000000..d93cf6c8 --- /dev/null +++ b/releasenotes/notes/log-facility-81dd7fff80e5f2f1.yaml @@ -0,0 +1,3 @@ +--- +fixes: + - Set the default log facility to LOCAL2 for all services. diff --git a/spec/classes/swift_proxy_gatekeeper_spec.rb b/spec/classes/swift_proxy_gatekeeper_spec.rb index 6c5cc8bd..3553e3be 100644 --- a/spec/classes/swift_proxy_gatekeeper_spec.rb +++ b/spec/classes/swift_proxy_gatekeeper_spec.rb @@ -9,7 +9,7 @@ describe 'swift::proxy::gatekeeper' do describe "when using default parameters" do it { is_expected.to contain_swift_proxy_config('filter:gatekeeper/use').with_value('egg:swift#gatekeeper') } it { is_expected.to contain_swift_proxy_config('filter:gatekeeper/set log_name').with_value('gatekeeper') } - it { is_expected.to contain_swift_proxy_config('filter:gatekeeper/set log_facility').with_value('LOG_LOCAL0') } + it { is_expected.to contain_swift_proxy_config('filter:gatekeeper/set log_facility').with_value('LOG_LOCAL2') } it { is_expected.to contain_swift_proxy_config('filter:gatekeeper/set log_level').with_value('INFO') } it { is_expected.to contain_swift_proxy_config('filter:gatekeeper/set log_headers').with_value('false') } it { is_expected.to contain_swift_proxy_config('filter:gatekeeper/set log_address').with_value('/dev/log') } @@ -19,12 +19,12 @@ describe 'swift::proxy::gatekeeper' do let :params do { :log_name => 'newgatekeeper', - :log_facility => 'LOG_LOCAL2', + :log_facility => 'LOG_LOCAL3', :log_level => 'WARN', } end it { is_expected.to contain_swift_proxy_config('filter:gatekeeper/set log_name').with_value('newgatekeeper') } - it { is_expected.to contain_swift_proxy_config('filter:gatekeeper/set log_facility').with_value('LOG_LOCAL2') } + it { is_expected.to contain_swift_proxy_config('filter:gatekeeper/set log_facility').with_value('LOG_LOCAL3') } it { is_expected.to contain_swift_proxy_config('filter:gatekeeper/set log_level').with_value('WARN') } end diff --git a/spec/classes/swift_proxy_spec.rb b/spec/classes/swift_proxy_spec.rb index 603b89b0..e5824308 100644 --- a/spec/classes/swift_proxy_spec.rb +++ b/spec/classes/swift_proxy_spec.rb @@ -63,14 +63,14 @@ describe 'swift::proxy' do it { is_expected.to contain_swift_proxy_config('DEFAULT/workers').with_value('1')} it { is_expected.to contain_swift_proxy_config('DEFAULT/user').with_value('swift')} it { is_expected.to contain_swift_proxy_config('DEFAULT/log_name').with_value('proxy-server')} - it { is_expected.to contain_swift_proxy_config('DEFAULT/log_facility').with_value('LOG_LOCAL1')} + it { is_expected.to contain_swift_proxy_config('DEFAULT/log_facility').with_value('LOG_LOCAL2')} it { is_expected.to contain_swift_proxy_config('DEFAULT/log_level').with_value('INFO')} it { is_expected.to contain_swift_proxy_config('DEFAULT/log_headers').with_value('False')} it { is_expected.to contain_swift_proxy_config('DEFAULT/log_address').with_value('/dev/log')} it { is_expected.to contain_swift_proxy_config('pipeline:main/pipeline').with_value('healthcheck cache tempauth proxy-server')} it { is_expected.to contain_swift_proxy_config('app:proxy-server/use').with_value('egg:swift#proxy')} it { is_expected.to contain_swift_proxy_config('app:proxy-server/set log_name').with_value('proxy-server')} - it { is_expected.to contain_swift_proxy_config('app:proxy-server/set log_facility').with_value('LOG_LOCAL1')} + it { is_expected.to contain_swift_proxy_config('app:proxy-server/set log_facility').with_value('LOG_LOCAL2')} it { is_expected.to contain_swift_proxy_config('app:proxy-server/set log_level').with_value('INFO')} it { is_expected.to contain_swift_proxy_config('app:proxy-server/set log_address').with_value('/dev/log')} it { is_expected.to contain_swift_proxy_config('app:proxy-server/log_handoffs').with_value('true')} @@ -120,7 +120,7 @@ describe 'swift::proxy' do it { is_expected.to contain_swift_proxy_config('DEFAULT/workers').with_value('3')} it { is_expected.to contain_swift_proxy_config('DEFAULT/user').with_value('swift')} it { is_expected.to contain_swift_proxy_config('DEFAULT/log_name').with_value('swift-proxy-server')} - it { is_expected.to contain_swift_proxy_config('DEFAULT/log_facility').with_value('LOG_LOCAL1')} + it { is_expected.to contain_swift_proxy_config('DEFAULT/log_facility').with_value('LOG_LOCAL2')} it { is_expected.to contain_swift_proxy_config('DEFAULT/log_level').with_value('DEBUG')} it { is_expected.to contain_swift_proxy_config('DEFAULT/log_headers').with_value('False')} it { is_expected.to contain_swift_proxy_config('DEFAULT/log_address').with_value('/dev/log')} @@ -129,7 +129,7 @@ describe 'swift::proxy' do it { is_expected.to contain_swift_proxy_config('pipeline:main/pipeline').with_value('swauth proxy-server')} it { is_expected.to contain_swift_proxy_config('app:proxy-server/use').with_value('egg:swift#proxy')} it { is_expected.to contain_swift_proxy_config('app:proxy-server/set log_name').with_value('swift-proxy-server')} - it { is_expected.to contain_swift_proxy_config('app:proxy-server/set log_facility').with_value('LOG_LOCAL1')} + it { is_expected.to contain_swift_proxy_config('app:proxy-server/set log_facility').with_value('LOG_LOCAL2')} it { is_expected.to contain_swift_proxy_config('app:proxy-server/set log_level').with_value('DEBUG')} it { is_expected.to contain_swift_proxy_config('app:proxy-server/set log_address').with_value('/dev/log')} it { is_expected.to contain_swift_proxy_config('app:proxy-server/log_handoffs').with_value('true')} @@ -188,7 +188,7 @@ describe 'swift::proxy' do it { is_expected.to contain_swift_proxy_config('DEFAULT/workers').with_value('3')} it { is_expected.to contain_swift_proxy_config('DEFAULT/user').with_value('swift')} it { is_expected.to contain_swift_proxy_config('DEFAULT/log_name').with_value('swift-proxy-server')} - it { is_expected.to contain_swift_proxy_config('DEFAULT/log_facility').with_value('LOG_LOCAL1')} + it { is_expected.to contain_swift_proxy_config('DEFAULT/log_facility').with_value('LOG_LOCAL2')} it { is_expected.to contain_swift_proxy_config('DEFAULT/log_level').with_value('DEBUG')} it { is_expected.to contain_swift_proxy_config('DEFAULT/log_headers').with_value('False')} it { is_expected.to contain_swift_proxy_config('DEFAULT/log_address').with_value('/dev/log')} @@ -199,7 +199,7 @@ describe 'swift::proxy' do it { is_expected.to contain_swift_proxy_config('pipeline:main/pipeline').with_value('swauth proxy-server')} it { is_expected.to contain_swift_proxy_config('app:proxy-server/use').with_value('egg:swift#proxy')} it { is_expected.to contain_swift_proxy_config('app:proxy-server/set log_name').with_value('swift-proxy-server')} - it { is_expected.to contain_swift_proxy_config('app:proxy-server/set log_facility').with_value('LOG_LOCAL1')} + it { is_expected.to contain_swift_proxy_config('app:proxy-server/set log_facility').with_value('LOG_LOCAL2')} it { is_expected.to contain_swift_proxy_config('app:proxy-server/set log_level').with_value('DEBUG')} it { is_expected.to contain_swift_proxy_config('app:proxy-server/set log_address').with_value('/dev/log')} it { is_expected.to contain_swift_proxy_config('app:proxy-server/log_handoffs').with_value('true')}