Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion airflow-core/src/airflow/utils/log/log_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ def read_log_stream(
empty_iterations += 1
if empty_iterations >= self.STREAM_LOOP_STOP_AFTER_EMPTY_ITERATIONS:
# we have not received any logs for a while, so we stop the stream
yield "(Log stream stopped - End of log marker not found; logs may be incomplete.)\n"
# this is emitted as json to avoid breaking the ndjson stream format
yield '{"event": "Log stream stopped - End of log marker not found; logs may be incomplete."}\n'
return
else:
# https://mypy.readthedocs.io/en/stable/typed_dict.html#supported-operations
Expand Down
2 changes: 1 addition & 1 deletion airflow-core/tests/unit/utils/log/test_log_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ def test_read_log_stream_no_end_of_log_marker(self, mock_read):
log_stream = task_log_reader.read_log_stream(ti=self.ti, try_number=1, metadata={})
assert list(log_stream) == [
'{"timestamp":null,"event":"hello"}\n',
"(Log stream stopped - End of log marker not found; logs may be incomplete.)\n",
'{"event": "Log stream stopped - End of log marker not found; logs may be incomplete."}\n',
]
assert mock_read.call_count == 11

Expand Down
Loading