SelfPrivacy/selfprivacy-rest-api
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git synced 2024-12-12 08:08:48 +00:00
Code Issues Projects Releases Wiki Activity

fix: free unused journal.Reader instances (#158)

Browse source 
I'm a bit dumb and forgot to add code that frees journal.Reader instances from memory.

Co-authored-by: nhnn <nhnn@disroot.org>
Co-authored-by: Inex Code <inex.code@selfprivacy.org>
Reviewed-on: https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api/pulls/158
Reviewed-by: Inex Code <inex.code@selfprivacy.org>
Co-authored-by: nhnn <nhnn@noreply.git.selfprivacy.org>
Co-committed-by: nhnn <nhnn@noreply.git.selfprivacy.org>
This commit is contained in:
nhnn 2024-11-27 12:32:01 +02:00 committed by Inex Code
parent 848befe3f1
commit 5aa1a378ef
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
selfprivacy_api/graphql/subscriptions/logs.py
View file

@ -21,11 +21,17 @@ async def log_stream() -> AsyncGenerator[LogEntry, None]:
asyncio.get_event_loop().add_reader(j, lambda: asyncio.ensure_future(callback())) asyncio.get_event_loop().add_reader(j, lambda: asyncio.ensure_future(callback()))
while True: try:
entry = await queue.get() while True:
try: entry = await queue.get()
yield LogEntry(entry) try:
except Exception: yield LogEntry(entry)
asyncio.get_event_loop().remove_reader(j) except Exception:
return asyncio.get_event_loop().remove_reader(j)
queue.task_done() j.close()
return
queue.task_done()
except asyncio.CancelledError:
asyncio.get_event_loop().remove_reader(j)
j.close()
return

8
selfprivacy_api/utils/systemd_journal.py
View file

@ -42,6 +42,8 @@ def get_paginated_logs(
events = get_events_from_journal(j, limit, lambda j: j.get_previous()) events = get_events_from_journal(j, limit, lambda j: j.get_previous())
events.reverse() events.reverse()
j.close()
return events return events
elif up_cursor is None and down_cursor is not None: elif up_cursor is None and down_cursor is not None:
j.seek_cursor(down_cursor) j.seek_cursor(down_cursor)
@ -50,6 +52,8 @@ def get_paginated_logs(
events = get_events_from_journal(j, limit, lambda j: j.get_previous()) events = get_events_from_journal(j, limit, lambda j: j.get_previous())
events.reverse() events.reverse()
j.close()
return events return events
elif up_cursor is not None and down_cursor is None: elif up_cursor is not None and down_cursor is None:
j.seek_cursor(up_cursor) j.seek_cursor(up_cursor)
@ -57,8 +61,12 @@ def get_paginated_logs(
events = get_events_from_journal(j, limit, lambda j: j.get_next()) events = get_events_from_journal(j, limit, lambda j: j.get_next())
j.close()
return events return events
else: else:
j.close()
raise NotImplementedError( raise NotImplementedError(
"Pagination by both up_cursor and down_cursor is not implemented" "Pagination by both up_cursor and down_cursor is not implemented"
) )