From b2191f9ec6373360fba5216a844dd9a49b0191f9 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Tue, 4 Jan 2022 12:59:21 +0100 Subject: [PATCH] Update logging --- pom.xml | 2 +- src/main/java/org/warp/filesponge/DataBlock.java | 6 +++--- src/main/java/org/warp/filesponge/FileSponge.java | 6 +++--- src/main/java/org/warp/filesponge/FileSpongeUtils.java | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 43df92c..3cf31fe 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ org.warp common-utils - 1.1.6 + 1.1.7 io.projectreactor diff --git a/src/main/java/org/warp/filesponge/DataBlock.java b/src/main/java/org/warp/filesponge/DataBlock.java index a9ebfe8..0598ae3 100644 --- a/src/main/java/org/warp/filesponge/DataBlock.java +++ b/src/main/java/org/warp/filesponge/DataBlock.java @@ -26,12 +26,12 @@ import io.net5.buffer.api.internal.ResourceSupport; import it.cavallium.dbengine.database.LLSearchResultShard; import it.cavallium.dbengine.database.collections.DatabaseSingle; import java.util.Objects; -import org.warp.commonutils.log.Logger; -import org.warp.commonutils.log.LoggerFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public final class DataBlock extends ResourceSupport { - private static final Logger logger = LoggerFactory.getLogger(DataBlock.class); + private static final Logger logger = LogManager.getLogger(DataBlock.class); private static final Drop DROP = new Drop<>() { @Override diff --git a/src/main/java/org/warp/filesponge/FileSponge.java b/src/main/java/org/warp/filesponge/FileSponge.java index 2665dfb..2840233 100644 --- a/src/main/java/org/warp/filesponge/FileSponge.java +++ b/src/main/java/org/warp/filesponge/FileSponge.java @@ -24,15 +24,15 @@ import java.util.List; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; -import org.warp.commonutils.log.Logger; -import org.warp.commonutils.log.LoggerFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; public class FileSponge implements URLsHandler { - private static final Logger logger = LoggerFactory.getLogger(FileSponge.class); + private static final Logger logger = LogManager.getLogger(FileSponge.class); public static final int BLOCK_SIZE = 1024 * 1024; // 1 MiB diff --git a/src/main/java/org/warp/filesponge/FileSpongeUtils.java b/src/main/java/org/warp/filesponge/FileSpongeUtils.java index 9cb1a60..e2841d7 100644 --- a/src/main/java/org/warp/filesponge/FileSpongeUtils.java +++ b/src/main/java/org/warp/filesponge/FileSpongeUtils.java @@ -25,8 +25,8 @@ import java.time.Duration; import java.util.List; import java.util.NoSuchElementException; import java.util.concurrent.TimeUnit; -import org.warp.commonutils.log.Logger; -import org.warp.commonutils.log.LoggerFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import reactor.core.Exceptions; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -34,7 +34,7 @@ import reactor.core.scheduler.Schedulers; public class FileSpongeUtils { - private static final Logger logger = LoggerFactory.getLogger(FileSponge.class); + private static final Logger logger = LogManager.getLogger(FileSponge.class); public static Mono firstWithValueMono(List> monos) { return Mono.firstWithValue(monos).onErrorResume(FileSpongeUtils::ignoreFakeErrors);