Merge pull request #12294 from eduardoj/live_build_log_fix_finished

Don't rely on other conditions to stop a live log
openSUSE · Mar 14, 2022 · f870ef9 · f870ef9
2 parents 73dfdae + 819154a
commit f870ef9
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/api/app/controllers/webui/package_controller.rb b/src/api/app/controllers/webui/package_controller.rb
@@ -468,10 +468,7 @@ def update_build_log
 
       @log_chunk = get_log_chunk(@project, @package_name, @repo, @arch, chunk_start, chunk_end)
       # retry the last chunk again, because build compare overwrites last log lines
-      if @log_chunk.length.zero? && !@first_request && !@finished
-        @log_chunk = get_log_chunk(@project, @package_name, @repo, @arch, chunk_start, chunk_end)
-        @finished = true
-      end
+      @log_chunk = get_log_chunk(@project, @package_name, @repo, @arch, chunk_start, chunk_end) if @log_chunk.length.zero? && !@first_request && !@finished
 
       old_offset = @offset
       @offset = [chunk_end, @size].min