Merge pull request #10 from CiCiUi/options

 list per page and enable formatter options

Author: zhangshine

README.rst

@@ -85,3 +85,9 @@ Quick start
     except Exception as e:
         db_logger.exception(e)
 
+
+
+Options
+-------
+1. DJANGO_DB_LOGGER_ADMIN_LIST_PER_PAGE: integer. list per page in admin view. default ``10``
+2. DJANGO_DB_LOGGER_ENABLE_FORMATTER: boolean. Using ``formatter`` options to format message.``True`` or ``False``, default ``False``

dev_env/settings.py

@@ -44,19 +44,23 @@
         },
     },
     'handlers': {
-        'db': {
+        'db_handler': {
             'level': 'DEBUG',
-            'class': 'django_db_logger.db_log_handler.DatabaseLogHandler'
+            'class': 'django_db_logger.db_log_handler.DatabaseLogHandler',
+            'formatter': 'verbose'
         }
     },
     'loggers': {
-        'db_logger': {
-            'handlers': ['db'],
+        'db': {
+            'handlers': ['db_handler'],
             'level': 'DEBUG'
         }
     }
 }
 
+DJANGO_DB_LOGGER_ENABLE_FORMATTER = True
+DJANGO_DB_LOGGER_ADMIN_LIST_PER_PAGE = 30
+
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',

dev_env/urls.py

@@ -1,6 +1,9 @@
 from django.contrib import admin
 from django.urls import path
 
+from django_db_logger.views import __gen_500_errors
+
 urlpatterns = [
     path('admin/', admin.site.urls),
+    path('__gen_500/', __gen_500_errors)
 ]

django_db_logger/admin.py

@@ -4,14 +4,15 @@
 from django.contrib import admin
 from django.utils.html import format_html
 
+from django_db_logger.config import DJANGO_DB_LOGGER_ADMIN_LIST_PER_PAGE
 from .models import StatusLog
 
 
 class StatusLogAdmin(admin.ModelAdmin):
     list_display = ('colored_msg', 'traceback', 'create_datetime_format')
     list_display_links = ('colored_msg', )
     list_filter = ('level', )
-    list_per_page = 10
+    list_per_page = DJANGO_DB_LOGGER_ADMIN_LIST_PER_PAGE
 
     def colored_msg(self, instance):
         if instance.level in [logging.NOTSET, logging.INFO]:
@@ -28,7 +29,7 @@ def traceback(self, instance):
 
     def create_datetime_format(self, instance):
         return instance.create_datetime.strftime('%Y-%m-%d %X')
-    create_datetime_format.short_description = 'Create Datetime'
+    create_datetime_format.short_description = 'Created at'
 
 
 admin.site.register(StatusLog, StatusLogAdmin)

django_db_logger/config.py

@@ -0,0 +1,8 @@
+from django.conf import settings
+
+MSG_STYLE_SIMPLE = 'Simple'
+MSG_STYLE_FULL = 'Full'
+
+DJANGO_DB_LOGGER_ADMIN_LIST_PER_PAGE = getattr(settings, 'DJANGO_DB_LOGGER_ADMIN_LIST_PER_PAGE', 10)
+
+DJANGO_DB_LOGGER_ENABLE_FORMATTER = getattr(settings, 'DJANGO_DB_LOGGER_ENABLE_FORMATTER', False)

django_db_logger/db_log_handler.py

@@ -1,5 +1,9 @@
 import logging
-import traceback
+
+from django_db_logger.config import DJANGO_DB_LOGGER_ENABLE_FORMATTER, MSG_STYLE_SIMPLE
+
+
+db_default_formatter = logging.Formatter()
 
 
 class DatabaseLogHandler(logging.Handler):
@@ -9,13 +13,36 @@ def emit(self, record):
         trace = None
 
         if record.exc_info:
-            trace = traceback.format_exc()
+            trace = db_default_formatter.formatException(record.exc_info)
+
+        if DJANGO_DB_LOGGER_ENABLE_FORMATTER:
+            msg = self.format(record)
+        else:
+            msg = record.getMessage()
 
         kwargs = {
             'logger_name': record.name,
             'level': record.levelno,
-            'msg': record.getMessage(),
+            'msg': msg,
             'trace': trace
         }
 
-        StatusLog.objects.create(**kwargs)
+        StatusLog.objects.create(**kwargs)
+
+    def format(self, record):
+        if self.formatter:
+            fmt = self.formatter
+        else:
+            fmt = db_default_formatter
+
+        if type(fmt) == logging.Formatter:
+            record.message = record.getMessage()
+
+            if fmt.usesTime():
+                record.asctime = fmt.formatTime(record, fmt.datefmt)
+
+            # ignore exception traceback and stack info
+
+            return fmt.formatMessage(record)
+        else:
+            return fmt.format(record)

django_db_logger/views.py

@@ -1,3 +1,13 @@
-from django.shortcuts import render
+import logging
 
-# Create your views here.
+from django.http import HttpResponse
+
+logger = logging.getLogger('db')
+
+def __gen_500_errors(request):
+    try:
+        1/0
+    except Exception as e:
+        logger.exception(e)
+
+    return HttpResponse('Hello 500!')

test_settings.py

@@ -47,4 +47,4 @@
     }
 }
 
-SECRET_KEY = 'https://ciciui.com/'
+SECRET_KEY = 'jfkladsjfakljr;els'