arcanis/ahriman
1
0
Fork 0
mirror of https://github.com/arcan1s/ahriman.git synced 2025-10-31 05:43:41 +00:00
Code Issues Projects Releases Wiki Activity

bug: fix invalid logs rotation

Browse Source
This commit is contained in:
Evgenii Alekseev
2025-06-16 16:34:40 +03:00
parent 7f813cf0c3
commit 995b396360
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ahriman/core/database/operations/logs_operations.py
View File

@ -153,10 +153,13 @@ class LogsOperations(Operations):
""" """
delete from logs delete from logs
where (package_base, repository, process_id) in ( where (package_base, repository, process_id) in (
select package_base, repository, process_id from logs select package_base, repository, process_id from (
where repository = :repository select package_base, repository, process_id, row_number() over (partition by package_base order by max(created) desc) as rn
group by package_base, repository, process_id from logs
order by min(created) desc limit -1 offset :offset where repository = :repository
group by package_base, repository, process_id
)
where rn > :offset
) )
""", """,
{ {

21
tests/ahriman/core/database/operations/test_logs_operations.py
View File

@ -93,6 +93,27 @@ def test_logs_insert_get_multi(database: SQLite, package_ahriman: Package) -> No
] ]
def test_logs_rotate_remove_older(database: SQLite, package_ahriman: Package,
package_python_schedule: Package) -> None:
"""
must correctly remove old records
"""
database.logs_insert(LogRecord(LogRecordId(package_ahriman.base, "1", "p1"), 42.0, "message 1"))
database.logs_insert(LogRecord(LogRecordId(package_ahriman.base, "1", "p1"), 43.0, "message 2"))
database.logs_insert(LogRecord(LogRecordId(package_ahriman.base, "2", "p2"), 44.0, "message 3"))
database.logs_insert(LogRecord(LogRecordId(package_ahriman.base, "2", "p2"), 45.0, "message 4"))
database.logs_insert(LogRecord(LogRecordId(package_python_schedule.base, "3", "p1"), 40.0, "message 5"))
database.logs_rotate(1)
assert database.logs_get(package_ahriman.base) == [
LogRecord(LogRecordId(package_ahriman.base, "2", "p2"), 44.0, "message 3"),
LogRecord(LogRecordId(package_ahriman.base, "2", "p2"), 45.0, "message 4"),
]
assert database.logs_get(package_python_schedule.base) == [
LogRecord(LogRecordId(package_python_schedule.base, "3", "p1"), 40.0, "message 5"),
]
def test_logs_rotate_remove_all(database: SQLite, package_ahriman: Package) -> None: def test_logs_rotate_remove_all(database: SQLite, package_ahriman: Package) -> None:
""" """
must remove all records when rotating with keep_last_records is 0 must remove all records when rotating with keep_last_records is 0