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

Improve kafka logging, update tdlib

This commit is contained in:
Andrea Cavalli 2022-03-21 01:08:12 +01:00
parent 5cf00542da
commit 8645231031
4 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -48,7 +48,7 @@
<dependency>
<groupId>it.tdlight</groupId>
<artifactId>tdlight-java-bom</artifactId>
<version>2.8.2.0</version>
<version>2.8.2.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>

10
src/main/java/it/tdlight/reactiveapi/DynamicAtomixReactiveApiClient.java
View File

@ -41,7 +41,15 @@ public class DynamicAtomixReactiveApiClient extends BaseAtomixReactiveApiClient
.consumeMessages(subGroupId, userId)
.takeWhile(n -> !closed)
.publish()
.autoConnect(3, clientBoundEventsSubscription::set);
.autoConnect(3, clientBoundEventsSubscription::set)
.onErrorResume(CancellationException.class, ex -> {
if ("Disconnected".equals(ex.getMessage())) {
LOG.debug("Disconnected client {}", userId, ex);
return Mono.empty();
} else {
return Mono.error(ex);
}
});
var firstLiveId = clientBoundEvents
.take(1, true)

16
src/main/java/it/tdlight/reactiveapi/KafkaConsumer.java
View File

@ -1,5 +1,7 @@
package it.tdlight.reactiveapi;
import it.tdlight.common.Init;
import it.tdlight.common.utils.CantLoadLibrary;
import it.tdlight.reactiveapi.Event.ClientBoundEvent;
import java.time.Duration;
import java.util.HashMap;
@ -31,6 +33,12 @@ public class KafkaConsumer {
}
public KafkaReceiver<Integer, ClientBoundEvent> createReceiver(@NotNull String groupId, @Nullable Long userId) {
try {
Init.start();
} catch (CantLoadLibrary e) {
LOG.error("Can't load TDLight library", e);
throw new RuntimeException(e);
}
Map<String, Object> props = new HashMap<>();
props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, kafkaParameters.bootstrapServers());
props.put(ConsumerConfig.CLIENT_ID_CONFIG, kafkaParameters.clientId() + (userId != null ? ("_" + userId) : ""));
@ -80,7 +88,13 @@ public class KafkaConsumer {
private Flux<TimestampedClientBoundEvent> consumeMessagesInternal(@NotNull String subGroupId, @Nullable Long userId) {
return createReceiver(kafkaParameters.groupId() + "-" + subGroupId, userId)
.receive()
.log("consume-messages", Level.FINEST, SignalType.REQUEST)
.log("consume-messages" + (userId != null ? "-" + userId : ""),
Level.FINEST,
SignalType.REQUEST,
SignalType.ON_NEXT,
SignalType.ON_ERROR,
SignalType.ON_COMPLETE
)
.doOnNext(result -> result.receiverOffset().acknowledge())
.map(record -> {
if (record.timestampType() == TimestampType.CREATE_TIME) {

9
src/main/java/it/tdlight/reactiveapi/KafkaProducer.java
View File

@ -4,6 +4,7 @@ import it.tdlight.reactiveapi.Event.ClientBoundEvent;
import java.time.Duration;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.serialization.IntegerSerializer;
@ -11,6 +12,7 @@ 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.SignalType;
import reactor.kafka.sender.KafkaSender;
import reactor.kafka.sender.SenderOptions;
import reactor.kafka.sender.SenderRecord;
@ -40,6 +42,13 @@ public class KafkaProducer {
userId.getTopic(),
event
), null))
.log("produce-messages-" + userId,
Level.FINEST,
SignalType.REQUEST,
SignalType.ON_NEXT,
SignalType.ON_ERROR,
SignalType.ON_COMPLETE
)
.transform(sender::send)
.doOnError(e -> LOG.error("Send failed", e))
.then();