From 519886d8e9753bdb2ad9e9ccd6b3c952fc8c5ded Mon Sep 17 00:00:00 2001 From: rfaircloth-splunk Date: Fri, 13 Mar 2020 09:01:44 -0400 Subject: [PATCH] Reset entries for syslog-ng stderr and stdout redirects in the persist-file syslog-ng tracks the offset but could not identify a re-write of a file that results in the same file length. This prevent marking the version of sc4s in the internal logs which is confusing for the end user --- package/Dockerfile | 2 +- package/reset_persist | 3 +++ package/sbin/entrypoint.sh | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 package/reset_persist diff --git a/package/Dockerfile b/package/Dockerfile index 0ad5796..75af89c 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -18,7 +18,7 @@ COPY etc/conf.d /opt/syslog-ng/etc/conf.d COPY etc/go_templates /opt/syslog-ng/etc/go_templates COPY etc/context_templates /opt/syslog-ng/etc/context_templates COPY etc/local_config /opt/syslog-ng/etc/local_config - +COPY reset_persist /opt/syslog-ng/etc/ COPY sbin/entrypoint.sh / COPY VERSION / diff --git a/package/reset_persist b/package/reset_persist new file mode 100644 index 0000000..dc981a1 --- /dev/null +++ b/package/reset_persist @@ -0,0 +1,3 @@ +affile_sd_curpos(/opt/syslog-ng/var/log/syslog-ng.out) = { "value": "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 " } + +affile_sd_curpos(/opt/syslog-ng/var/log/syslog-ng.err) = { "value": "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 " } \ No newline at end of file diff --git a/package/sbin/entrypoint.sh b/package/sbin/entrypoint.sh index e68bf47..3494307 100755 --- a/package/sbin/entrypoint.sh +++ b/package/sbin/entrypoint.sh @@ -27,4 +27,5 @@ echo sc4s version=$(cat /VERSION) >/opt/syslog-ng/var/log/syslog-ng.out /opt/syslog-ng/sbin/syslog-ng -s >>/opt/syslog-ng/var/log/syslog-ng.out 2>/opt/syslog-ng/var/log/syslog-ng.err echo syslog-ng starting +/opt/syslog-ng/bin/persist-tool add /opt/syslog-ng/etc/reset_persist -o /opt/syslog-ng/var exec /opt/syslog-ng/sbin/syslog-ng $@