docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #492 from ggtools/json-stats 

Add decode parameter to be able to the the stats as a dictionary
This commit is contained in:
Joffrey F 2015-02-12 13:36:27 -08:00
parent 21e189c923 26e74c8cc4
commit ec642f3710
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/client.py
View File

@ -869,7 +869,7 @@ class Client(requests.Session):
res = self._post_json(url, data=start_config)
self._raise_for_status(res)
def stats(self, container):
def stats(self, container, decode=None):
if utils.compare_version('1.17', self._version) < 0:
raise errors.InvalidVersion(
'Stats retrieval is not supported in API < 1.17!')
@ -877,7 +877,7 @@ class Client(requests.Session):
if isinstance(container, dict):
container = container.get('Id')
url = self._url("/containers/{0}/stats".format(container))
return self._stream_helper(self._get(url, stream=True))
return self._stream_helper(self._get(url, stream=True), decode=decode)
def stop(self, container, timeout=10):
if isinstance(container, dict):