开源软件构建与测试

Changes of Revision 3

_service:tar_scm:logrotate.spec Changed

_service:tar_scm:backport-do-not-rotate-old-logs-on-prerotate-failure.patch Added

@@ -0,0 +1,45 @@
+From 5f24239f282b8c6291cf35ea5f871ed0ca6b2672 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
+Date: Tue, 4 Apr 2023 17:49:06 +0200
+Subject: PATCH do not rotate old logs on prerotate failure
+
+Ensures old logs are preserved and not rotated out for logs with a
+failing prerotate script.
+
+Alternative to #502
+---
+ logrotate.c       | 14 ++++++++++----
+ 1 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/logrotate.c b/logrotate.c
+index f44b3851..d3ccb447 100644
+--- a/logrotate.c
++++ b/logrotate.c
+@@ -2476,10 +2476,6 @@ static int rotateLogSet(const struct logInfo *log, int force)
+                 return 1;
+             }
+             memset(rotNamesi, 0, sizeof(struct logNames));
+-
+-            logHasErrorsi |=
+-                prerotateSingleLog(log, i, statei, rotNamesi);
+-            hasErrors |= logHasErrorsi;
+         }
+ 
+         if (log->pre
+@@ -2509,6 +2505,16 @@ static int rotateLogSet(const struct logInfo *log, int force)
+             }
+         }
+ 
++        for (i = j;
++             ((log->flags & LOG_FLAG_SHAREDSCRIPTS) && i < log->numFiles)
++             || (!(log->flags & LOG_FLAG_SHAREDSCRIPTS) && i == j); i++) {
++            if (! ( (logHasErrorsi && !(log->flags & LOG_FLAG_SHAREDSCRIPTS))
++                    || (hasErrors && (log->flags & LOG_FLAG_SHAREDSCRIPTS)) ) ) {
++                logHasErrorsi |= prerotateSingleLog(log, i, statei, rotNamesi);
++                hasErrors |= logHasErrorsi;
++            }
++        }
++
+         for (i = j;
+                 ((log->flags & LOG_FLAG_SHAREDSCRIPTS) && i < log->numFiles)
+                 || (!(log->flags & LOG_FLAG_SHAREDSCRIPTS) && i == j); i++) {