Address race condition where shell can write new file before read of …

…old is complete (#541) Fixes #539
CSVD · Jun 23, 2020 · 6fa91c2 · 6fa91c2
1 parent 2383342
commit 6fa91c2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/package/sbin/entrypoint.sh b/package/sbin/entrypoint.sh
@@ -46,7 +46,9 @@ if [ -f /opt/syslog-ng/etc/conf.d/local/context/splunk_index.csv ]; then
     LEGACY_SPLUNK_INDEX_FILE=/opt/syslog-ng/etc/conf.d/local/context/splunk_index.csv
 fi
 # Add new entries
-awk '{print $0}' ${LEGACY_SPLUNK_INDEX_FILE} /opt/syslog-ng/etc/conf.d/local/context/splunk_metadata.csv /opt/syslog-ng/etc/context_templates/splunk_metadata.csv.example | grep -v '^#' | sort -b -t ',' -k1,2 -u  > /opt/syslog-ng/etc/conf.d/local/context/splunk_metadata.csv
+temp_file=$(mktemp)
+awk '{print $0}' ${LEGACY_SPLUNK_INDEX_FILE} /opt/syslog-ng/etc/conf.d/local/context/splunk_metadata.csv /opt/syslog-ng/etc/context_templates/splunk_metadata.csv.example | grep -v '^#' | sort -b -t ',' -k1,2 -u  > $temp_file
+cp -f $temp_file /opt/syslog-ng/etc/conf.d/local/context/splunk_metadata.csv
 # We don't need this file any longer
 rm -f /opt/syslog-ng/etc/conf.d/local/context/splunk_index.csv.example || true 
 if [ -f /opt/syslog-ng/etc/conf.d/local/context/splunk_index.csv ]; then