Skip to content

Commit a7fffa9

Browse files
author
Rob Day-Reynolds
committed
Fix occasional rsyslog hang on startup
* Workaround for rsyslog/rsyslog#1188 [#149827663](https://www.pivotaltracker.com/story/show/149827663) Signed-off-by: Rob Day-Reynolds <[email protected]>
1 parent fe9be16 commit a7fffa9

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

bosh-stemcell/spec/support/os_image_shared_examples.rb

+5
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,11 @@
192192
it { should be_file }
193193
its(:content) { should match('ModLoad imklog') }
194194
end
195+
196+
describe file('/etc/rsyslog.d/avoid-startup-deadlock.conf') do
197+
it { should be_file }
198+
its(:content) { should match(/global\(processInternalMessages="on"\)/) }
199+
end
195200
end
196201

197202
context 'auditd should be installed but not enabled (stig: V-38628) (stig: V-38631) (stig: V-38632)' do

stemcell_builder/stages/rsyslog_config/apply.sh

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ else
2525
fi
2626

2727
cp $assets_dir/enable-kernel-logging.conf $chroot/etc/rsyslog.d/enable-kernel-logging.conf
28+
cp $assets_dir/avoid-startup-deadlock.conf $chroot/etc/rsyslog.d/avoid-startup-deadlock.conf
2829

2930
cp -f $assets_dir/rsyslog_50-default.conf $chroot/etc/rsyslog.d/50-default.conf
3031

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# avoid-startup-deadlock.conf
2+
#
3+
# This configuration is a workaround for
4+
# https://github.com/rsyslog/rsyslog/issues/1188
5+
6+
global(processInternalMessages="on")

0 commit comments

Comments
 (0)