ansible-collections/community.docker
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.docker.git synced 2025-12-16 11:58:43 +00:00
Code Packages Projects Releases Wiki Activity

Fix error handling. (#546)

Browse Source
This commit is contained in:
Felix Fontein 2023-01-05 09:42:42 +01:00 committed by GitHub
parent 311926aaad
commit 18091193de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelogs/fragments/546-conflict-error.yml Normal file
View File

@ -0,0 +1,3 @@
bugfixes:
- "docker_api connection plugin - fix error handling when 409 Conflict is returned by the Docker daemon in case of a stopped container (https://github.com/ansible-collections/community.docker/pull/546)."
- "docker_container_exec - fix error handling when 409 Conflict is returned by the Docker daemon in case of a stopped container (https://github.com/ansible-collections/community.docker/pull/546)."

2
plugins/connection/docker_api.py
View File

@ -113,7 +113,7 @@ class Connection(ConnectionBase):
else: else:
raise AnsibleConnectionFailure('Could not find container "{1}" ({0})'.format(e, self.get_option('remote_addr'))) raise AnsibleConnectionFailure('Could not find container "{1}" ({0})'.format(e, self.get_option('remote_addr')))
except APIError as e: except APIError as e:
if e.response and e.response.status_code == 409: if e.response is not None and e.response.status_code == 409:
raise AnsibleConnectionFailure('The container "{1}" has been paused ({0})'.format(e, self.get_option('remote_addr'))) raise AnsibleConnectionFailure('The container "{1}" has been paused ({0})'.format(e, self.get_option('remote_addr')))
self.client.fail( self.client.fail(
'An unexpected Docker error occurred for container "{1}": {0}'.format(e, self.get_option('remote_addr')) 'An unexpected Docker error occurred for container "{1}": {0}'.format(e, self.get_option('remote_addr'))

2
plugins/modules/docker_container_exec.py
View File

@ -295,7 +295,7 @@ def main():
except NotFound: except NotFound:
client.fail('Could not find container "{0}"'.format(container)) client.fail('Could not find container "{0}"'.format(container))
except APIError as e: except APIError as e:
if e.response and e.response.status_code == 409: if e.response is not None and e.response.status_code == 409:
client.fail('The container "{0}" has been paused ({1})'.format(container, to_native(e))) client.fail('The container "{0}" has been paused ({1})'.format(container, to_native(e)))
client.fail('An unexpected Docker error occurred: {0}'.format(to_native(e)), exception=traceback.format_exc()) client.fail('An unexpected Docker error occurred: {0}'.format(to_native(e)), exception=traceback.format_exc())
except DockerException as e: except DockerException as e: