X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fdomain%2FChatroom.java;h=60f7274e813398bd8050d1af55d27552fdfd81cb;hb=b159d9543cdb96b4d600bff8dacf79a7f5fff20f;hp=966a28eeb13a331196bda881647bb2c170f07c2a;hpb=6c96b0b685b7fece1761f9471d5f0689171956ed;p=demos%2Fkafka%2Fchat

diff --git a/src/main/java/de/juplo/kafka/chat/backend/domain/Chatroom.java b/src/main/java/de/juplo/kafka/chat/backend/domain/Chatroom.java
index 966a28ee..60f7274e 100644
--- a/src/main/java/de/juplo/kafka/chat/backend/domain/Chatroom.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/domain/Chatroom.java
@@ -18,7 +18,8 @@ public class Chatroom
   @Getter
   private final String name;
   private final PersistenceStrategy persistence;
-  private final Sinks.Many<Message> sink;
+  private final int bufferSize;
+  private Sinks.Many<Message> sink;
 
   public Chatroom(
       UUID id,
@@ -29,7 +30,8 @@ public class Chatroom
     this.id = id;
     this.name = name;
     this.persistence = persistence;
-    this.sink = Sinks.many().multicast().onBackpressureBuffer(bufferSize);
+    this.bufferSize = bufferSize;
+    this.sink = createSink();
   }
 
 
@@ -41,7 +43,14 @@ public class Chatroom
   {
     return persistence
         .persistMessage(Message.MessageKey.of(user, id), timestamp, text)
-        .doOnNext(message -> sink.tryEmitNext(message).orThrow());
+        .doOnNext(message ->
+        {
+          Sinks.EmitResult result = sink.tryEmitNext(message);
+          if (result.isFailure())
+          {
+            log.warn("Emitting of message failed with {} for {}", result.name(), message);
+          }
+        });
   }
 
 
@@ -50,9 +59,11 @@ public class Chatroom
     return persistence.getMessage(Message.MessageKey.of(username, messageId));
   }
 
-  public Flux<Message> listen()
+  synchronized public Flux<Message> listen()
   {
-    return sink.asFlux();
+    return sink
+        .asFlux()
+        .doOnCancel(() -> sink = createSink()); // Sink hast to be recreated on auto-cancel!
   }
 
   public Flux<Message> getMessages()
@@ -64,4 +75,12 @@ public class Chatroom
   {
     return persistence.getMessages(first, last);
   }
+
+  private Sinks.Many<Message> createSink()
+  {
+    return Sinks
+        .many()
+        .multicast()
+        .onBackpressureBuffer(bufferSize);
+  }
 }