From 047d66cbc36007ca0f62269b3e27bbeb5d47ab53 Mon Sep 17 00:00:00 2001
From: Jonas 12t <jturbeaux@pm.me>
Date: Tue, 9 Nov 2021 11:27:27 +0400
Subject: [PATCH] Logger

---
 DjangoFiles/BaseBillet/signals.py |  8 ++++----
 DjangoFiles/BaseBillet/tasks.py   | 21 +++++++++++++++------
 DjangoFiles/TiBillet/celery.py    | 29 ++++++-----------------------
 DjangoFiles/TiBillet/settings.py  | 16 ++++++++++++----
 4 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/DjangoFiles/BaseBillet/signals.py b/DjangoFiles/BaseBillet/signals.py
index 8176089..33cc20e 100644
--- a/DjangoFiles/BaseBillet/signals.py
+++ b/DjangoFiles/BaseBillet/signals.py
@@ -1,15 +1,15 @@
 import requests
-from django.db import connection
+# from django.db import connection
 from django.db.models import Q
 from django.db.models.signals import post_save, pre_save
 from django.dispatch import receiver
-from django.utils import timezone
+# from django.utils import timezone
 
-from ApiBillet.thread_mailer import ThreadMaileur
+# from ApiBillet.thread_mailer import ThreadMaileur
 from BaseBillet.models import Reservation, LigneArticle, Ticket, Product, Configuration, Paiement_stripe
 from BaseBillet.tasks import ticket_celery_mailer
 
-from TiBillet import settings
+# from TiBillet import settings
 
 import logging
 logger = logging.getLogger(__name__)
diff --git a/DjangoFiles/BaseBillet/tasks.py b/DjangoFiles/BaseBillet/tasks.py
index 85dd38f..fd17416 100644
--- a/DjangoFiles/BaseBillet/tasks.py
+++ b/DjangoFiles/BaseBillet/tasks.py
@@ -1,4 +1,4 @@
-import base64
+# import base64
 import os
 from io import BytesIO
 import segno
@@ -14,8 +14,9 @@ from BaseBillet.models import Configuration, Reservation, Ticket
 from TiBillet.celery import app
 
 import logging
-
 logger = logging.getLogger(__name__)
+# from celery.utils.log import get_task_logger
+# logger = get_task_logger(__name__)
 
 
 class CeleryMailerClass():
@@ -55,7 +56,7 @@ class CeleryMailerClass():
 
     def send(self):
         if self.html and self.config_valid():
-            logger.info(f'  send_mail')
+            logger.info(f'  WORKDER CELERY : send_mail')
             mail = EmailMultiAlternatives(
                 self.title,
                 self.text,
@@ -72,9 +73,9 @@ class CeleryMailerClass():
 
             if mail_return == 1:
                 self.sended = True
-                logger.info(f'      mail envoyé : {mail_return} - {self.email}')
+                logger.info(f'      WORKDER CELERY mail envoyé : {mail_return} - {self.email}')
             else:
-                logger.error(f'     mail non envoyé : {mail_return} - {self.email}')
+                logger.error(f'     WORKDER CELERY mail non envoyé : {mail_return} - {self.email}')
 
             return mail_return
         else:
@@ -149,7 +150,7 @@ def create_ticket_pdf(ticket: Ticket):
 
 @app.task
 def ticket_celery_mailer(reservation_uuid: str):
-
+    logger.info(f'      WORKDER CELERY app.task ticket_celery_mailer : {reservation_uuid}')
     config = Configuration.get_solo()
     reservation = Reservation.objects.get(pk=reservation_uuid)
 
@@ -179,3 +180,11 @@ def ticket_celery_mailer(reservation_uuid: str):
     except Exception as e:
         logger.error(f"{timezone.now()} Erreur envoie de mail pour reservation {reservation} : {e}")
         raise Exception
+
+
+@app.task
+def test_logger():
+    logger.debug(f"{timezone.now()} debug")
+    logger.info(f"{timezone.now()} info")
+    logger.warning(f"{timezone.now()} warning")
+    logger.error(f"{timezone.now()} error")
\ No newline at end of file
diff --git a/DjangoFiles/TiBillet/celery.py b/DjangoFiles/TiBillet/celery.py
index 8a842e7..f76663f 100644
--- a/DjangoFiles/TiBillet/celery.py
+++ b/DjangoFiles/TiBillet/celery.py
@@ -1,28 +1,6 @@
-'''
-
-import os
-from celery import Celery
-
-# setting the Django settings module.
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'TiBillet.settings')
-app = Celery('TiBillet')
-
-app.config_from_object('django.conf:settings', namespace='CELERY')
-# Looks up for task modules in Django applications and loads them
-app.autodiscover_tasks()
-
-
-'''
-
-'''
-celery -A TiBillet worker -l INFO
-from TiBillet.celery import my_task
-my_task.delay()
-'''
-
 import os
 from django.db import connection
-
+from celery.signals import setup_logging
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'TiBillet.settings')
 
 from django.conf import settings
@@ -33,6 +11,11 @@ app = TenantAwareCeleryApp()
 app.config_from_object('django.conf:settings')
 app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
 
+@setup_logging.connect
+def config_loggers(*args, **kwags):
+    from logging.config import dictConfig
+    from django.conf import settings
+    dictConfig(settings.LOGGING)
 
 @app.task
 def add(x, y):
diff --git a/DjangoFiles/TiBillet/settings.py b/DjangoFiles/TiBillet/settings.py
index 57bb4e7..683ed2e 100644
--- a/DjangoFiles/TiBillet/settings.py
+++ b/DjangoFiles/TiBillet/settings.py
@@ -230,19 +230,27 @@ JET_CHANGE_FORM_SIBLING_LINKS = False
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
+    'formatters': {
+        'simple': {
+            'format': '%(levelname)s %(message)s',
+            'datefmt': '%y %b %d, %H:%M:%S',
+        },
+    },
     'handlers': {
         'console': {
-            'level': 'INFO',
+            'level': 'DEBUG',
             'class': 'logging.StreamHandler',
         },
         'logfile': {
-            'level': 'INFO',
-            'class': 'logging.FileHandler',
+            'level': 'DEBUG',
+            'class': 'logging.handlers.RotatingFileHandler',
             'filename': f"{BASE_DIR}/www/Djangologfile",
+            'formatter': 'simple',
+            'maxBytes': 1024 * 1024 * 100,  # 100 mb
         },
     },
     'root': {
-        'level': 'INFO',
+        'level': 'DEBUG',
         'handlers': ['console', 'logfile']
     },
 }
\ No newline at end of file