From 9e05d41f3cf8480e5f40e8791aeced8e1bf22b1a Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Wed, 16 Dec 2009 17:14:30 +0000 Subject: QPID-2274 : Addressed initial issues with Async compressing deleting log files git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@891322 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/log4j/QpidCompositeRollingAppender.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java b/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java index 7e0c4defe1..ea0fab17bd 100644 --- a/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java +++ b/java/broker/src/main/java/org/apache/log4j/QpidCompositeRollingAppender.java @@ -749,16 +749,17 @@ public class QpidCompositeRollingAppender extends FileAppender } File file = new File(from); - if (compress) + if (!file.getPath().equals(target.getPath())) { - compress(file, target); + file.renameTo(target); } - else + + // Compress file after it has been moved out the way... this is safe + // as it will gain a .gz ending and we can then safely delete this file + // as it will not be the statically named value. + if (compress) { - if (!file.getPath().equals(target.getPath())) - { - file.renameTo(target); - } + compress(to); } LogLog.debug(from + " -> " + to); -- cgit v1.2.1