From af3f4ac614db5337fdc5215f2bc648d7a464c842 Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Mon, 29 Nov 2021 02:18:58 +0000 Subject: [PATCH] Log history changes to console --- apiserver/apiserver/api/serializers.py | 1 + apiserver/apiserver/api/signals.py | 14 +++++++++++++- apiserver/apiserver/api/throttles.py | 2 +- apiserver/apiserver/api/utils_stats.py | 2 +- apiserver/apiserver/api/views.py | 4 ++-- 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/apiserver/apiserver/api/serializers.py b/apiserver/apiserver/api/serializers.py index 8c3553f..d26f2b6 100644 --- a/apiserver/apiserver/api/serializers.py +++ b/apiserver/apiserver/api/serializers.py @@ -421,6 +421,7 @@ class CardSerializer(serializers.ModelSerializer): read_only_fields = [ 'id', 'last_seen', + 'last_seen_at', 'user', ] diff --git a/apiserver/apiserver/api/signals.py b/apiserver/apiserver/api/signals.py index 9acc61a..ae54cac 100644 --- a/apiserver/apiserver/api/signals.py +++ b/apiserver/apiserver/api/signals.py @@ -69,7 +69,7 @@ def post_create_historical_record_callback( is_admin=is_admin_director(history_user), ) - for change in changes: + for num, change in enumerate(changes): change_old = str(change.old) change_new = str(change.new) @@ -84,6 +84,18 @@ def post_create_historical_record_callback( old=change_old, new=change_new, ) + + logger.info('History - {} changed {}\'s {} {}/{}: {} "{}" --> "{}"'.format( + history_user or 'System', + owner[0], + object_name, + num+1, + len(changes), + change.field, + change_old, + change_new, + )) + except BaseException as e: logger.error('History Signal - {} - {}'.format(e.__class__.__name__, e)) logger.info(str(sender)) diff --git a/apiserver/apiserver/api/throttles.py b/apiserver/apiserver/api/throttles.py index 95f4cdb..cf84e0a 100644 --- a/apiserver/apiserver/api/throttles.py +++ b/apiserver/apiserver/api/throttles.py @@ -24,5 +24,5 @@ class LoggingThrottle(throttling.BaseThrottle): else: data = None - logging.info('Request User: %s | %s %s | Data: %s', user, method, path, data) + logging.info('Request - User: %s | %s %s | Data: %s', user, method, path, data) return True diff --git a/apiserver/apiserver/api/utils_stats.py b/apiserver/apiserver/api/utils_stats.py index 54fc990..48fee23 100644 --- a/apiserver/apiserver/api/utils_stats.py +++ b/apiserver/apiserver/api/utils_stats.py @@ -158,7 +158,7 @@ def get_progress(request_id): return cache.get('request-progress-' + request_id, []) def set_progress(request_id, data): - logger.info('Request %s progress: %s', request_id, data) + logger.info('Progress - ID: %s | Status: %s', request_id, data) progress = get_progress(request_id) progress.append(data) cache.set('request-progress-' + request_id, progress) diff --git a/apiserver/apiserver/api/views.py b/apiserver/apiserver/api/views.py index 78e37e4..d72895b 100644 --- a/apiserver/apiserver/api/views.py +++ b/apiserver/apiserver/api/views.py @@ -475,7 +475,7 @@ class DoorViewSet(viewsets.ViewSet, List): except models.Member.DoesNotExist: raise Http404 t = utils.now_alberta_tz().strftime('%Y-%m-%d %H:%M:%S, %a %I:%M %p') - logger.info('Time: {} - Name: {} {} ({})'.format(t, member.first_name, member.last_name, member.id)) + logger.info('Scan - Time: {} | Name: {} {} ({})'.format(t, member.first_name, member.last_name, member.id)) utils_stats.calc_card_scans() @@ -651,7 +651,7 @@ class BackupView(views.APIView): backup_user = secrets.BACKUP_TOKENS.get(auth_token, None) if backup_user: - logger.info('Backup user: ' + backup_user['name']) + logger.info('Backup - User: ' + backup_user['name']) backup_path = cache.get(backup_user['cache_key'], None) if not backup_path: