From 6f4c7b811b0cb604e49e0c4098e54efa3ebcb654 Mon Sep 17 00:00:00 2001
From: Uditi Mehta <uditimehta@coss-mbp.myfiosgateway.com>
Date: Thu, 29 Aug 2024 09:30:25 -0400
Subject: [PATCH] Revert "Add logging to post-commit handlers"

This reverts commit d90d75ee6ee5d4403c167b46e135f2b6f3172464.
---
 framework/auth/views.py                |  2 +-
 framework/postcommit_tasks/handlers.py | 16 ++--------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/framework/auth/views.py b/framework/auth/views.py
index ac099b48796..e398a6db0a5 100644
--- a/framework/auth/views.py
+++ b/framework/auth/views.py
@@ -993,7 +993,7 @@ def resend_confirmation_post(auth):
         if user:
             if throttle_period_expired(user.email_last_sent, settings.SEND_EMAIL_THROTTLE):
                 try:
-                    send_confirm_email_async(user, clean_email, renew=True)
+                    send_confirm_email(user, clean_email, renew=True)
                 except KeyError:
                     # already confirmed, redirect to dashboard
                     status_message = f'This email {clean_email} has already been confirmed.'
diff --git a/framework/postcommit_tasks/handlers.py b/framework/postcommit_tasks/handlers.py
index 0253f69d598..0af90a3b30f 100644
--- a/framework/postcommit_tasks/handlers.py
+++ b/framework/postcommit_tasks/handlers.py
@@ -28,43 +28,34 @@ def postcommit_celery_queue():
     return _local.postcommit_celery_queue
 
 def postcommit_before_request():
-    logger.debug('Initializing postcommit queues before request')
     _local.postcommit_queue = OrderedDict()
     _local.postcommit_celery_queue = OrderedDict()
 
 def postcommit_after_request(response, base_status_error_code=500):
-    logger.debug(f'Postcommit after request triggered with status code {response.status_code}')
     if response.status_code >= base_status_error_code:
-        logger.debug('Clearing postcommit queues due to error response')
         _local.postcommit_queue = OrderedDict()
         _local.postcommit_celery_queue = OrderedDict()
         return response
     try:
         if postcommit_queue():
-            logger.debug(f'Processing postcommit_queue with {len(postcommit_queue())} tasks')
             number_of_threads = 30  # one db connection per greenlet, let's share
             pool = Pool(number_of_threads)
             for func in postcommit_queue().values():
-                logger.debug(f'Spawning task {func}')
                 pool.spawn(func)
             pool.join(timeout=5.0, raise_error=True)  # 5 second timeout and reraise exceptions
 
         if postcommit_celery_queue():
-            logger.debug(f'Processing postcommit_celery_queue with {len(postcommit_celery_queue())} tasks')
             if settings.USE_CELERY:
                 for task_dict in postcommit_celery_queue().values():
                     task = Signature.from_dict(task_dict)
-                    logger.debug(f'Applying async task {task}')
                     task.apply_async()
             else:
                 for task in postcommit_celery_queue().values():
-                    logger.debug(f'Executing task {task}')
                     task()
 
     except AttributeError as ex:
-        logger.error(f'Post commit task queue not initialized: {ex}')
-    except Exception as ex:
-        logger.error(f"Exception during postcommit processing: {ex}")
+        if not settings.DEBUG_MODE:
+            logger.error(f'Post commit task queue not initialized: {ex}')
     return response
 
 def get_task_from_postcommit_queue(name, predicate, celery=True):
@@ -95,10 +86,8 @@ def enqueue_postcommit_task(fn, args, kwargs, celery=False, once_per_request=Tru
             key = f'{key}:{binascii.hexlify(os.urandom(8))}'
 
         if celery and isinstance(fn, PromiseProxy):
-            logger.debug(f'Enqueuing celery task {fn.__name__} with key {key}')
             postcommit_celery_queue().update({key: fn.si(*args, **kwargs)})
         else:
-            logger.debug(f'Enqueuing task {fn.__name__} with key {key}')
             postcommit_queue().update({key: functools.partial(fn, *args, **kwargs)})
 
 handlers = {
@@ -121,7 +110,6 @@ def wrapper(func):
 
         @functools.wraps(func)
         def wrapped(*args, **kwargs):
-            logger.debug(f'Wrapping function {func.__name__} for postcommit')
             enqueue_postcommit_task(func, args, kwargs, celery=celery, once_per_request=once_per_request)
         return wrapped
     return wrapper