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

check for started containers only on service_start

Browse Source 
Signed-off-by: Collins Abitekaniza <abtcolns@gmail.com>
This commit is contained in:
Collins Abitekaniza 2019-01-10 13:48:42 +03:00 committed by Joffrey F
parent 532d00fede
commit bab8b3985e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compose/parallel.py
View File

@ -43,14 +43,15 @@ class GlobalLimit(object):
cls.global_limiter = Semaphore(value) cls.global_limiter = Semaphore(value)
def parallel_execute_watch(events, writer, errors, results, msg, get_name): def parallel_execute_watch(events, writer, errors, results, msg, get_name, func_name):
""" Watch events from a parallel execution, update status and fill errors and results. """ Watch events from a parallel execution, update status and fill errors and results.
Returns exception to re-raise. Returns exception to re-raise.
""" """
error_to_reraise = None error_to_reraise = None
for obj, result, exception in events: for obj, result, exception in events:
if exception is None: if exception is None:
if callable(getattr(obj, 'containers', None)) and not obj.containers(): if func_name == 'start_service' and (
callable(getattr(obj, 'containers', None)) and not obj.containers()):
# If service has no containers started # If service has no containers started
writer.write(msg, get_name(obj), 'failed', red) writer.write(msg, get_name(obj), 'failed', red)
else: else:
@ -100,7 +101,8 @@ def parallel_execute(objects, func, get_name, msg, get_deps=None, limit=None):
errors = {} errors = {}
results = [] results = []
error_to_reraise = parallel_execute_watch(events, writer, errors, results, msg, get_name) error_to_reraise = parallel_execute_watch(
events, writer, errors, results, msg, get_name, func.__name__)
for obj_name, error in errors.items(): for obj_name, error in errors.items():
stream.write("\nERROR: for {} {}\n".format(obj_name, error)) stream.write("\nERROR: for {} {}\n".format(obj_name, error))