From 0eaf52272a546b150ff5cc1fc237b2665d218862 Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Thu, 14 Sep 2023 19:29:10 +0000 Subject: [PATCH] Temporarily stop alerting Tanner about trotec --- apiserver/apiserver/api/views.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/apiserver/apiserver/api/views.py b/apiserver/apiserver/api/views.py index 91ceaae..22de65f 100644 --- a/apiserver/apiserver/api/views.py +++ b/apiserver/apiserver/api/views.py @@ -819,6 +819,8 @@ class StatsViewSet(viewsets.ViewSet, List): return Response(200) # TODO: keep track of last report to ensure PS internet didn't cut out + # TODO: get rid of username request.data check + # TODO: only create one object when username's not valid, move check up @action(detail=False, methods=['post']) def usage(self, request): if 'device' not in request.data: @@ -838,9 +840,10 @@ class StatsViewSet(viewsets.ViewSet, List): username_isfrom_track = True except KeyError: msg = 'Usage tracker problem finding username for device: {}'.format(device) - utils.alert_tanner(msg) + #utils.alert_tanner(msg) logger.error(msg) username = '' + return Response(200) logging.debug('Device %s data: %s', device, data) @@ -860,17 +863,19 @@ class StatsViewSet(viewsets.ViewSet, List): username_isexpired = time.time() - track[device]['time'] > 2*60*60 # two hours if username_isfrom_track and username_isexpired: msg = 'Usage tracker problem expired username {} for device: {}'.format(username, device) - utils.alert_tanner(msg) + #utils.alert_tanner(msg) logger.error(msg) username = '' + return Response(200) try: user = User.objects.get(username__iexact=username) except User.DoesNotExist: msg = 'Usage tracker problem finding user for username: {}'.format(username or '[no username]') - utils.alert_tanner(msg) + #utils.alert_tanner(msg) logger.error(msg) user = None + return Response(200) last_use = models.Usage.objects.create( user=user, @@ -1935,4 +1940,4 @@ class MyLoginView(LoginView): @api_view() def null_view(request, *args, **kwargs): - raise Http404 \ No newline at end of file + raise Http404