From 7271ceca8d81e5b388402db3435cd42aee321d59 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Tue, 4 Jan 2022 12:59:33 +0100 Subject: [PATCH] Update logging --- pom.xml | 18 ++++-------------- .../remoteclient/TDLibRemoteClient.java | 5 ++--- .../td/direct/AsyncTdDirectImpl.java | 6 +++--- .../tdlibsession/td/direct/TestClient.java | 6 +++--- .../tdlibsession/td/easy/AsyncTdEasy.java | 6 +++--- .../client/AsyncTdMiddleEventBusClient.java | 10 +++++----- .../td/middle/direct/AsyncTdMiddleDirect.java | 6 +++--- .../server/AsyncTdMiddleEventBusServer.java | 6 +++--- .../java/it/tdlight/utils/BinlogAsyncFile.java | 8 ++++---- .../java/it/tdlight/utils/BinlogUtils.java | 6 +++--- src/main/java/it/tdlight/utils/MonoUtils.java | 6 +++--- 11 files changed, 36 insertions(+), 47 deletions(-) diff --git a/pom.xml b/pom.xml index ae1eef1..b80c568 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ 17 17 - 4.2.1 + 4.2.2 @@ -130,32 +130,22 @@ io.projectreactor.addons reactor-adapter - 3.4.5 + 3.4.6 com.akaita.java rxjava2-debug 1.4.0 - - org.slf4j - slf4j-api - 1.7.32 - org.apache.logging.log4j log4j-core - 2.16.0 - - - org.apache.logging.log4j - log4j-slf4j-impl - 2.16.0 + 2.17.0 org.warp common-utils - 1.1.6 + 1.1.7 io.netty diff --git a/src/main/java/it/tdlight/tdlibsession/remoteclient/TDLibRemoteClient.java b/src/main/java/it/tdlight/tdlibsession/remoteclient/TDLibRemoteClient.java index cedd4c4..a493349 100644 --- a/src/main/java/it/tdlight/tdlibsession/remoteclient/TDLibRemoteClient.java +++ b/src/main/java/it/tdlight/tdlibsession/remoteclient/TDLibRemoteClient.java @@ -25,9 +25,8 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.Nullable; -import org.warp.commonutils.log.Logger; -import org.warp.commonutils.log.LoggerFactory; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.publisher.Sinks; @@ -37,7 +36,7 @@ import reactor.tools.agent.ReactorDebugAgent; public class TDLibRemoteClient implements AutoCloseable { - private static final Logger logger = LoggerFactory.getLogger(TDLibRemoteClient.class); + private static final Logger logger = LogManager.getLogger(TDLibRemoteClient.class); @Nullable private final SecurityInfo securityInfo; diff --git a/src/main/java/it/tdlight/tdlibsession/td/direct/AsyncTdDirectImpl.java b/src/main/java/it/tdlight/tdlibsession/td/direct/AsyncTdDirectImpl.java index 51cba2c..bc8ba43 100644 --- a/src/main/java/it/tdlight/tdlibsession/td/direct/AsyncTdDirectImpl.java +++ b/src/main/java/it/tdlight/tdlibsession/td/direct/AsyncTdDirectImpl.java @@ -14,8 +14,8 @@ import it.tdlight.utils.MonoUtils; import java.time.Duration; import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; -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.publisher.Sinks; @@ -24,7 +24,7 @@ import reactor.core.scheduler.Schedulers; public class AsyncTdDirectImpl implements AsyncTdDirect { - private static final Logger logger = LoggerFactory.getLogger(AsyncTdDirect.class); + private static final Logger logger = LogManager.getLogger(AsyncTdDirect.class); private final TelegramClientFactory telegramClientFactory; private final JsonObject implementationDetails; diff --git a/src/main/java/it/tdlight/tdlibsession/td/direct/TestClient.java b/src/main/java/it/tdlight/tdlibsession/td/direct/TestClient.java index 90d868a..af85f6d 100644 --- a/src/main/java/it/tdlight/tdlibsession/td/direct/TestClient.java +++ b/src/main/java/it/tdlight/tdlibsession/td/direct/TestClient.java @@ -30,9 +30,9 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.concurrent.atomic.AtomicLong; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.Nullable; -import org.warp.commonutils.log.Logger; -import org.warp.commonutils.log.LoggerFactory; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.publisher.Sinks; @@ -40,7 +40,7 @@ import reactor.core.publisher.Sinks.Empty; public class TestClient implements ReactorTelegramClient { - private static final Logger logger = LoggerFactory.getLogger(TestClient.class); + private static final Logger logger = LogManager.getLogger(TestClient.class); private static final AtomicLong incrementalMessageId = new AtomicLong(1); private final List features; diff --git a/src/main/java/it/tdlight/tdlibsession/td/easy/AsyncTdEasy.java b/src/main/java/it/tdlight/tdlibsession/td/easy/AsyncTdEasy.java index c72d6ce..b1c8ad1 100644 --- a/src/main/java/it/tdlight/tdlibsession/td/easy/AsyncTdEasy.java +++ b/src/main/java/it/tdlight/tdlibsession/td/easy/AsyncTdEasy.java @@ -45,9 +45,9 @@ import java.util.Objects; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.reactivestreams.Publisher; -import org.warp.commonutils.log.Logger; -import org.warp.commonutils.log.LoggerFactory; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.publisher.Sinks; @@ -75,7 +75,7 @@ public class AsyncTdEasy { public AsyncTdEasy(AsyncTdMiddle td, String logName) { this.td = td; this.logName = logName; - this.logger = LoggerFactory.getLogger("AsyncTdEasy " + logName); + this.logger = LogManager.getLogger("AsyncTdEasy " + logName); this.incomingUpdates = td.receive() .flatMapSequential(this::preprocessUpdates) diff --git a/src/main/java/it/tdlight/tdlibsession/td/middle/client/AsyncTdMiddleEventBusClient.java b/src/main/java/it/tdlight/tdlibsession/td/middle/client/AsyncTdMiddleEventBusClient.java index 04b4fa1..ba2938b 100644 --- a/src/main/java/it/tdlight/tdlibsession/td/middle/client/AsyncTdMiddleEventBusClient.java +++ b/src/main/java/it/tdlight/tdlibsession/td/middle/client/AsyncTdMiddleEventBusClient.java @@ -29,9 +29,9 @@ import java.nio.file.Path; import java.time.Duration; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.LockSupport; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.warp.commonutils.locks.LockUtils; -import org.warp.commonutils.log.Logger; -import org.warp.commonutils.log.LoggerFactory; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.core.publisher.Sinks; @@ -71,7 +71,7 @@ public class AsyncTdMiddleEventBusClient implements AsyncTdMiddle { private boolean local; public AsyncTdMiddleEventBusClient(TdClusterManager clusterManager) { - this.logger = LoggerFactory.getLogger(AsyncTdMiddleEventBusClient.class); + this.logger = LogManager.getLogger(AsyncTdMiddleEventBusClient.class); this.cluster = clusterManager; this.deliveryOptions = cluster.newDeliveryOpts().setLocalOnly(local); this.deliveryOptionsWithTimeout = cluster.newDeliveryOpts().setLocalOnly(local).setSendTimeout(30000); @@ -100,7 +100,7 @@ public class AsyncTdMiddleEventBusClient implements AsyncTdMiddle { .flatMap(binlog -> binlog .getLastModifiedTime() .filter(modTime -> modTime == 0) - .doOnNext(v -> LoggerFactory + .doOnNext(v -> LogManager .getLogger(AsyncTdMiddleEventBusClient.class) .error("Can't retrieve binlog of bot " + botId + " " + botAlias + ". Creating a new one...")) .thenReturn(binlog)).flatMap(binlog -> instance @@ -133,7 +133,7 @@ public class AsyncTdMiddleEventBusClient implements AsyncTdMiddle { this.botAlias = botAlias; this.botAddress = "bots.bot." + this.botId; this.local = local; - this.logger = LoggerFactory.getLogger(this.botId + " " + botAlias); + this.logger = LogManager.getLogger(this.botId + " " + botAlias); return MonoUtils .fromBlockingEmpty(() -> { EmitResult result; diff --git a/src/main/java/it/tdlight/tdlibsession/td/middle/direct/AsyncTdMiddleDirect.java b/src/main/java/it/tdlight/tdlibsession/td/middle/direct/AsyncTdMiddleDirect.java index bcabdbc..af45ba8 100644 --- a/src/main/java/it/tdlight/tdlibsession/td/middle/direct/AsyncTdMiddleDirect.java +++ b/src/main/java/it/tdlight/tdlibsession/td/middle/direct/AsyncTdMiddleDirect.java @@ -18,8 +18,8 @@ import it.tdlight.tdlibsession.td.middle.TdClusterManager; import it.tdlight.utils.MonoUtils; import java.time.Duration; import java.util.concurrent.atomic.AtomicReference; -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.Disposable; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -29,7 +29,7 @@ import reactor.core.scheduler.Schedulers; public class AsyncTdMiddleDirect extends AbstractVerticle implements AsyncTdMiddle { - private static final Logger logger = LoggerFactory.getLogger(AsyncTdMiddleDirect.class); + private static final Logger logger = LogManager.getLogger(AsyncTdMiddleDirect.class); private final TelegramClientFactory clientFactory; diff --git a/src/main/java/it/tdlight/tdlibsession/td/middle/server/AsyncTdMiddleEventBusServer.java b/src/main/java/it/tdlight/tdlibsession/td/middle/server/AsyncTdMiddleEventBusServer.java index 9b1ad81..27a3acd 100644 --- a/src/main/java/it/tdlight/tdlibsession/td/middle/server/AsyncTdMiddleEventBusServer.java +++ b/src/main/java/it/tdlight/tdlibsession/td/middle/server/AsyncTdMiddleEventBusServer.java @@ -31,8 +31,8 @@ import java.time.Duration; import java.util.List; import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; -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; @@ -41,7 +41,7 @@ import reactor.util.function.Tuples; public class AsyncTdMiddleEventBusServer extends AbstractVerticle { // Static values - protected static final Logger logger = LoggerFactory.getLogger("TdMiddleServer"); + protected static final Logger logger = LogManager.getLogger("TdMiddleServer"); public static final byte[] EMPTY = new byte[0]; public static final Duration WAIT_DURATION = Duration.ofSeconds(1); diff --git a/src/main/java/it/tdlight/utils/BinlogAsyncFile.java b/src/main/java/it/tdlight/utils/BinlogAsyncFile.java index e56cb78..91f7d32 100644 --- a/src/main/java/it/tdlight/utils/BinlogAsyncFile.java +++ b/src/main/java/it/tdlight/utils/BinlogAsyncFile.java @@ -4,14 +4,14 @@ import io.vertx.core.file.OpenOptions; import io.vertx.reactivex.core.buffer.Buffer; import io.vertx.reactivex.core.file.AsyncFile; import io.vertx.reactivex.core.file.FileProps; -import io.vertx.reactivex.core.file.FileSystem; -import org.warp.commonutils.log.Logger; -import org.warp.commonutils.log.LoggerFactory; +import io.vertx.reactivex.core.file.FileSystem;; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import reactor.core.publisher.Mono; public class BinlogAsyncFile { - private static final Logger logger = LoggerFactory.getLogger(BinlogAsyncFile.class); + private static final Logger logger = LogManager.getLogger(BinlogAsyncFile.class); private final FileSystem filesystem; private final String path; diff --git a/src/main/java/it/tdlight/utils/BinlogUtils.java b/src/main/java/it/tdlight/utils/BinlogUtils.java index f8006d0..85e4149 100644 --- a/src/main/java/it/tdlight/utils/BinlogUtils.java +++ b/src/main/java/it/tdlight/utils/BinlogUtils.java @@ -15,8 +15,8 @@ import java.text.StringCharacterIterator; import java.time.Duration; import java.time.Instant; import java.time.ZoneOffset; -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; @@ -25,7 +25,7 @@ import reactor.util.function.Tuples; public class BinlogUtils { - private static final Logger logger = LoggerFactory.getLogger(BinlogUtils.class); + private static final Logger logger = LogManager.getLogger(BinlogUtils.class); public static Mono retrieveBinlog(FileSystem vertxFilesystem, Path binlogPath) { var path = binlogPath.toString(); diff --git a/src/main/java/it/tdlight/utils/MonoUtils.java b/src/main/java/it/tdlight/utils/MonoUtils.java index 0386385..9ed526c 100644 --- a/src/main/java/it/tdlight/utils/MonoUtils.java +++ b/src/main/java/it/tdlight/utils/MonoUtils.java @@ -27,13 +27,13 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import java.util.function.Supplier; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.reactivestreams.Publisher; import org.reactivestreams.Subscription; import org.warp.commonutils.functional.IOConsumer; -import org.warp.commonutils.log.Logger; -import org.warp.commonutils.log.LoggerFactory; import reactor.core.CoreSubscriber; import reactor.core.publisher.Flux; import reactor.core.publisher.FluxSink.OverflowStrategy; @@ -53,7 +53,7 @@ import reactor.util.context.Context; public class MonoUtils { - private static final Logger logger = LoggerFactory.getLogger(MonoUtils.class); + private static final Logger logger = LogManager.getLogger(MonoUtils.class); public static Mono notImplemented() { return Mono.fromCallable(() -> {