You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2016/04/10 20:34:28 UTC
tomee git commit: Remove commons-io dep from runtime tomee-juli
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x ac3d551e2 -> 4b3a42748
Remove commons-io dep from runtime tomee-juli
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4b3a4274
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4b3a4274
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4b3a4274
Branch: refs/heads/tomee-1.7.x
Commit: 4b3a427487041769c881416b31beb2cf5aee5962
Parents: ac3d551
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
Authored: Sun Apr 10 11:34:16 2016 -0700
Committer: Jean-Louis Monteiro <jl...@tomitribe.com>
Committed: Sun Apr 10 11:34:16 2016 -0700
----------------------------------------------------------------------
tomee/tomee-juli/pom.xml | 1 +
.../jul/handler/rotating/LocalFileHandler.java | 20 ++++++++++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/4b3a4274/tomee/tomee-juli/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-juli/pom.xml b/tomee/tomee-juli/pom.xml
index df7ed85..a2df271 100644
--- a/tomee/tomee-juli/pom.xml
+++ b/tomee/tomee-juli/pom.xml
@@ -39,6 +39,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/4b3a4274/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java
index ffa61aa..ea5eed7 100644
--- a/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java
+++ b/tomee/tomee-juli/src/main/java/org/apache/tomee/jul/handler/rotating/LocalFileHandler.java
@@ -16,8 +16,6 @@
*/
package org.apache.tomee.jul.handler.rotating;
-import org.apache.commons.io.FileUtils;
-
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -377,8 +375,18 @@ public class LocalFileHandler extends Handler {
if (archives != null) {
for (final File archive : archives) {
try {
- if (FileUtils.isFileOlder(archive, now - purgeExpiryDuration)) {
- if (!FileUtils.deleteQuietly(archive)) {
+ /*
+ Java 7 / TomEE 7.x implementation does
+
+ final BasicFileAttributes attr = Files.readAttributes(archive.toPath(), BasicFileAttributes.class);
+ if (now - attr.creationTime().toMillis() > purgeExpiryDuration) {
+
+ We can't do the creationTime, so using lastModified as fallback. For the archive, creation will be close
+ to lastModified, so worth case, we'll miss one cycle
+ */
+ final long lastModified = archive.lastModified();
+ if (now - lastModified > purgeExpiryDuration) {
+ if (!archive.delete()) {
// Do not try to delete on exit cause we will find it again
reportError("Failed to delete " + archive.getAbsolutePath() + ".", null, ErrorManager.GENERIC_FAILURE);
}
@@ -401,7 +409,7 @@ public class LocalFileHandler extends Handler {
if (logs != null) {
for (final File file : logs) {
try {
- final boolean older = FileUtils.isFileOlder(file, now);
+ final boolean older = file.lastModified() < now;
if (older && now - file.lastModified() > archiveExpiryDuration) {
createArchive(file);
}
@@ -496,7 +504,7 @@ public class LocalFileHandler extends Handler {
}
}
try {
- if (!FileUtils.deleteQuietly(source)) {
+ if (!source.delete()) {
reportError("Can't delete " + source.getAbsolutePath() + ".", null, ErrorManager.GENERIC_FAILURE);
}
} catch (final Exception e) {