improving logging of contract errors (#158)

sequentech · Dec 4, 2021 · e57de77 · e57de77
1 parent b5b337b
commit e57de77
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 12 deletions.
diff --git a/authapi/api/models.py b/authapi/api/models.py
@@ -243,7 +243,7 @@ def children_election_info_validator(value):
         try:
             check_contract(CHILDREN_ELECTION_INFO_CONTRACT, value)
         except CheckException as e:
-            raise ValidationError(str(e))
+            raise ValidationError(str(e.data))
 
 def children_event_id_list_validator(value):
     if value == None:
@@ -252,7 +252,7 @@ def children_event_id_list_validator(value):
         try:
             check_contract(CHILDREN_EVENT_ID_LIST_CONTRACT, value)
         except CheckException as e:
-            raise ValidationError(str(e))
+            raise ValidationError(str(e.data))
 
 
 class AuthEvent(models.Model):

diff --git a/authapi/api/views.py b/authapi/api/views.py
@@ -2484,7 +2484,7 @@ def post(self, request, pk, ballot_box_pk):
                 "req '%r'\n"\
                 "error '%r'\n"\
                 "Stack trace: \n%s",\
-                req, error, stack_trace_str())
+                req, error.data, stack_trace_str())
             return json_response(
                 status=400,
                 error_codename=ErrorCodes.BAD_REQUEST

diff --git a/authapi/authapi/celery.py b/authapi/authapi/celery.py
@@ -1,17 +1,23 @@
 import os
 
 from celery import Celery
+from celery.utils.log import get_task_logger
 from celery.signals import celeryd_init
 from django.conf import settings
 
+
+logger = get_task_logger(__name__)
+
 @celeryd_init.connect
 def reset_tallies_task(sender=None, conf=None, **kwargs):
     '''
     Resets the status of the all the AuthEvents with tally pending or started
     to notstarted.
     '''
-    print('resetting the status of any all the AuthEvents with tally ' +
-          'pending or started to notstarted')
+    logger.info(
+        'reset_tallies_task: resetting the status of any all the AuthEvents ' +
+        'with tally pending or started to notstarted'
+    )
     from api.models import AuthEvent
     AuthEvent\
         .objects\

diff --git a/authapi/authapi/settings.py b/authapi/authapi/settings.py
@@ -35,8 +35,12 @@ class CeleryConfig:
     beat_schedule = {
         'review_tallies': {
             'task': 'tasks.process_tallies',
-            'schedule': timedelta(seconds=5),
-            'args': []
+            'schedule': timedelta(seconds=10),
+            'args': [],
+            'options': {
+                'expires': 10
+            },
+            'time_limit': 10
         },
     }
     result_backend = 'django-db'

diff --git a/authapi/authmethods/m_email.py b/authapi/authmethods/m_email.py
@@ -289,7 +289,7 @@ def check_config(self, config):
                 "error '%r'\n"\
                 "config '%r'\n"\
                 "Stack trace: \n%s",\
-                e, config, stack_trace_str())
+                e.data, config, stack_trace_str())
             return json.dumps(e.data, cls=JsonTypeEncoder)
 
     def census(self, auth_event, request):

diff --git a/authapi/authmethods/m_email_otp.py b/authapi/authmethods/m_email_otp.py
@@ -294,7 +294,7 @@ def check_config(self, config):
                 "error '%r'\n"\
                 "config '%r'\n"\
                 "Stack trace: \n%s",\
-                e, config, stack_trace_str())
+                e.data, config, stack_trace_str())
             return json.dumps(e.data, cls=JsonTypeEncoder)
 
     def census(self, auth_event, request):

diff --git a/authapi/authmethods/m_smart_link.py b/authapi/authmethods/m_smart_link.py
@@ -88,7 +88,7 @@ def check_config(self, config):
       try:
         check_contract(self.CONFIG_CONTRACT, config)
       except CheckException as e:
-        return str(e)
+        return str(e.data)
     return ''
 
   def resend_auth_code(self, config):

diff --git a/authapi/authmethods/m_sms.py b/authapi/authmethods/m_sms.py
@@ -294,7 +294,7 @@ def check_config(self, config):
                 "error '%r'\n"\
                 "config '%r'"\
                 "Stack trace: \n%s",\
-                e, config, stack_trace_str())
+                e.data, config, stack_trace_str())
             return json.dumps(e.data, cls=JsonTypeEncoder)
 
     def census(self, auth_event, request):

diff --git a/authapi/authmethods/m_sms_otp.py b/authapi/authmethods/m_sms_otp.py
@@ -293,7 +293,7 @@ def check_config(self, config):
                 "error '%r'\n"\
                 "config '%r'"\
                 "Stack trace: \n%s",\
-                e, config, stack_trace_str())
+                e.data, config, stack_trace_str())
             return json.dumps(e.data, cls=JsonTypeEncoder)
 
     def census(self, auth_event, request):