Skip to content

Commit

Permalink
docker compose output
Browse files Browse the repository at this point in the history
  • Loading branch information
nenadnoveljic committed Oct 17, 2024
1 parent 7bb988b commit c6bfffc
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
8 changes: 1 addition & 7 deletions datadog_checks_dev/datadog_checks/dev/docker.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,13 +243,7 @@ def __init__(self, compose_file, build=False, service_name=None):
self.command.append(self.service_name)

def __call__(self):
try:
return run_command(self.command, check=True, capture=True)
except SubprocessError as e:
compose_error = str(e)
log_command = ['docker', 'compose', '-f', self.compose_file, 'logs']
compose_logs = run_command(log_command, check=True, capture=True)
raise SubprocessError(f"compose error: {compose_error} | compose logs: {compose_logs}")
return run_command(self.command, check=True, capture=True)


class ComposeFileLogs(LazyFunction):
Expand Down
1 change: 0 additions & 1 deletion sqlserver/datadog_checks/sqlserver/deadlocks.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ def agent_check_getter(self):

class Deadlocks(DBMAsyncJob):
def __init__(self, check, config: SQLServerConfig):
# force ci
self.tags = [t for t in check.tags if not t.startswith('dd.internal')]
self._check = check
self._log = self._check.log
Expand Down

0 comments on commit c6bfffc

Please sign in to comment.