andreacavalli/tdlib-session-container
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update logging

Browse Source
This commit is contained in:
Andrea Cavalli 2022-01-04 12:59:33 +01:00
parent 2c798cc91b
commit 7271ceca8d
11 changed files with 36 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@ -12,7 +12,7 @@
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>17</maven.compiler.target>
<vertx.version>4.2.1</vertx.version> <vertx.version>4.2.2</vertx.version>
</properties> </properties>
<repositories> <repositories>
<repository> <repository>
@ -130,32 +130,22 @@
<dependency> <dependency>
<groupId>io.projectreactor.addons</groupId> <groupId>io.projectreactor.addons</groupId>
<artifactId>reactor-adapter</artifactId> <artifactId>reactor-adapter</artifactId>
<version>3.4.5</version> <version>3.4.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.akaita.java</groupId> <groupId>com.akaita.java</groupId>
<artifactId>rxjava2-debug</artifactId> <artifactId>rxjava2-debug</artifactId>
<version>1.4.0</version> <version>1.4.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.32</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId> <artifactId>log4j-core</artifactId>
<version>2.16.0</version> <version>2.17.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>2.16.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.warp</groupId> <groupId>org.warp</groupId>
<artifactId>common-utils</artifactId> <artifactId>common-utils</artifactId>
<version>1.1.6</version> <version>1.1.7</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>

5
src/main/java/it/tdlight/tdlibsession/remoteclient/TDLibRemoteClient.java
View File

@ -25,9 +25,8 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.Nullable; 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.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.core.publisher.Sinks; import reactor.core.publisher.Sinks;
@ -37,7 +36,7 @@ import reactor.tools.agent.ReactorDebugAgent;
public class TDLibRemoteClient implements AutoCloseable { public class TDLibRemoteClient implements AutoCloseable {
private static final Logger logger = LoggerFactory.getLogger(TDLibRemoteClient.class); private static final Logger logger = LogManager.getLogger(TDLibRemoteClient.class);
@Nullable @Nullable
private final SecurityInfo securityInfo; private final SecurityInfo securityInfo;

6
src/main/java/it/tdlight/tdlibsession/td/direct/AsyncTdDirectImpl.java
View File

@ -14,8 +14,8 @@ import it.tdlight.utils.MonoUtils;
import java.time.Duration; import java.time.Duration;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import org.warp.commonutils.log.Logger; import org.apache.logging.log4j.LogManager;
import org.warp.commonutils.log.LoggerFactory; import org.apache.logging.log4j.Logger;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.core.publisher.Sinks; import reactor.core.publisher.Sinks;
@ -24,7 +24,7 @@ import reactor.core.scheduler.Schedulers;
public class AsyncTdDirectImpl implements AsyncTdDirect { 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 TelegramClientFactory telegramClientFactory;
private final JsonObject implementationDetails; private final JsonObject implementationDetails;

6
src/main/java/it/tdlight/tdlibsession/td/direct/TestClient.java
View File

@ -30,9 +30,9 @@ import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicLong; 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.jetbrains.annotations.Nullable;
import org.warp.commonutils.log.Logger;
import org.warp.commonutils.log.LoggerFactory;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.core.publisher.Sinks; import reactor.core.publisher.Sinks;
@ -40,7 +40,7 @@ import reactor.core.publisher.Sinks.Empty;
public class TestClient implements ReactorTelegramClient { 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 static final AtomicLong incrementalMessageId = new AtomicLong(1);
private final List<String> features; private final List<String> features;

6
src/main/java/it/tdlight/tdlibsession/td/easy/AsyncTdEasy.java
View File

@ -45,9 +45,9 @@ import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.reactivestreams.Publisher; 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.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.core.publisher.Sinks; import reactor.core.publisher.Sinks;
@ -75,7 +75,7 @@ public class AsyncTdEasy {
public AsyncTdEasy(AsyncTdMiddle td, String logName) { public AsyncTdEasy(AsyncTdMiddle td, String logName) {
this.td = td; this.td = td;
this.logName = logName; this.logName = logName;
this.logger = LoggerFactory.getLogger("AsyncTdEasy " + logName); this.logger = LogManager.getLogger("AsyncTdEasy " + logName);
this.incomingUpdates = td.receive() this.incomingUpdates = td.receive()
.flatMapSequential(this::preprocessUpdates) .flatMapSequential(this::preprocessUpdates)

10
src/main/java/it/tdlight/tdlibsession/td/middle/client/AsyncTdMiddleEventBusClient.java
View File

@ -29,9 +29,9 @@ import java.nio.file.Path;
import java.time.Duration; import java.time.Duration;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.LockSupport; 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.locks.LockUtils;
import org.warp.commonutils.log.Logger;
import org.warp.commonutils.log.LoggerFactory;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.core.publisher.Sinks; import reactor.core.publisher.Sinks;
@ -71,7 +71,7 @@ public class AsyncTdMiddleEventBusClient implements AsyncTdMiddle {
private boolean local; private boolean local;
public AsyncTdMiddleEventBusClient(TdClusterManager clusterManager) { public AsyncTdMiddleEventBusClient(TdClusterManager clusterManager) {
this.logger = LoggerFactory.getLogger(AsyncTdMiddleEventBusClient.class); this.logger = LogManager.getLogger(AsyncTdMiddleEventBusClient.class);
this.cluster = clusterManager; this.cluster = clusterManager;
this.deliveryOptions = cluster.newDeliveryOpts().setLocalOnly(local); this.deliveryOptions = cluster.newDeliveryOpts().setLocalOnly(local);
this.deliveryOptionsWithTimeout = cluster.newDeliveryOpts().setLocalOnly(local).setSendTimeout(30000); this.deliveryOptionsWithTimeout = cluster.newDeliveryOpts().setLocalOnly(local).setSendTimeout(30000);
@ -100,7 +100,7 @@ public class AsyncTdMiddleEventBusClient implements AsyncTdMiddle {
.flatMap(binlog -> binlog .flatMap(binlog -> binlog
.getLastModifiedTime() .getLastModifiedTime()
.filter(modTime -> modTime == 0) .filter(modTime -> modTime == 0)
.doOnNext(v -> LoggerFactory .doOnNext(v -> LogManager
.getLogger(AsyncTdMiddleEventBusClient.class) .getLogger(AsyncTdMiddleEventBusClient.class)
.error("Can't retrieve binlog of bot " + botId + " " + botAlias + ". Creating a new one...")) .error("Can't retrieve binlog of bot " + botId + " " + botAlias + ". Creating a new one..."))
.thenReturn(binlog)).<AsyncTdMiddle>flatMap(binlog -> instance .thenReturn(binlog)).<AsyncTdMiddle>flatMap(binlog -> instance
@ -133,7 +133,7 @@ public class AsyncTdMiddleEventBusClient implements AsyncTdMiddle {
this.botAlias = botAlias; this.botAlias = botAlias;
this.botAddress = "bots.bot." + this.botId; this.botAddress = "bots.bot." + this.botId;
this.local = local; this.local = local;
this.logger = LoggerFactory.getLogger(this.botId + " " + botAlias); this.logger = LogManager.getLogger(this.botId + " " + botAlias);
return MonoUtils return MonoUtils
.fromBlockingEmpty(() -> { .fromBlockingEmpty(() -> {
EmitResult result; EmitResult result;

6
src/main/java/it/tdlight/tdlibsession/td/middle/direct/AsyncTdMiddleDirect.java
View File

@ -18,8 +18,8 @@ import it.tdlight.tdlibsession.td.middle.TdClusterManager;
import it.tdlight.utils.MonoUtils; import it.tdlight.utils.MonoUtils;
import java.time.Duration; import java.time.Duration;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import org.warp.commonutils.log.Logger; import org.apache.logging.log4j.LogManager;
import org.warp.commonutils.log.LoggerFactory; import org.apache.logging.log4j.Logger;
import reactor.core.Disposable; import reactor.core.Disposable;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
@ -29,7 +29,7 @@ import reactor.core.scheduler.Schedulers;
public class AsyncTdMiddleDirect extends AbstractVerticle implements AsyncTdMiddle { 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; private final TelegramClientFactory clientFactory;

6
src/main/java/it/tdlight/tdlibsession/td/middle/server/AsyncTdMiddleEventBusServer.java
View File

@ -31,8 +31,8 @@ import java.time.Duration;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import org.warp.commonutils.log.Logger; import org.apache.logging.log4j.LogManager;
import org.warp.commonutils.log.LoggerFactory; import org.apache.logging.log4j.Logger;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers; import reactor.core.scheduler.Schedulers;
@ -41,7 +41,7 @@ import reactor.util.function.Tuples;
public class AsyncTdMiddleEventBusServer extends AbstractVerticle { public class AsyncTdMiddleEventBusServer extends AbstractVerticle {
// Static values // 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 byte[] EMPTY = new byte[0];
public static final Duration WAIT_DURATION = Duration.ofSeconds(1); public static final Duration WAIT_DURATION = Duration.ofSeconds(1);

8
src/main/java/it/tdlight/utils/BinlogAsyncFile.java
View File

@ -4,14 +4,14 @@ import io.vertx.core.file.OpenOptions;
import io.vertx.reactivex.core.buffer.Buffer; import io.vertx.reactivex.core.buffer.Buffer;
import io.vertx.reactivex.core.file.AsyncFile; import io.vertx.reactivex.core.file.AsyncFile;
import io.vertx.reactivex.core.file.FileProps; import io.vertx.reactivex.core.file.FileProps;
import io.vertx.reactivex.core.file.FileSystem; import io.vertx.reactivex.core.file.FileSystem;;
import org.warp.commonutils.log.Logger; import org.apache.logging.log4j.LogManager;
import org.warp.commonutils.log.LoggerFactory; import org.apache.logging.log4j.Logger;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
public class BinlogAsyncFile { 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 FileSystem filesystem;
private final String path; private final String path;

6
src/main/java/it/tdlight/utils/BinlogUtils.java
View File

@ -15,8 +15,8 @@ import java.text.StringCharacterIterator;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
import java.time.ZoneOffset; import java.time.ZoneOffset;
import org.warp.commonutils.log.Logger; import org.apache.logging.log4j.LogManager;
import org.warp.commonutils.log.LoggerFactory; import org.apache.logging.log4j.Logger;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers; import reactor.core.scheduler.Schedulers;
@ -25,7 +25,7 @@ import reactor.util.function.Tuples;
public class BinlogUtils { public class BinlogUtils {
private static final Logger logger = LoggerFactory.getLogger(BinlogUtils.class); private static final Logger logger = LogManager.getLogger(BinlogUtils.class);
public static Mono<BinlogAsyncFile> retrieveBinlog(FileSystem vertxFilesystem, Path binlogPath) { public static Mono<BinlogAsyncFile> retrieveBinlog(FileSystem vertxFilesystem, Path binlogPath) {
var path = binlogPath.toString(); var path = binlogPath.toString();

6
src/main/java/it/tdlight/utils/MonoUtils.java
View File

@ -27,13 +27,13 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Supplier; 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.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.reactivestreams.Publisher; import org.reactivestreams.Publisher;
import org.reactivestreams.Subscription; import org.reactivestreams.Subscription;
import org.warp.commonutils.functional.IOConsumer; 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.CoreSubscriber;
import reactor.core.publisher.Flux; import reactor.core.publisher.Flux;
import reactor.core.publisher.FluxSink.OverflowStrategy; import reactor.core.publisher.FluxSink.OverflowStrategy;
@ -53,7 +53,7 @@ import reactor.util.context.Context;
public class MonoUtils { public class MonoUtils {
private static final Logger logger = LoggerFactory.getLogger(MonoUtils.class); private static final Logger logger = LogManager.getLogger(MonoUtils.class);
public static <T> Mono<T> notImplemented() { public static <T> Mono<T> notImplemented() {
return Mono.fromCallable(() -> { return Mono.fromCallable(() -> {