commit 0edff8bcbe440ff952ee7cb2db4e5603a0061f93
author Willy Tu <wltu@google.com> Tue Aug 01 23:31:51 2023 -0700
committer Willy Tu <wltu@google.com> Thu Aug 03 05:57:38 2023 +0000
tree 58a8e6199f0fbda4a88b674aef1b3c58d3100c48
parent d712b02e40416bc2b3b9332ec2de170ae25aaf68

rsyslog: Add back PATCH tracker footer

Update the description of the CL and removed a commented out free
command.

Google-Bug-Id: 283335713
Change-Id: If8e6087c22b30c2ee6b13a1f782bf8b3cd7ca826
Signed-off-by: Willy Tu <wltu@google.com>

recipes-extended/rsyslog/rsyslog/0001-imjournal-Support-input-module.patch

diff --git a/recipes-extended/rsyslog/rsyslog/0001-imjournal-Support-input-module.patch b/recipes-extended/rsyslog/rsyslog/0001-imjournal-Support-input-module.patch
index efb780a..787ddb5 100644
--- a/recipes-extended/rsyslog/rsyslog/0001-imjournal-Support-input-module.patch
+++ b/recipes-extended/rsyslog/rsyslog/0001-imjournal-Support-input-module.patch
@@ -12,7 +12,7 @@
 the memory usage will increase since it will open a new journal input.
 
 Each input module will create a new state file if it exists with the
-suffix of the rule name.
+rule name being the subpath with the base state file as the folder.
 
 Tested:
 
@@ -46,11 +46,11 @@
 - Stop collector network -> Stop Journal pointer
 ```
 SECONDS=0
-expected="$(md5sum /var/log/state-remote)"
+expected="$(md5sum /var/log/state/remote)"
 echo "Expected state ${expected}"
 while [ $SECONDS -lt 300 ];
 do
-  new_state="$(md5sum /var/log/state-remote)"
+  new_state="$(md5sum /var/log/state/remote)"
   if [[ "${new_state}" != "${expected}" ]];
   then
     echo "Got state ${new_state} instead of ${expected}"
@@ -63,7 +63,7 @@
 ```
 
 ```
-Expected state 309593de34bc095e4245c1ba07a7520c  /var/log/state-remote
+Expected state 309593de34bc095e4245c1ba07a7520c  /var/log/state/remote
 Passed
 ```
 
@@ -71,12 +71,18 @@
 
 The state file changed after the connection resumed.
 ```
-$ md5sum /var/log/state-remote
-d11c7e46fec4f86151df204608525d89  /var/log/state-remote
+$ md5sum /var/log/state/remote
+d11c7e46fec4f86151df204608525d89  /var/log/state/remote
 ```
 
 The message send in when the connection was down is also sent out properly.
 
+Patch Tracking Bug: b/283335713
+Upstream info / review:
+  https://github.com/rsyslog/rsyslog/pull/5146
+Upstream-Status: Submitted
+Justification:  High priority fixes for high disk usage with rsyslog when network is down.
+bugfix(b/281475520)
 Signed-off-by: Willy Tu <wltu@google.com>
 ---
  plugins/imjournal/imjournal.c | 587 ++++++++++++++++++++++++++--------