aboutsummaryrefslogtreecommitdiff
path: root/server/src/Routes.scala
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/Routes.scala')
-rw-r--r--server/src/Routes.scala7
1 files changed, 3 insertions, 4 deletions
diff --git a/server/src/Routes.scala b/server/src/Routes.scala
index 0b08a11..d1bbefd 100644
--- a/server/src/Routes.scala
+++ b/server/src/Routes.scala
@@ -25,12 +25,11 @@ class Routes(repository: Repository, liveMessages: LiveMessages) {
private val lastMessages = repository.Messages.take(100).result
- private val messageStream: Source[Message, _] = {
- val publisher = repository.database.stream(lastMessages)
+ // stream persisted messages first, followed by live ones
+ private val messageStream: Source[Message, _] =
Source
- .fromPublisher(publisher)
+ .fromPublisher(repository.database.stream(lastMessages))
.concat(liveMessages.feed)
- }
val messages = path("messages") {
get {