Filter logs by service names.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2016-03-07 15:04:42 -05:00
parent 48ed68eeaa
commit 3f7e5bf768
2 changed files with 3 additions and 3 deletions

View File

@ -709,7 +709,7 @@ class TopLevelCommand(object):
with up_shutdown_context(self.project, service_names, timeout, detached): with up_shutdown_context(self.project, service_names, timeout, detached):
# start the event stream first so we don't lose any events # start the event stream first so we don't lose any events
event_stream = project.events() event_stream = project.events(service_names=service_names)
to_attach = project.up( to_attach = project.up(
service_names=service_names, service_names=service_names,

View File

@ -295,7 +295,7 @@ class Project(object):
detached=True, detached=True,
start=False) start=False)
def events(self): def events(self, service_names=None):
def build_container_event(event, container): def build_container_event(event, container):
time = datetime.datetime.fromtimestamp(event['time']) time = datetime.datetime.fromtimestamp(event['time'])
time = time.replace( time = time.replace(
@ -313,7 +313,7 @@ class Project(object):
'container': container, 'container': container,
} }
service_names = set(self.service_names) service_names = set(service_names or self.service_names)
for event in self.client.events( for event in self.client.events(
filters={'label': self.labels()}, filters={'label': self.labels()},
decode=True decode=True