summaryrefslogtreecommitdiff
path: root/compose/container.py
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2016-09-12 16:02:58 -0700
committerJoffrey F <joffrey@docker.com>2016-09-13 11:56:26 -0700
commit7dd2e33057f8dab7bb63ceedc8ea598f993463c4 (patch)
tree515157ba7b163cab56871a45423295c140dee008 /compose/container.py
parent3dec600d8218833de11279e1dac6af048222dbc6 (diff)
Only allow log streaming if logdriver is json-file or journald
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'compose/container.py')
-rw-r--r--compose/container.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/compose/container.py b/compose/container.py
index 2c16863d..bda4e659 100644
--- a/compose/container.py
+++ b/compose/container.py
@@ -163,7 +163,7 @@ class Container(object):
@property
def has_api_logs(self):
log_type = self.log_driver
- return not log_type or log_type != 'none'
+ return not log_type or log_type in ('json-file', 'journald')
def attach_log_stream(self):
"""A log stream can only be attached if the container uses a json-file