SelfPrivacy/selfprivacy-rest-api
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git synced 2024-11-24 04:51:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into inex/service-settings

Browse source
This commit is contained in:
Inex Code 2024-07-26 18:32:30 +03:00
parent 2226b266f0 40b8eb06d0
commit c1d54c149d
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -66,7 +66,7 @@
SCRIPT=$(cat <<EOF SCRIPT=$(cat <<EOF
start_all() start_all()
machine.succeed("ln -sf $NIXOS_VM_SHARED_DIR_GUEST -T ${vmtest-src-dir} >&2") machine.succeed("ln -sf $NIXOS_VM_SHARED_DIR_GUEST -T ${vmtest-src-dir} >&2")
machine.succeed("cd ${vmtest-src-dir} && coverage run -m pytest -v $@ >&2") machine.succeed("cd ${vmtest-src-dir} && coverage run -m pytest $@ >&2")
machine.succeed("cd ${vmtest-src-dir} && coverage report >&2") machine.succeed("cd ${vmtest-src-dir} && coverage report >&2")
EOF EOF
) )

6
selfprivacy_api/graphql/queries/logs.py
View file

@ -75,6 +75,10 @@ class Logs:
up_cursor: str | None = None, up_cursor: str | None = None,
# All entries returned will be greater than this cursor. Sets lower bound on results. # All entries returned will be greater than this cursor. Sets lower bound on results.
down_cursor: str | None = None, down_cursor: str | None = None,
# All entries will be from a specific systemd slice
filterBySlice: str | None = None,
# All entries will be from a specific systemd unit
filterByUnit: str | None = None,
) -> PaginatedEntries: ) -> PaginatedEntries:
if limit > 50: if limit > 50:
raise Exception("You can't fetch more than 50 entries via single request.") raise Exception("You can't fetch more than 50 entries via single request.")
@ -82,7 +86,7 @@ class Logs:
list( list(
map( map(
lambda x: LogEntry(x), lambda x: LogEntry(x),
get_paginated_logs(limit, up_cursor, down_cursor), get_paginated_logs(limit, up_cursor, down_cursor, filterBySlice, filterByUnit),
) )
) )
) )

9
selfprivacy_api/utils/systemd_journal.py
View file

@ -24,9 +24,18 @@ def get_paginated_logs(
up_cursor: str | None = None, up_cursor: str | None = None,
# All entries returned will be greater than this cursor. Sets lower bound on results. # All entries returned will be greater than this cursor. Sets lower bound on results.
down_cursor: str | None = None, down_cursor: str | None = None,
# All entries will be from a specific systemd slice
filterBySlice: str | None = None,
# All entries will be from a specific systemd unit
filterByUnit: str | None = None,
): ):
j = journal.Reader() j = journal.Reader()
if filterBySlice:
j.add_match("_SYSTEMD_SLICE=" + filterBySlice)
if filterByUnit:
j.add_match("_SYSTEMD_UNIT=" + filterByUnit)
if up_cursor is None and down_cursor is None: if up_cursor is None and down_cursor is None:
j.seek_tail() j.seek_tail()