diff --git a/logtracker/journal/models.py b/logtracker/journal/models.py index 2e90d04..7ba5b33 100644 --- a/logtracker/journal/models.py +++ b/logtracker/journal/models.py @@ -11,24 +11,26 @@ class EntryManager(models.Manager): def dump(self, timestamp=None, host=None, lines=100, **kwargs): qs = Entry.objects.all() if host: - qs = qs.filter(host=host) + qs = qs.filter(host__in=host) qs = qs.filter(**self.parse_options(**kwargs)) if lines: qs = qs.order_by('-timestamp')[:int(lines)][::-1] return qs - def parse_options(self, mode='exact', **kwargs): + def parse_options(self, **kwargs): # todo mode='contains' require jsonb KeyTextTransform and probably annotations options = {} for k, v in kwargs.items(): - options['data__' + k.upper() + '__%s' % mode] = v + if k.upper() == 'csrfmiddlewaretoken': + continue + options['data__' + k.upper() + '__in'] = v return options def hosts(self): value = cache.get('hosts') if value is None: value = self.model.objects.all().values_list('host', flat=True).distinct() - cache.set('hosts', value, 6000 * random.random()) + cache.set('hosts', value, 600 * random.random()) return value def units(self): diff --git a/logtracker/journal/templates/home.html b/logtracker/journal/templates/home.html index c87c815..6fd19b4 100644 --- a/logtracker/journal/templates/home.html +++ b/logtracker/journal/templates/home.html @@ -1,18 +1,18 @@ {% extends "base.html" %} {% block content %} -

Logtracker

+

Logtracker

+
-

Journal entries

+Journal entries -

Emails

+Emails