mirror of
https://github.com/newnius/YAO-agent.git
synced 2025-06-07 22:01:55 +00:00
bugfix
This commit is contained in:
parent
54f20c0ece
commit
5c90e5a94f
20
server.py
20
server.py
@ -24,25 +24,24 @@ class MyHandler(BaseHTTPRequestHandler):
|
||||
self.wfile.write(bytes("pong", "utf-8"))
|
||||
|
||||
elif req.path == "/logs":
|
||||
id = query['id'][0]
|
||||
try:
|
||||
container_id = query['id'][0]
|
||||
client = docker.from_env()
|
||||
container = client.containers.get(id)
|
||||
container = client.containers.get(container_id)
|
||||
msg = {'code': 0, 'logs': str(container.logs().decode())}
|
||||
except Exception as e:
|
||||
msg = {'code': 0, 'error': e}
|
||||
msg = {'code': 0, 'error': str(e)}
|
||||
self.send_response(200)
|
||||
self.send_header('Content-type', 'application/json')
|
||||
self.end_headers()
|
||||
self.wfile.write(bytes(json.dumps(msg), "utf-8"))
|
||||
|
||||
elif req.path == "/status":
|
||||
id = query['id'][0]
|
||||
container_id = query['id'][0]
|
||||
client = docker.from_env()
|
||||
container = client.containers.list(all=True, filters={'id': id})
|
||||
container = client.containers.list(all=True, filters={'id': container_id})
|
||||
if len(container) > 0:
|
||||
container = container[0]
|
||||
print(container.image.attrs)
|
||||
status = {
|
||||
'id': container.short_id,
|
||||
'image': container.attrs['Config']['Image'],
|
||||
@ -65,7 +64,6 @@ class MyHandler(BaseHTTPRequestHandler):
|
||||
else:
|
||||
self.send_error(404, 'File Not Found: %s' % self.path)
|
||||
|
||||
|
||||
# Handler for the POST requests
|
||||
def do_POST(self):
|
||||
if self.path == "/create":
|
||||
@ -90,7 +88,7 @@ def do_POST(self):
|
||||
)
|
||||
msg = {"code": 0, "id": container.id}
|
||||
except Exception as e:
|
||||
msg = {"code": 1, "error": e}
|
||||
msg = {"code": 1, "error": str(e)}
|
||||
|
||||
self.send_response(200)
|
||||
self.send_header('Content-type', 'application/json')
|
||||
@ -105,10 +103,10 @@ def do_POST(self):
|
||||
'REQUEST_METHOD': 'POST',
|
||||
'CONTENT_TYPE': self.headers['Content-Type'],
|
||||
})
|
||||
id = form["id"].value
|
||||
container_id = form["id"].value
|
||||
|
||||
client = docker.from_env()
|
||||
container = client.containers.get(id)
|
||||
container = client.containers.get(container_id)
|
||||
container.stop()
|
||||
msg = {"code": 0}
|
||||
|
||||
@ -126,7 +124,7 @@ try:
|
||||
server = HTTPServer(('', PORT_NUMBER), MyHandler)
|
||||
print('Started http server on port ', PORT_NUMBER)
|
||||
|
||||
# Wait forever for incoming htto requests
|
||||
# Wait forever for incoming http requests
|
||||
server.serve_forever()
|
||||
|
||||
except KeyboardInterrupt:
|
||||
|
Loading…
Reference in New Issue
Block a user