ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-27 04:41:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Adding a switch to output docker logs (#40693)

Browse source 
* Adding a switch to print logs

* Update to docs

* Adding `version_added` for the new option

* Updating version added

* Moving `output_logs` before `paued` for alphabetically ordering.
This commit is contained in:
Achintha Gunasekara 2018-06-06 18:50:04 +10:00 • committed by Martin Krizek
parent 5f7ffd39dc
commit d98c892017
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/ansible/modules/cloud/docker/docker_container.py
View file

@ -245,6 +245,12 @@ options:
- An integer value containing the score given to the container in order to tune OOM killer preferences. - An integer value containing the score given to the container in order to tune OOM killer preferences.
default: 0 default: 0
version_added: "2.2" version_added: "2.2"
output_logs:
description:
- If set to true, output of the container command will be printed (only effective when log_driver is set to json-file or journald.
type: bool
default: 'no'
version_added: "2.7"
paused: paused:
description: description:
- Use with the started state to pause running processes inside the container. - Use with the started state to pause running processes inside the container.
@ -669,6 +675,7 @@ class TaskParameters(DockerBaseClass):
self.labels = None self.labels = None
self.links = None self.links = None
self.log_driver = None self.log_driver = None
self.output_logs = None
self.log_options = None self.log_options = None
self.mac_address = None self.mac_address = None
self.memory = None self.memory = None
@ -1767,6 +1774,9 @@ class ContainerManager(DockerBaseClass):
def fail(self, msg, **kwargs): def fail(self, msg, **kwargs):
self.client.module.fail_json(msg=msg, **kwargs) self.client.module.fail_json(msg=msg, **kwargs)
def _output_logs(self, msg):
self.client.module.log(msg=msg)
def _get_container(self, container): def _get_container(self, container):
''' '''
Expects container ID or Name. Returns a container object Expects container ID or Name. Returns a container object
@ -1907,6 +1917,8 @@ class ContainerManager(DockerBaseClass):
if logging_driver == 'json-file' or logging_driver == 'journald': if logging_driver == 'json-file' or logging_driver == 'journald':
output = self.client.logs(container_id, stdout=True, stderr=True, stream=False, timestamps=False) output = self.client.logs(container_id, stdout=True, stderr=True, stream=False, timestamps=False)
if self.parameters.output_logs:
self._output_logs(msg=output)
else: else:
output = "Result logged using `%s` driver" % logging_driver output = "Result logged using `%s` driver" % logging_driver
@ -2031,6 +2043,7 @@ def main():
networks=dict(type='list'), networks=dict(type='list'),
oom_killer=dict(type='bool'), oom_killer=dict(type='bool'),
oom_score_adj=dict(type='int'), oom_score_adj=dict(type='int'),
output_logs=dict(type='bool', default=False),
paused=dict(type='bool', default=False), paused=dict(type='bool', default=False),
pid_mode=dict(type='str'), pid_mode=dict(type='str'),
privileged=dict(type='bool', default=False), privileged=dict(type='bool', default=False),