External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-14 06:29:25 -02:30
Code Issues Packages Projects Releases Wiki Activity

Make rsyslog.conf writes atomic

Browse Source 
- This writes the rsyslog.conf in a temporary dir, then replaces the
   original in one atomic operation.
This commit is contained in:
Christian Adams
2020-05-06 17:54:46 -04:00
parent e64f9c6963
commit 0675b9e8fa
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/utils/external_logging.py
View File

@@ -1,5 +1,6 @@
import os import os
import shutil
import tempfile
import urllib.parse as urlparse import urllib.parse as urlparse
from django.conf import settings from django.conf import settings
@@ -112,6 +113,10 @@ def construct_rsyslog_conf_template(settings=settings):
def reconfigure_rsyslog(): def reconfigure_rsyslog():
tmpl = construct_rsyslog_conf_template() tmpl = construct_rsyslog_conf_template()
with open('/var/lib/awx/rsyslog/rsyslog.conf', 'w') as f: # Write config to a temp file then move it to preserve atomicity
temp_dir = tempfile.TemporaryDirectory(prefix='rsyslog-conf-', dir='/tmp')
path = temp_dir.name + '/rsyslog.conf.temp'
with open(path, 'w') as f:
f.write(tmpl + '\n') f.write(tmpl + '\n')
shutil.move(path, '/var/lib/awx/rsyslog/rsyslog.conf')
supervisor_service_command(command='restart', service='awx-rsyslogd') supervisor_service_command(command='restart', service='awx-rsyslogd')