Merge branch 'master' of github.com:scalableminds/webknossos into org…

…a_owner * 'master' of github.com:scalableminds/webknossos: fixes loki log batching (#6828)
scalableminds · Feb 7, 2023 · f47dd76 · f47dd76
2 parents 3a9e63e + 474f3bb
commit f47dd76
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
@@ -20,7 +20,8 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
 
 ### Fixed
 - Fixed a benign error message which briefly appeared after logging in. [#6810](https://github.com/scalableminds/webknossos/pull/6810)
-- Fixed saving allowed teams in dataset settings [#6817](https://github.com/scalableminds/webknossos/pull/6817)
+- Fixed saving allowed teams in dataset settings. [#6817](https://github.com/scalableminds/webknossos/pull/6817)
+- Fixed log streaming in Voxelytics workflow reports. [#6828](https://github.com/scalableminds/webknossos/pull/6828)
 
 ### Removed
 

diff --git a/app/models/voxelytics/LokiClient.scala b/app/models/voxelytics/LokiClient.scala
@@ -95,9 +95,9 @@ class LokiClient @Inject()(wkConf: WkConf, rpc: RPC, val system: ActorSystem)(im
                              currentStartTime,
                              currentEndTime,
                              limit.getOrElse(LOG_ENTRY_BATCH_SIZE).min(LOG_ENTRY_BATCH_SIZE))
-      newLimit = limit.map(l => l - headBatch.length)
+      newLimit = limit.map(l => (l - headBatch.length).max(0))
       buffer <- if (headBatch.isEmpty) {
-        if (currentStartTime == startTime) {
+        if (currentStartTime == startTime || newLimit.contains(0L)) {
           Fox.successful(List())
         } else {
           for {