diff options
| author | Jakob Odersky <jakob@inpher.io> | 2019-10-11 20:38:55 -0400 |
|---|---|---|
| committer | Jakob Odersky <jakob@inpher.io> | 2019-10-11 20:38:55 -0400 |
| commit | 3de6739b8b6f04956c8908bc9717990807254a6b (patch) | |
| tree | de5a1d8dad9664474b4109ada0cbad21c67e9dec /server/src/Routes.scala | |
| parent | 093821b48eff6076cc4123e8db5fcc6eb74f84d3 (diff) | |
| download | scala-triad-master.tar.gz scala-triad-master.tar.bz2 scala-triad-master.zip | |
Diffstat (limited to 'server/src/Routes.scala')
| -rw-r--r-- | server/src/Routes.scala | 7 |
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 { |