Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manager/routers/logging_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def manager_logs_view(request: Request):
"title": "manager",
"subtitle": f"v: {get_manager_version()}",
"stream_url": "/logs/stream?follow=true&tail=400",
"full_url": "/logs/stream?tail=all",
"full_url": "/logs/stream",
"export_basename": "manager",
"manager_version": get_manager_version(),
},
Expand Down
2 changes: 1 addition & 1 deletion manager/routers/service_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ def service_logs_view(request: Request, name: str, version: str):
"title": name,
"subtitle": f"v{version}",
"stream_url": f"{base}&follow=true&tail=200",
"full_url": f"{base}&tail=all",
"full_url": base,
"export_basename": f"{name}_v{version}",
"manager_version": get_manager_version(),
},
Expand Down
8 changes: 6 additions & 2 deletions tests/manager_test/test_ui_redesign.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,18 @@ def test_logs_view_is_full_bleed():
def test_service_logs_view_full_url_and_basename(test_client_logged_in):
r = test_client_logged_in.get("/services/~logs/view?name=demo&version=0.1.0")
assert r.status_code == 200
assert "/services/~logs?name=demo&version=0.1.0&tail=all" in r.text
# full_url omits tail so the endpoint receives tail=None -> Docker "all".
# Passing the literal tail=all 422s (the param is typed int).
assert '"/services/~logs?name=demo&version=0.1.0"' in r.text
assert "tail=all" not in r.text
assert 'EXPORT_BASENAME = "demo_v0.1.0"' in r.text


def test_manager_logs_view_full_url_and_basename(test_client):
r = test_client.get("/logs/view")
assert r.status_code == 200
assert "/logs/stream?tail=all" in r.text
assert '"/logs/stream"' in r.text
assert "tail=all" not in r.text
assert 'EXPORT_BASENAME = "manager"' in r.text


Expand Down
Loading