Kaydet (Commit) d9e08aed authored tarafından Joffrey F's avatar Joffrey F

Disallow incompatible combination stats(decode=True, stream=False)

Signed-off-by: 's avatarJoffrey F <joffrey@docker.com>
üst ebfba8d4
...@@ -1071,7 +1071,8 @@ class ContainerApiMixin(object): ...@@ -1071,7 +1071,8 @@ class ContainerApiMixin(object):
Args: Args:
container (str): The container to stream statistics from container (str): The container to stream statistics from
decode (bool): If set to true, stream will be decoded into dicts decode (bool): If set to true, stream will be decoded into dicts
on the fly. False by default. on the fly. Only applicable if ``stream`` is True.
False by default.
stream (bool): If set to false, only the current stats will be stream (bool): If set to false, only the current stats will be
returned instead of a stream. True by default. returned instead of a stream. True by default.
...@@ -1085,6 +1086,10 @@ class ContainerApiMixin(object): ...@@ -1085,6 +1086,10 @@ class ContainerApiMixin(object):
return self._stream_helper(self._get(url, stream=True), return self._stream_helper(self._get(url, stream=True),
decode=decode) decode=decode)
else: else:
if decode:
raise errors.InvalidArgument(
"decode is only available in conjuction with stream=True"
)
return self._result(self._get(url, params={'stream': False}), return self._result(self._get(url, params={'stream': False}),
json=True) json=True)
......
...@@ -385,7 +385,8 @@ class Container(Model): ...@@ -385,7 +385,8 @@ class Container(Model):
Args: Args:
decode (bool): If set to true, stream will be decoded into dicts decode (bool): If set to true, stream will be decoded into dicts
on the fly. False by default. on the fly. Only applicable if ``stream`` is True.
False by default.
stream (bool): If set to false, only the current stats will be stream (bool): If set to false, only the current stats will be
returned instead of a stream. True by default. returned instead of a stream. True by default.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment