arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-04-21 01:49:00 +00:00
Code Issues Releases Wiki Activity

Fix Docker logs decoding. Ref #2522

Browse Source
This commit is contained in:
grossmj 2025-04-18 13:58:56 +07:00
parent ca34053125
commit ffd628902c
No known key found for this signature in database
GPG Key ID: 1E7DD6DBB53FF3D7
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gns3server/compute/docker/__init__.py
View File

@ -173,11 +173,10 @@ class Docker(BaseManager):
response = await self.http_query(method, path, data=data, params=params)
body = await response.read()
response.close()
if body and len(body):
if response.headers.get('CONTENT-TYPE') == 'application/json':
body = json.loads(body.decode("utf-8"))
else:
body = body.decode("utf-8")
if response.headers.get('CONTENT-TYPE') == 'application/json':
body = json.loads(body.decode("utf-8", errors="ignore"))
else:
body = body.decode("utf-8", errors="ignore")
log.debug("Query Docker %s %s params=%s data=%s Response: %s", method, path, params, data, body)
return body

2
gns3server/compute/docker/docker_vm.py
View File

@ -1203,7 +1203,7 @@ class DockerVM(BaseNode):
"""
result = await self.manager.query("GET", "containers/{}/logs".format(self._cid), params={"stderr": 1, "stdout": 1})
return result.decode('utf-8', errors='ignore').strip()
return result
async def delete(self):
"""