Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-08-27 03:45:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #6071 from nickhiggs/6060-reattach-logger-on-restart

Browse source 
Attach logger to containers after crashing.
This commit is contained in:
Joffrey F 2018-07-25 15:20:43 -07:00 • committed by GitHub
commit 635c77db6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
tests/acceptance/cli_test.py
View file

@ -2253,6 +2253,22 @@ class CLITestCase(DockerClientTestCase):
assert 'logs-composefile_another_1 exited with code 0' in result.stdout
assert 'logs-composefile_simple_1 exited with code 137' in result.stdout
def test_logs_follow_logs_from_restarted_containers(self):
self.base_dir = 'tests/fixtures/logs-restart-composefile'
proc = start_process(self.base_dir, ['up'])
wait_on_condition(ContainerStateCondition(
self.project.client,
'logs-restart-composefile_another_1',
'exited'))
self.dispatch(['kill', 'simple'])
result = wait_on_process(proc)
assert result.stdout.count('logs-restart-composefile_another_1 exited with code 1') == 3
assert result.stdout.count('world') == 3
def test_logs_default(self):
self.base_dir = 'tests/fixtures/logs-composefile'
self.dispatch(['up', '-d'])