tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-23 13:45:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add failing test for --abort-on-container-exit

Browse Source 
Handle --abort-on-container-exit. Fixes #2940

Signed-off-by: Richard Bann <richardbann@gmail.com>
This commit is contained in:
Richard Bann 2016-02-18 12:13:16 +01:00 committed by Daniel Nephin
parent 5fc0df4be2
commit bf2bf21720
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compose/cli/log_printer.py
View File

@ -5,6 +5,7 @@ import sys
from itertools import cycle from itertools import cycle
from . import colors from . import colors
from . import signals
from .multiplexer import Multiplexer from .multiplexer import Multiplexer
from compose import utils from compose import utils
from compose.utils import split_buffer from compose.utils import split_buffer
@ -41,7 +42,7 @@ class LogPrinter(object):
for color_func, container in zip(color_funcs, self.containers): for color_func, container in zip(color_funcs, self.containers):
generator_func = get_log_generator(container) generator_func = get_log_generator(container)
prefix = color_func(build_log_prefix(container, prefix_width)) prefix = color_func(build_log_prefix(container, prefix_width))
yield generator_func(container, prefix, color_func) yield generator_func(container, prefix, color_func, self.cascade_stop)
def build_log_prefix(container, prefix_width): def build_log_prefix(container, prefix_width):
@ -64,7 +65,7 @@ def get_log_generator(container):
return build_no_log_generator return build_no_log_generator
def build_no_log_generator(container, prefix, color_func): def build_no_log_generator(container, prefix, color_func, cascade_stop):
"""Return a generator that prints a warning about logs and waits for """Return a generator that prints a warning about logs and waits for
container to exit. container to exit.
""" """
@ -72,9 +73,11 @@ def build_no_log_generator(container, prefix, color_func):
prefix, prefix,
container.log_driver) container.log_driver)
yield color_func(wait_on_exit(container)) yield color_func(wait_on_exit(container))
if cascade_stop:
raise signals.CascadeStopException()
def build_log_generator(container, prefix, color_func): def build_log_generator(container, prefix, color_func, cascade_stop):
# if the container doesn't have a log_stream we need to attach to container # if the container doesn't have a log_stream we need to attach to container
# before log printer starts running # before log printer starts running
if container.log_stream is None: if container.log_stream is None:
@ -86,6 +89,8 @@ def build_log_generator(container, prefix, color_func):
for line in line_generator: for line in line_generator:
yield prefix + line yield prefix + line
yield color_func(wait_on_exit(container)) yield color_func(wait_on_exit(container))
if cascade_stop:
raise signals.CascadeStopException()
def wait_on_exit(container): def wait_on_exit(container):

3
compose/cli/main.py
View File

@ -774,6 +774,9 @@ def up_shutdown_context(project, service_names, timeout, detached):
except signals.ShutdownException: except signals.ShutdownException:
print("Gracefully stopping... (press Ctrl+C again to force)") print("Gracefully stopping... (press Ctrl+C again to force)")
project.stop(service_names=service_names, timeout=timeout) project.stop(service_names=service_names, timeout=timeout)
except signals.CascadeStopException:
print("Aborting on container exit... (press Ctrl+C to force)")
project.stop(service_names=service_names, timeout=timeout)
except signals.ShutdownException: except signals.ShutdownException:
project.kill(service_names=service_names) project.kill(service_names=service_names)
sys.exit(2) sys.exit(2)

4
compose/cli/signals.py
View File

@ -8,6 +8,10 @@ class ShutdownException(Exception):
pass pass
class CascadeStopException(Exception):
pass
def shutdown(signal, frame): def shutdown(signal, frame):
raise ShutdownException() raise ShutdownException()

6
tests/acceptance/cli_test.py
View File

@ -746,6 +746,12 @@ class CLITestCase(DockerClientTestCase):
os.kill(proc.pid, signal.SIGTERM) os.kill(proc.pid, signal.SIGTERM)
wait_on_condition(ContainerCountCondition(self.project, 0)) wait_on_condition(ContainerCountCondition(self.project, 0))
def test_up_handles_abort_on_container_exit(self):
start_process(self.base_dir, ['up', '--abort-on-container-exit'])
wait_on_condition(ContainerCountCondition(self.project, 2))
self.project.stop(['simple'])
wait_on_condition(ContainerCountCondition(self.project, 0))
def test_run_service_without_links(self): def test_run_service_without_links(self):
self.base_dir = 'tests/fixtures/links-composefile' self.base_dir = 'tests/fixtures/links-composefile'
self.dispatch(['run', 'console', '/bin/true']) self.dispatch(['run', 'console', '/bin/true'])