DockerSwarmOperator: Support line breaks in service logs #40705
+17
−3
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes: #40571
Since we use splitlines() on the decoded log string to split logs in lines,
If the log line is
The
stream_new_logs
function treats it as three separate log lines, which leads to failure in finding timestamp in carriage return separated lines.This PR changes the initial log pre-processing.
Since the log generator provided by docker's
service_logs
is already separating log lines we don't need to usesplitlines()
.