From 675a39131c6713b26a5cae2ce64dd2b247e21725 Mon Sep 17 00:00:00 2001 From: Daan Sprenkels Date: Mon, 9 Apr 2018 20:09:13 +0200 Subject: [PATCH] metrics: Do not include user with empty queue left --- marietje/metrics/views.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/marietje/metrics/views.py b/marietje/metrics/views.py index 84ec1e4..71d95db 100644 --- a/marietje/metrics/views.py +++ b/marietje/metrics/views.py @@ -28,9 +28,8 @@ for queue in Queue.objects.all(): # sqlite3. This makes testing a bit tedious. Also, it does not give me # that much of confidence that it would also work on mysql. # Furtermore, we do not expect the queue to be very long at any moment. - return len(set(PlaylistSong.objects - .filter(Q(playlist=queue.playlist_id), Q(state=0) | Q(state=1)) - .values_list('user'))) + return len(set(PlaylistSong.objects.filter(playlist=queue.playlist_id, state=0) + .values_list('user'))) queue_length_gauge.labels(name=queue).set_function(_get_queue_length) queue_duration_gauge.labels(name=queue).set_function(_get_queue_duration)