jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plum start runs in foreground by default

Browse source 
Also fixed LogPrinter regressions. Sorry for not doing that in a
separate commit.

Also made 'plum logs' show backlog. Yep, rolled that right in too. Gonna
go whip myself now.
This commit is contained in:
Aanand Prasad 2013-12-18 19:01:53 +00:00
commit 730f9772f9
3 changed files with 54 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

34
plum/cli/main.py
View file

@ -8,7 +8,6 @@ from docopt import docopt
from inspect import getdoc
from .. import __version__
from ..service import get_container_name
from ..service_collection import ServiceCollection
from .command import Command
from .log_printer import LogPrinter
@ -103,9 +102,30 @@ class TopLevelCommand(Command):
"""
Start all services
Usage: start
Usage: start [-d]
"""
self.service_collection.start()
if options['-d']:
self.service_collection.start()
return
running = []
unstarted = []
for s in self.service_collection:
if len(s.containers()) == 0:
unstarted.append((s, s.create_container()))
else:
running += s.get_containers(all=False)
log_printer = LogPrinter(running + [c for (s, c) in unstarted])
for (s, c) in unstarted:
s.start_container(c)
try:
log_printer.run()
finally:
self.service_collection.stop()
def stop(self, options):
"""
@ -122,8 +142,12 @@ class TopLevelCommand(Command):
Usage: logs
"""
containers = self._get_containers(all=False)
print "Attaching to", ", ".join(get_container_name(c) for c in containers)
LogPrinter(client=self.client).attach(containers)
print "Attaching to", list_containers(containers)
LogPrinter(containers, attach_params={'logs': True}).run()
def _get_containers(self, all):
return [c for s in self.service_collection for c in s.containers(all=all)]
def list_containers(containers):
return ", ".join(c.name for c in containers)