technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2026-02-04 21:14:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

metrics: Do not include currently playing song

Browse Source
This commit is contained in:
Daan Sprenkels
2018-04-09 19:47:08 +02:00
parent a51b3a934e
commit 25a2912590
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
marietje/metrics/views.py
View File

@ -14,15 +14,13 @@ queue_users_gauge = Gauge('marietje_queue_users', 'Users holding a queue at some
for queue in Queue.objects.all(): for queue in Queue.objects.all():
def _get_queue_length(): def _get_queue_length():
return (PlaylistSong.objects return (PlaylistSong.objects.filter(playlist=queue.playlist_id, state=0)
.filter(Q(playlist=queue.playlist_id), Q(state=0) | Q(state=1)) .count())
.count())
def _get_queue_duration(): def _get_queue_duration():
playlist_songs = (PlaylistSong.objects playlist_songs = (PlaylistSong.objects.filter(playlist=queue.playlist_id, state=0)
.filter(Q(playlist=queue.playlist_id), Q(state=0) | Q(state=1)) .select_related('song')
.select_related('song') .all())
.all())
return sum(ps.song.duration for ps in playlist_songs) return sum(ps.song.duration for ps in playlist_songs)
def _get_queue_distinct_users(): def _get_queue_distinct_users():