Skip to content

Improve logging behavior of DockerOperator #40489

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
potiuk merged 1 commit into from
Jun 29, 2024
Merged

Improve logging behavior of DockerOperator #40489

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions airflow/providers/docker/operators/docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,8 @@ def _run_image_with_mounts(self, target_mounts, add_tmp_variable: bool) -> list[
for log_chunk in logstream:
log_chunk = stringify(log_chunk).strip()
log_lines.append(log_chunk)
self.log.info("%s", log_chunk)
for log_chunk_line in log_chunk.split("\n"):
self.log.info("%s", log_chunk_line)

result = self.cli.wait(self.container["Id"])
if result["StatusCode"] in self.skip_on_exit_code:
Expand Down Expand Up @@ -492,7 +493,7 @@ def copy_from_docker(container_id, src):
def execute(self, context: Context) -> list[str] | str | None:
# Pull the docker image if `force_pull` is set or image does not exist locally
if self.force_pull or not self.cli.images(name=self.image):
self.log.info("Pulling docker image %s", self.image)
self.log.info("::group::Pulling docker image %s", self.image)
latest_status: dict[str, str] = {}
for output in self.cli.pull(self.image, stream=True, decode=True):
if isinstance(output, str):
Expand All @@ -508,6 +509,7 @@ def execute(self, context: Context) -> list[str] | str | None:
if latest_status.get(output_id) != output_status:
self.log.info("%s: %s", output_id, output_status)
latest_status[output_id] = output_status
self.log.info("::endgroup::")
return self._run_image()

@staticmethod
Expand Down