vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #603 from jzelinskie/loglimit

Browse source 
limit logs to a max number of pages
This commit is contained in:
Jimmy Zelinskie 2015-10-06 14:18:05 -04:00
commit e7262c3cbc
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/model/log.py
View file

@ -6,6 +6,7 @@ from cachetools import lru_cache
from data.database import LogEntry, LogEntryKind, User, db from data.database import LogEntry, LogEntryKind, User, db
# TODO: Find a way to get logs without slowing down pagination significantly.
def _logs_query(selections, start_time, end_time, performer=None, repository=None, namespace=None): def _logs_query(selections, start_time, end_time, performer=None, repository=None, namespace=None):
joined = (LogEntry joined = (LogEntry
.select(*selections) .select(*selections)

3
endpoints/api/logs.py
View file

@ -15,6 +15,7 @@ from auth import scopes
from app import avatar from app import avatar
LOGS_PER_PAGE = 50 LOGS_PER_PAGE = 50
MAX_PAGES = 20
def log_view(log, kinds): def log_view(log, kinds):
view = { view = {
@ -80,7 +81,7 @@ def _validate_logs_arguments(start_time, end_time, performer_name):
def get_logs(start_time, end_time, performer_name=None, repository=None, namespace=None, page=None): def get_logs(start_time, end_time, performer_name=None, repository=None, namespace=None, page=None):
(start_time, end_time, performer) = _validate_logs_arguments(start_time, end_time, performer_name) (start_time, end_time, performer) = _validate_logs_arguments(start_time, end_time, performer_name)
page = page if page else 1 page = min(MAX_PAGES, page if page else 1)
kinds = model.log.get_log_entry_kinds() kinds = model.log.get_log_entry_kinds()
logs = model.log.list_logs(start_time, end_time, performer=performer, repository=repository, logs = model.log.list_logs(start_time, end_time, performer=performer, repository=repository,
namespace=namespace, page=page, count=LOGS_PER_PAGE + 1) namespace=namespace, page=page, count=LOGS_PER_PAGE + 1)