From 10707616fcd4c656e6a600afb34637830aa2424f Mon Sep 17 00:00:00 2001
From: Dilawar Singh <dilawar@subcom.tech>
Date: Fri, 7 Oct 2022 14:33:37 +0530
Subject: [PATCH] feat: get the logs from container.
---
bitia/__main__.py | 4 +---
bitia/session.py | 5 +++--
tests/test_sanity.py | 8 ++++----
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/bitia/__main__.py b/bitia/__main__.py
index 03f7144..ca99960 100644
--- a/bitia/__main__.py
+++ b/bitia/__main__.py
@@ -72,9 +72,7 @@ def list_remote_container(
params=dict(pipeline_sha256=pipeline_hash),
)
res.raise_for_status()
- _json = res.json()
- print(_json)
- return _json["containers"]
+ return res.json()["containers"].split(",")
@app.command("logs")
diff --git a/bitia/session.py b/bitia/session.py
index 3dd0c28..15cf542 100644
--- a/bitia/session.py
+++ b/bitia/session.py
@@ -12,8 +12,9 @@ SESSION_PICKLE_FILE = bconfig.bitia_dir() / ".session.pickle"
def fetch_logs(container: str, *, server):
"""Fetch logs from a container."""
logger.info(f"Fetching logs for container `{container}`")
- return g_session.post(
- f"{server}/logs/?container={container}",
+ return get(
+ f"{server}/container/logs",
+ params=dict(container=container),
stream=True,
)
diff --git a/tests/test_sanity.py b/tests/test_sanity.py
index d1c6b3f..0caa677 100644
--- a/tests/test_sanity.py
+++ b/tests/test_sanity.py
@@ -9,10 +9,10 @@ def test_sanity():
def test_run_simple():
- output = bitia.__main__.run_pipeline("ls -ltr /")
- print(output)
- output = bitia.__main__.run_pipeline("ls -ltr /", rerun=True)
- print(output)
+ for line in bitia.__main__.run_pipeline("ls -ltr /"):
+ print(111, line.decode().rstrip())
+ for line in bitia.__main__.run_pipeline("ls -ltr /", rerun=True):
+ print(222, line.decode().rstrip())
if __name__ == "__main__":
--
GitLab