Only show logs for listed services in up

compose/cli/main.py

@@ -538,19 +538,8 @@ def up(self, project, options):
  )
 
  if not detached:
- print("Attaching to", list_containers(to_attach))
- log_printer = LogPrinter(to_attach, attach_params={"logs": True}, monochrome=monochrome)
-
- try:
- log_printer.run()
- finally:
- def handler(signal, frame):
- project.kill(service_names=service_names)
- sys.exit(0)
- signal.signal(signal.SIGINT, handler)
-
- print("Gracefully stopping... (press Ctrl+C again to force)")
- project.stop(service_names=service_names, timeout=timeout)
+ log_printer = build_log_printer(to_attach, service_names, monochrome)
+ attach_to_logs(project, log_printer, service_names, timeout)
 
  def migrate_to_labels(self, project, _options):
  """
@@ -593,5 +582,26 @@ def version(self, project, options):
  print(get_version_info('full'))
 
 
+def build_log_printer(containers, service_names, monochrome):
+ return LogPrinter(
+ [c for c in containers if c.service in service_names],
+ attach_params={"logs": True},
+ monochrome=monochrome)
+
+
+def attach_to_logs(project, log_printer, service_names, timeout):
+ print("Attaching to", list_containers(log_printer.containers))
+ try:
+ log_printer.run()
+ finally:
+ def handler(signal, frame):
+ project.kill(service_names=service_names)
+ sys.exit(0)
+ signal.signal(signal.SIGINT, handler)
+
+ print("Gracefully stopping... (press Ctrl+C again to force)")
+ project.stop(service_names=service_names, timeout=timeout)
+
+
 def list_containers(containers):
  return ", ".join(c.name for c in containers)

compose/container.py

@@ -64,9 +64,13 @@ def short_id(self):
  def name(self):
  return self.dictionary['Name'][1:]
 
+ @property
+ def service(self):
+ return self.labels.get(LABEL_SERVICE)
+
  @property
  def name_without_project(self):
- return '{0}_{1}'.format(self.labels.get(LABEL_SERVICE), self.number)
+ return '{0}_{1}'.format(self.service, self.number)
 
  @property
  def number(self):

tests/unit/cli/main_test.py

@@ -0,0 +1,47 @@
+from __future__ import absolute_import
+
+from compose import container
+from compose.cli.log_printer import LogPrinter
+from compose.cli.main import attach_to_logs
+from compose.cli.main import build_log_printer
+from compose.project import Project
+from tests import mock
+from tests import unittest
+
+
+def mock_container(service, number):
+ return mock.create_autospec(
+ container.Container,
+ service=service,
+ number=number,
+ name_without_project='{0}_{1}'.format(service, number))
+
+
+class CLIMainTestCase(unittest.TestCase):
+
+ def test_build_log_printer(self):
+ containers = [
+ mock_container('web', 1),
+ mock_container('web', 2),
+ mock_container('db', 1),
+ mock_container('other', 1),
+ mock_container('another', 1),
+ ]
+ service_names = ['web', 'db']
+ log_printer = build_log_printer(containers, service_names, True)
+ self.assertEqual(log_printer.containers, containers[:3])
+
+ def test_attach_to_logs(self):
+ project = mock.create_autospec(Project)
+ log_printer = mock.create_autospec(LogPrinter, containers=[])
+ service_names = ['web', 'db']
+ timeout = 12
+
+ with mock.patch('compose.cli.main.signal', autospec=True) as mock_signal:
+ attach_to_logs(project, log_printer, service_names, timeout)
+
+ mock_signal.signal.assert_called_once_with(mock_signal.SIGINT, mock.ANY)
+ log_printer.run.assert_called_once_with()
+ project.stop.assert_called_once_with(
+ service_names=service_names,
+ timeout=timeout)

compose/cli/main.py

@@ -538,19 +538,8 @@ def up(self, project, options):
  )
 
  if not detached:
- print("Attaching to", list_containers(to_attach))
- log_printer = LogPrinter(to_attach, attach_params={"logs": True}, monochrome=monochrome)
-
- try:
- log_printer.run()
- finally:
- def handler(signal, frame):
- project.kill(service_names=service_names)
- sys.exit(0)
- signal.signal(signal.SIGINT, handler)
-
- print("Gracefully stopping... (press Ctrl+C again to force)")
- project.stop(service_names=service_names, timeout=timeout)
+ log_printer = build_log_printer(to_attach, service_names, monochrome)
+ attach_to_logs(project, log_printer, service_names, timeout)
 
  def migrate_to_labels(self, project, _options):
  """
@@ -593,5 +582,26 @@ def version(self, project, options):
  print(get_version_info('full'))
 
 
+def build_log_printer(containers, service_names, monochrome):
+ return LogPrinter(
+ [c for c in containers if c.service in service_names],
+ attach_params={"logs": True},
+ monochrome=monochrome)
+
+
+def attach_to_logs(project, log_printer, service_names, timeout):
+ print("Attaching to", list_containers(log_printer.containers))
+ try:
+ log_printer.run()
+ finally:
+ def handler(signal, frame):
+ project.kill(service_names=service_names)
+ sys.exit(0)
+ signal.signal(signal.SIGINT, handler)
+
+ print("Gracefully stopping... (press Ctrl+C again to force)")
+ project.stop(service_names=service_names, timeout=timeout)
+
+
 def list_containers(containers):
  return ", ".join(c.name for c in containers)

compose/container.py

@@ -64,9 +64,13 @@ def short_id(self):
  def name(self):
  return self.dictionary['Name'][1:]
 
+ @property
+ def service(self):
+ return self.labels.get(LABEL_SERVICE)
+
  @property
  def name_without_project(self):
- return '{0}_{1}'.format(self.labels.get(LABEL_SERVICE), self.number)
+ return '{0}_{1}'.format(self.service, self.number)
 
  @property
  def number(self):

tests/unit/cli/main_test.py

@@ -0,0 +1,47 @@
+from __future__ import absolute_import
+
+from compose import container
+from compose.cli.log_printer import LogPrinter
+from compose.cli.main import attach_to_logs
+from compose.cli.main import build_log_printer
+from compose.project import Project
+from tests import mock
+from tests import unittest
+
+
+def mock_container(service, number):
+ return mock.create_autospec(
+ container.Container,
+ service=service,
+ number=number,
+ name_without_project='{0}_{1}'.format(service, number))
+
+
+class CLIMainTestCase(unittest.TestCase):
+
+ def test_build_log_printer(self):
+ containers = [
+ mock_container('web', 1),
+ mock_container('web', 2),
+ mock_container('db', 1),
+ mock_container('other', 1),
+ mock_container('another', 1),
+ ]
+ service_names = ['web', 'db']
+ log_printer = build_log_printer(containers, service_names, True)
+ self.assertEqual(log_printer.containers, containers[:3])
+
+ def test_attach_to_logs(self):
+ project = mock.create_autospec(Project)
+ log_printer = mock.create_autospec(LogPrinter, containers=[])
+ service_names = ['web', 'db']
+ timeout = 12
+
+ with mock.patch('compose.cli.main.signal', autospec=True) as mock_signal:
+ attach_to_logs(project, log_printer, service_names, timeout)
+
+ mock_signal.signal.assert_called_once_with(mock_signal.SIGINT, mock.ANY)
+ log_printer.run.assert_called_once_with()
+ project.stop.assert_called_once_with(
+ service_names=service_names,
+ timeout=timeout)

compose/cli/main.py

@@ -538,19 +538,8 @@ def up(self, project, options):
  )
 
  if not detached:
- print("Attaching to", list_containers(to_attach))
- log_printer = LogPrinter(to_attach, attach_params={"logs": True}, monochrome=monochrome)
-
- try:
- log_printer.run()
- finally:
- def handler(signal, frame):
- project.kill(service_names=service_names)
- sys.exit(0)
- signal.signal(signal.SIGINT, handler)
-
- print("Gracefully stopping... (press Ctrl+C again to force)")
- project.stop(service_names=service_names, timeout=timeout)
+ log_printer = build_log_printer(to_attach, service_names, monochrome)
+ attach_to_logs(project, log_printer, service_names, timeout)
 
  def migrate_to_labels(self, project, _options):
  """
@@ -593,5 +582,26 @@ def version(self, project, options):
  print(get_version_info('full'))
 
 
+def build_log_printer(containers, service_names, monochrome):
+ return LogPrinter(
+ [c for c in containers if c.service in service_names],
+ attach_params={"logs": True},
+ monochrome=monochrome)
+
+
+def attach_to_logs(project, log_printer, service_names, timeout):
+ print("Attaching to", list_containers(log_printer.containers))
+ try:
+ log_printer.run()
+ finally:
+ def handler(signal, frame):
+ project.kill(service_names=service_names)
+ sys.exit(0)
+ signal.signal(signal.SIGINT, handler)
+
+ print("Gracefully stopping... (press Ctrl+C again to force)")
+ project.stop(service_names=service_names, timeout=timeout)
+
+
 def list_containers(containers):
  return ", ".join(c.name for c in containers)

compose/container.py

@@ -64,9 +64,13 @@ def short_id(self):
  def name(self):
  return self.dictionary['Name'][1:]
 
+ @property
+ def service(self):
+ return self.labels.get(LABEL_SERVICE)
+
  @property
  def name_without_project(self):
- return '{0}_{1}'.format(self.labels.get(LABEL_SERVICE), self.number)
+ return '{0}_{1}'.format(self.service, self.number)
 
  @property
  def number(self):

tests/unit/cli/main_test.py

@@ -0,0 +1,47 @@
+from __future__ import absolute_import
+
+from compose import container
+from compose.cli.log_printer import LogPrinter
+from compose.cli.main import attach_to_logs
+from compose.cli.main import build_log_printer
+from compose.project import Project
+from tests import mock
+from tests import unittest
+
+
+def mock_container(service, number):
+ return mock.create_autospec(
+ container.Container,
+ service=service,
+ number=number,
+ name_without_project='{0}_{1}'.format(service, number))
+
+
+class CLIMainTestCase(unittest.TestCase):
+
+ def test_build_log_printer(self):
+ containers = [
+ mock_container('web', 1),
+ mock_container('web', 2),
+ mock_container('db', 1),
+ mock_container('other', 1),
+ mock_container('another', 1),
+ ]
+ service_names = ['web', 'db']
+ log_printer = build_log_printer(containers, service_names, True)
+ self.assertEqual(log_printer.containers, containers[:3])
+
+ def test_attach_to_logs(self):
+ project = mock.create_autospec(Project)
+ log_printer = mock.create_autospec(LogPrinter, containers=[])
+ service_names = ['web', 'db']
+ timeout = 12
+
+ with mock.patch('compose.cli.main.signal', autospec=True) as mock_signal:
+ attach_to_logs(project, log_printer, service_names, timeout)
+
+ mock_signal.signal.assert_called_once_with(mock_signal.SIGINT, mock.ANY)
+ log_printer.run.assert_called_once_with()
+ project.stop.assert_called_once_with(
+ service_names=service_names,
+ timeout=timeout)

compose/cli/main.py

@@ -538,19 +538,8 @@ def up(self, project, options):
  )
 
  if not detached:
- print("Attaching to", list_containers(to_attach))
- log_printer = LogPrinter(to_attach, attach_params={"logs": True}, monochrome=monochrome)
-
- try:
- log_printer.run()
- finally:
- def handler(signal, frame):
- project.kill(service_names=service_names)
- sys.exit(0)
- signal.signal(signal.SIGINT, handler)
-
- print("Gracefully stopping... (press Ctrl+C again to force)")
- project.stop(service_names=service_names, timeout=timeout)
+ log_printer = build_log_printer(to_attach, service_names, monochrome)
+ attach_to_logs(project, log_printer, service_names, timeout)
 
  def migrate_to_labels(self, project, _options):
  """
@@ -593,5 +582,26 @@ def version(self, project, options):
  print(get_version_info('full'))
 
 
+def build_log_printer(containers, service_names, monochrome):
+ return LogPrinter(
+ [c for c in containers if c.service in service_names],
+ attach_params={"logs": True},
+ monochrome=monochrome)
+
+
+def attach_to_logs(project, log_printer, service_names, timeout):
+ print("Attaching to", list_containers(log_printer.containers))
+ try:
+ log_printer.run()
+ finally:
+ def handler(signal, frame):
+ project.kill(service_names=service_names)
+ sys.exit(0)
+ signal.signal(signal.SIGINT, handler)
+
+ print("Gracefully stopping... (press Ctrl+C again to force)")
+ project.stop(service_names=service_names, timeout=timeout)
+
+
 def list_containers(containers):
  return ", ".join(c.name for c in containers)

compose/container.py

@@ -64,9 +64,13 @@ def short_id(self):
  def name(self):
  return self.dictionary['Name'][1:]
 
+ @property
+ def service(self):
+ return self.labels.get(LABEL_SERVICE)
+
  @property
  def name_without_project(self):
- return '{0}_{1}'.format(self.labels.get(LABEL_SERVICE), self.number)
+ return '{0}_{1}'.format(self.service, self.number)
 
  @property
  def number(self):

tests/unit/cli/main_test.py

@@ -0,0 +1,47 @@
+from __future__ import absolute_import
+
+from compose import container
+from compose.cli.log_printer import LogPrinter
+from compose.cli.main import attach_to_logs
+from compose.cli.main import build_log_printer
+from compose.project import Project
+from tests import mock
+from tests import unittest
+
+
+def mock_container(service, number):
+ return mock.create_autospec(
+ container.Container,
+ service=service,
+ number=number,
+ name_without_project='{0}_{1}'.format(service, number))
+
+
+class CLIMainTestCase(unittest.TestCase):
+
+ def test_build_log_printer(self):
+ containers = [
+ mock_container('web', 1),
+ mock_container('web', 2),
+ mock_container('db', 1),
+ mock_container('other', 1),
+ mock_container('another', 1),
+ ]
+ service_names = ['web', 'db']
+ log_printer = build_log_printer(containers, service_names, True)
+ self.assertEqual(log_printer.containers, containers[:3])
+
+ def test_attach_to_logs(self):
+ project = mock.create_autospec(Project)
+ log_printer = mock.create_autospec(LogPrinter, containers=[])
+ service_names = ['web', 'db']
+ timeout = 12
+
+ with mock.patch('compose.cli.main.signal', autospec=True) as mock_signal:
+ attach_to_logs(project, log_printer, service_names, timeout)
+
+ mock_signal.signal.assert_called_once_with(mock_signal.SIGINT, mock.ANY)
+ log_printer.run.assert_called_once_with()
+ project.stop.assert_called_once_with(
+ service_names=service_names,
+ timeout=timeout)

compose/cli/main.py

@@ -538,19 +538,8 @@ def up(self, project, options):
  )
 
  if not detached:
- print("Attaching to", list_containers(to_attach))
- log_printer = LogPrinter(to_attach, attach_params={"logs": True}, monochrome=monochrome)
-
- try:
- log_printer.run()
- finally:
- def handler(signal, frame):
- project.kill(service_names=service_names)
- sys.exit(0)
- signal.signal(signal.SIGINT, handler)
-
- print("Gracefully stopping... (press Ctrl+C again to force)")
- project.stop(service_names=service_names, timeout=timeout)
+ log_printer = build_log_printer(to_attach, service_names, monochrome)
+ attach_to_logs(project, log_printer, service_names, timeout)
 
  def migrate_to_labels(self, project, _options):
  """
@@ -593,5 +582,26 @@ def version(self, project, options):
  print(get_version_info('full'))
 
 
+def build_log_printer(containers, service_names, monochrome):
+ return LogPrinter(
+ [c for c in containers if c.service in service_names],
+ attach_params={"logs": True},
+ monochrome=monochrome)
+
+
+def attach_to_logs(project, log_printer, service_names, timeout):
+ print("Attaching to", list_containers(log_printer.containers))
+ try:
+ log_printer.run()
+ finally:
+ def handler(signal, frame):
+ project.kill(service_names=service_names)
+ sys.exit(0)
+ signal.signal(signal.SIGINT, handler)
+
+ print("Gracefully stopping... (press Ctrl+C again to force)")
+ project.stop(service_names=service_names, timeout=timeout)
+
+
 def list_containers(containers):
  return ", ".join(c.name for c in containers)

compose/container.py

@@ -64,9 +64,13 @@ def short_id(self):
  def name(self):
  return self.dictionary['Name'][1:]
 
+ @property
+ def service(self):
+ return self.labels.get(LABEL_SERVICE)
+
  @property
  def name_without_project(self):
- return '{0}_{1}'.format(self.labels.get(LABEL_SERVICE), self.number)
+ return '{0}_{1}'.format(self.service, self.number)
 
  @property
  def number(self):

tests/unit/cli/main_test.py

@@ -0,0 +1,47 @@
+from __future__ import absolute_import
+
+from compose import container
+from compose.cli.log_printer import LogPrinter
+from compose.cli.main import attach_to_logs
+from compose.cli.main import build_log_printer
+from compose.project import Project
+from tests import mock
+from tests import unittest
+
+
+def mock_container(service, number):
+ return mock.create_autospec(
+ container.Container,
+ service=service,
+ number=number,
+ name_without_project='{0}_{1}'.format(service, number))
+
+
+class CLIMainTestCase(unittest.TestCase):
+
+ def test_build_log_printer(self):
+ containers = [
+ mock_container('web', 1),
+ mock_container('web', 2),
+ mock_container('db', 1),
+ mock_container('other', 1),
+ mock_container('another', 1),
+ ]
+ service_names = ['web', 'db']
+ log_printer = build_log_printer(containers, service_names, True)
+ self.assertEqual(log_printer.containers, containers[:3])
+
+ def test_attach_to_logs(self):
+ project = mock.create_autospec(Project)
+ log_printer = mock.create_autospec(LogPrinter, containers=[])
+ service_names = ['web', 'db']
+ timeout = 12
+
+ with mock.patch('compose.cli.main.signal', autospec=True) as mock_signal:
+ attach_to_logs(project, log_printer, service_names, timeout)
+
+ mock_signal.signal.assert_called_once_with(mock_signal.SIGINT, mock.ANY)
+ log_printer.run.assert_called_once_with()
+ project.stop.assert_called_once_with(
+ service_names=service_names,
+ timeout=timeout)

compose/cli/main.py

@@ -538,19 +538,8 @@ def up(self, project, options):
  )
 
  if not detached:
- print("Attaching to", list_containers(to_attach))
- log_printer = LogPrinter(to_attach, attach_params={"logs": True}, monochrome=monochrome)
-
- try:
- log_printer.run()
- finally:
- def handler(signal, frame):
- project.kill(service_names=service_names)
- sys.exit(0)
- signal.signal(signal.SIGINT, handler)
-
- print("Gracefully stopping... (press Ctrl+C again to force)")
- project.stop(service_names=service_names, timeout=timeout)
+ log_printer = build_log_printer(to_attach, service_names, monochrome)
+ attach_to_logs(project, log_printer, service_names, timeout)
 
  def migrate_to_labels(self, project, _options):
  """
@@ -593,5 +582,26 @@ def version(self, project, options):
  print(get_version_info('full'))
 
 
+def build_log_printer(containers, service_names, monochrome):
+ return LogPrinter(
+ [c for c in containers if c.service in service_names],
+ attach_params={"logs": True},
+ monochrome=monochrome)
+
+
+def attach_to_logs(project, log_printer, service_names, timeout):
+ print("Attaching to", list_containers(log_printer.containers))
+ try:
+ log_printer.run()
+ finally:
+ def handler(signal, frame):
+ project.kill(service_names=service_names)
+ sys.exit(0)
+ signal.signal(signal.SIGINT, handler)
+
+ print("Gracefully stopping... (press Ctrl+C again to force)")
+ project.stop(service_names=service_names, timeout=timeout)
+
+
 def list_containers(containers):
  return ", ".join(c.name for c in containers)

compose/container.py

@@ -64,9 +64,13 @@ def short_id(self):
  def name(self):
  return self.dictionary['Name'][1:]
 
+ @property
+ def service(self):
+ return self.labels.get(LABEL_SERVICE)
+
  @property
  def name_without_project(self):
- return '{0}_{1}'.format(self.labels.get(LABEL_SERVICE), self.number)
+ return '{0}_{1}'.format(self.service, self.number)
 
  @property
  def number(self):

tests/unit/cli/main_test.py

@@ -0,0 +1,47 @@
+from __future__ import absolute_import
+
+from compose import container
+from compose.cli.log_printer import LogPrinter
+from compose.cli.main import attach_to_logs
+from compose.cli.main import build_log_printer
+from compose.project import Project
+from tests import mock
+from tests import unittest
+
+
+def mock_container(service, number):
+ return mock.create_autospec(
+ container.Container,
+ service=service,
+ number=number,
+ name_without_project='{0}_{1}'.format(service, number))
+
+
+class CLIMainTestCase(unittest.TestCase):
+
+ def test_build_log_printer(self):
+ containers = [
+ mock_container('web', 1),
+ mock_container('web', 2),
+ mock_container('db', 1),
+ mock_container('other', 1),
+ mock_container('another', 1),
+ ]
+ service_names = ['web', 'db']
+ log_printer = build_log_printer(containers, service_names, True)
+ self.assertEqual(log_printer.containers, containers[:3])
+
+ def test_attach_to_logs(self):
+ project = mock.create_autospec(Project)
+ log_printer = mock.create_autospec(LogPrinter, containers=[])
+ service_names = ['web', 'db']
+ timeout = 12
+
+ with mock.patch('compose.cli.main.signal', autospec=True) as mock_signal:
+ attach_to_logs(project, log_printer, service_names, timeout)
+
+ mock_signal.signal.assert_called_once_with(mock_signal.SIGINT, mock.ANY)
+ log_printer.run.assert_called_once_with()
+ project.stop.assert_called_once_with(
+ service_names=service_names,
+ timeout=timeout)

compose/cli/main.py

@@ -538,19 +538,8 @@ def up(self, project, options):
  )
 
  if not detached:
- print("Attaching to", list_containers(to_attach))
- log_printer = LogPrinter(to_attach, attach_params={"logs": True}, monochrome=monochrome)
-
- try:
- log_printer.run()
- finally:
- def handler(signal, frame):
- project.kill(service_names=service_names)
- sys.exit(0)
- signal.signal(signal.SIGINT, handler)
-
- print("Gracefully stopping... (press Ctrl+C again to force)")
- project.stop(service_names=service_names, timeout=timeout)
+ log_printer = build_log_printer(to_attach, service_names, monochrome)
+ attach_to_logs(project, log_printer, service_names, timeout)
 
  def migrate_to_labels(self, project, _options):
  """
@@ -593,5 +582,26 @@ def version(self, project, options):
  print(get_version_info('full'))
 
 
+def build_log_printer(containers, service_names, monochrome):
+ return LogPrinter(
+ [c for c in containers if c.service in service_names],
+ attach_params={"logs": True},
+ monochrome=monochrome)
+
+
+def attach_to_logs(project, log_printer, service_names, timeout):
+ print("Attaching to", list_containers(log_printer.containers))
+ try:
+ log_printer.run()
+ finally:
+ def handler(signal, frame):
+ project.kill(service_names=service_names)
+ sys.exit(0)
+ signal.signal(signal.SIGINT, handler)
+
+ print("Gracefully stopping... (press Ctrl+C again to force)")
+ project.stop(service_names=service_names, timeout=timeout)
+
+
 def list_containers(containers):
  return ", ".join(c.name for c in containers)

compose/container.py

@@ -64,9 +64,13 @@ def short_id(self):
  def name(self):
  return self.dictionary['Name'][1:]
 
+ @property
+ def service(self):
+ return self.labels.get(LABEL_SERVICE)
+
  @property
  def name_without_project(self):
- return '{0}_{1}'.format(self.labels.get(LABEL_SERVICE), self.number)
+ return '{0}_{1}'.format(self.service, self.number)
 
  @property
  def number(self):

tests/unit/cli/main_test.py

@@ -0,0 +1,47 @@
+from __future__ import absolute_import
+
+from compose import container
+from compose.cli.log_printer import LogPrinter
+from compose.cli.main import attach_to_logs
+from compose.cli.main import build_log_printer
+from compose.project import Project
+from tests import mock
+from tests import unittest
+
+
+def mock_container(service, number):
+ return mock.create_autospec(
+ container.Container,
+ service=service,
+ number=number,
+ name_without_project='{0}_{1}'.format(service, number))
+
+
+class CLIMainTestCase(unittest.TestCase):
+
+ def test_build_log_printer(self):
+ containers = [
+ mock_container('web', 1),
+ mock_container('web', 2),
+ mock_container('db', 1),
+ mock_container('other', 1),
+ mock_container('another', 1),
+ ]
+ service_names = ['web', 'db']
+ log_printer = build_log_printer(containers, service_names, True)
+ self.assertEqual(log_printer.containers, containers[:3])
+
+ def test_attach_to_logs(self):
+ project = mock.create_autospec(Project)
+ log_printer = mock.create_autospec(LogPrinter, containers=[])
+ service_names = ['web', 'db']
+ timeout = 12
+
+ with mock.patch('compose.cli.main.signal', autospec=True) as mock_signal:
+ attach_to_logs(project, log_printer, service_names, timeout)
+
+ mock_signal.signal.assert_called_once_with(mock_signal.SIGINT, mock.ANY)
+ log_printer.run.assert_called_once_with()
+ project.stop.assert_called_once_with(
+ service_names=service_names,
+ timeout=timeout)

compose/cli/main.py

@@ -538,19 +538,8 @@ def up(self, project, options):
  )
 
  if not detached:
- print("Attaching to", list_containers(to_attach))
- log_printer = LogPrinter(to_attach, attach_params={"logs": True}, monochrome=monochrome)
-
- try:
- log_printer.run()
- finally:
- def handler(signal, frame):
- project.kill(service_names=service_names)
- sys.exit(0)
- signal.signal(signal.SIGINT, handler)
-
- print("Gracefully stopping... (press Ctrl+C again to force)")
- project.stop(service_names=service_names, timeout=timeout)
+ log_printer = build_log_printer(to_attach, service_names, monochrome)
+ attach_to_logs(project, log_printer, service_names, timeout)
 
  def migrate_to_labels(self, project, _options):
  """
@@ -593,5 +582,26 @@ def version(self, project, options):
  print(get_version_info('full'))
 
 
+def build_log_printer(containers, service_names, monochrome):
+ return LogPrinter(
+ [c for c in containers if c.service in service_names],
+ attach_params={"logs": True},
+ monochrome=monochrome)
+
+
+def attach_to_logs(project, log_printer, service_names, timeout):
+ print("Attaching to", list_containers(log_printer.containers))
+ try:
+ log_printer.run()
+ finally:
+ def handler(signal, frame):
+ project.kill(service_names=service_names)
+ sys.exit(0)
+ signal.signal(signal.SIGINT, handler)
+
+ print("Gracefully stopping... (press Ctrl+C again to force)")
+ project.stop(service_names=service_names, timeout=timeout)
+
+
 def list_containers(containers):
  return ", ".join(c.name for c in containers)

compose/container.py

@@ -64,9 +64,13 @@ def short_id(self):
  def name(self):
  return self.dictionary['Name'][1:]
 
+ @property
+ def service(self):
+ return self.labels.get(LABEL_SERVICE)
+
  @property
  def name_without_project(self):
- return '{0}_{1}'.format(self.labels.get(LABEL_SERVICE), self.number)
+ return '{0}_{1}'.format(self.service, self.number)
 
  @property
  def number(self):

tests/unit/cli/main_test.py

@@ -0,0 +1,47 @@
+from __future__ import absolute_import
+
+from compose import container
+from compose.cli.log_printer import LogPrinter
+from compose.cli.main import attach_to_logs
+from compose.cli.main import build_log_printer
+from compose.project import Project
+from tests import mock
+from tests import unittest
+
+
+def mock_container(service, number):
+ return mock.create_autospec(
+ container.Container,
+ service=service,
+ number=number,
+ name_without_project='{0}_{1}'.format(service, number))
+
+
+class CLIMainTestCase(unittest.TestCase):
+
+ def test_build_log_printer(self):
+ containers = [
+ mock_container('web', 1),
+ mock_container('web', 2),
+ mock_container('db', 1),
+ mock_container('other', 1),
+ mock_container('another', 1),
+ ]
+ service_names = ['web', 'db']
+ log_printer = build_log_printer(containers, service_names, True)
+ self.assertEqual(log_printer.containers, containers[:3])
+
+ def test_attach_to_logs(self):
+ project = mock.create_autospec(Project)
+ log_printer = mock.create_autospec(LogPrinter, containers=[])
+ service_names = ['web', 'db']
+ timeout = 12
+
+ with mock.patch('compose.cli.main.signal', autospec=True) as mock_signal:
+ attach_to_logs(project, log_printer, service_names, timeout)
+
+ mock_signal.signal.assert_called_once_with(mock_signal.SIGINT, mock.ANY)
+ log_printer.run.assert_called_once_with()
+ project.stop.assert_called_once_with(
+ service_names=service_names,
+ timeout=timeout)