fixed issue #1 #4 #6

Author: agusmakmun

.travis.yml

@@ -23,6 +23,10 @@ matrix:
       env: DJANGO=2.1.*
     - python: 3.5
       env: DJANGO=2.2.*
+    - python: 3.5
+      env: DJANGO=3.0.*
+    - python: 3.5
+      env: DJANGO=3.1.*
 
     - python: 3.6
       env: DJANGO=1.10.*
@@ -34,6 +38,10 @@ matrix:
       env: DJANGO=2.1.*
     - python: 3.6
       env: DJANGO=2.2.*
+    - python: 3.6
+      env: DJANGO=3.0.*
+    - python: 3.6
+      env: DJANGO=3.1.*
 
     - python: 3.7
       env: DJANGO=1.10.*
@@ -45,10 +53,14 @@ matrix:
       env: DJANGO=2.1.*
     - python: 3.7
       env: DJANGO=2.2.*
+    - python: 3.7
+      env: DJANGO=3.0.*
+    - python: 3.7
+      env: DJANGO=3.1.*
 
     - os: osx
       language: generic
-      env: DJANGO=1.10.*
+      env: DJANGO=3.1.*
 
 # Perform the manual steps on OSX to install Python3 and activate venv:
 # Since Python versions have been tested on Linux and it is only a matter of

README.rst

@@ -47,6 +47,7 @@ Quick start
     LOG_VIEWER_FILES_DIR = os.path.join(BASE_DIR, '../logs')
     LOG_VIEWER_MAX_READ_LINES = 1000  # total log lines will be read
     LOG_VIEWER_PAGE_LENGTH = 25       # total log lines per-page
+    LOG_VIEWER_PATTERNS = [']OFNI[', ']GUBED[', ']GNINRAW[', ']RORRE[', ']LACITIRC[']
 
     # Optionally you can set the next variables in order to customize the admin:
 
@@ -59,10 +60,10 @@ Quick start
 ::
 
     import logging
-    logger = logging.getLogger('my_handler')  # eg: log_viewer_demo/log_viewer_demo/logger.py
-    logger.info('My log')
-    logger.warning('My log')
-    logger.error('My log')
+    logger = logging.getLogger('LoggerName')
+    logger.info('The info message')
+    logger.warning('The warning message')
+    logger.error('The error message')
 
 6. Deploy static files by running the command
 

log_viewer/settings.py

@@ -11,3 +11,5 @@
 LOG_VIEWER_MAX_READ_LINES = getattr(settings, 'LOG_VIEWER_MAX_READ_LINES', 1000)
 LOG_VIEWER_FILE_LIST_TITLE = getattr(settings, 'LOG_VIEWER_FILE_LIST_TITLE', None)
 LOG_VIEWER_FILE_LIST_STYLES = getattr(settings, 'LOG_VIEWER_FILE_LIST_STYLES', None)
+LOG_VIEWER_PATTERNS = getattr(settings, 'LOG_VIEWER_PATTERNS', [']OFNI[', ']GUBED[', ']GNINRAW[',
+                                                                ']RORRE[', ']LACITIRC['])

log_viewer/static/log_viewer/js/jquery.dataTables.min.js

@@ -4,6 +4,8 @@
 import os
 from django.http import JsonResponse
 
+from log_viewer import settings
+
 
 def readlines_reverse(qfile, exclude=''):
     """
@@ -28,8 +30,8 @@ def readlines_reverse(qfile, exclude=''):
 
         # modified
         if next_char == '\n' and line:
-            # pattern = "; |\[INFO\] |\[DEBUG\] |\[WARNING\] |\[ERROR\] |\[CRITICAL\] "
-            patterns = [']OFNI[', ']GUBED[', ']GNINRAW[', ']RORRE[', ']LACITIRC[']
+            # support custom patterns (fixed issue #4)
+            patterns = settings.LOG_VIEWER_PATTERNS
 
             if any([line.endswith(p) for p in patterns]):
                 if exclude in line[::-1]:

log_viewer/utils.py

@@ -8,6 +8,7 @@
 from django.contrib.auth.decorators import (login_required, user_passes_test)
 from django.contrib.admin.utils import (quote, unquote)
 from django.utils.decorators import method_decorator
+from django.utils.functional import SimpleLazyObject
 
 from log_viewer import settings
 from log_viewer.utils import (readlines_reverse, JSONResponseMixin)
@@ -20,8 +21,10 @@ class LogJsonView(JSONResponseMixin, TemplateView):
     def dispatch(self, *args, **kwargs):
         return super(LogJsonView, self).dispatch(*args, **kwargs)
 
-    def get_log_json(self, file_name=None, page=1):
+    def get_log_json(self, original_context={}):
         context = {}
+        page = original_context.get('page', 1)
+        file_name = original_context.get('file_name')
 
         # Clean the `file_name` to avoid relative paths.
         file_name = unquote(file_name).replace('/..', '').replace('..', '')
@@ -88,8 +91,13 @@ def get_log_json(self, file_name=None, page=1):
         return context
 
     def render_to_response(self, context, **response_kwargs):
-        log_json = self.get_log_json(context.get('file_name'),
-                                     context.get('page', 1))
+
+        # to support Djang 3.1.* (fixed issue #6)
+        file_name = context.get('file_name')
+        if isinstance(file_name, SimpleLazyObject):
+            context = context['view'].kwargs
+
+        log_json = self.get_log_json(context)
 
         if 'file' in log_json:
             log_json['file'] = log_json['file'].name

log_viewer/views.py

@@ -27,14 +27,6 @@
             'backupCount': BACKUP_COUNT,
             'formatter': 'standard',
         },
-        'request_nicepay_handler': {
-            'level': 'DEBUG',
-            'class': 'logging.handlers.RotatingFileHandler',
-            'filename': 'logs/nicepay/%s.log' % DAY_NAME,
-            'maxBytes': MAXIMUM_FILE_LOGS,
-            'backupCount': BACKUP_COUNT,
-            'formatter': 'standard',
-        },
         'request_debug_handler': {
             'level': 'DEBUG',
             'class': 'logging.handlers.RotatingFileHandler',
@@ -58,13 +50,12 @@
         },
     },
     'root': {
-        'handlers': ['default', 'request_nicepay_handler'],
+        'handlers': ['default'],
         'level': 'DEBUG'
     },
     'loggers': {
         'django.request': {
             'handlers': [
-                'request_nicepay_handler',
                 'request_debug_handler',
                 'request_error_handler',
                 'mail_admins_handler'

log_viewer_demo/log_viewer_demo/logger.py

@@ -2,13 +2,13 @@
 """
 Django settings for log_viewer_demo project.
 
-Generated by 'django-admin startproject' using Django 2.1.7.
+Generated by 'django-admin startproject' using Django 3.1.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/2.1/topics/settings/
+https://docs.djangoproject.com/en/3.1/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/2.1/ref/settings/
+https://docs.djangoproject.com/en/3.1/ref/settings/
 """
 
 import os
@@ -19,7 +19,7 @@
 
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/2.1/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = '8tjj-10%-%q^q1s^-#f4urf(n*%0jh-d-a81)#qo!j0@^om)%3'
@@ -80,7 +80,7 @@
 
 
 # Database
-# https://docs.djangoproject.com/en/2.1/ref/settings/#databases
+# https://docs.djangoproject.com/en/3.1/ref/settings/#databases
 
 DATABASES = {
     'default': {
@@ -91,7 +91,7 @@
 
 
 # Password validation
-# https://docs.djangoproject.com/en/2.1/ref/settings/#auth-password-validators
+# https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
     {
@@ -110,7 +110,7 @@
 
 
 # Internationalization
-# https://docs.djangoproject.com/en/2.1/topics/i18n/
+# https://docs.djangoproject.com/en/3.1/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
 
@@ -124,7 +124,7 @@
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/2.1/howto/static-files/
+# https://docs.djangoproject.com/en/3.1/howto/static-files/
 
 STATIC_URL = '/static/'
 STATIC_ROOT = os.path.join(BASE_DIR, 'static/')

log_viewer_demo/log_viewer_demo/settings.py

@@ -1,7 +1,7 @@
 """log_viewer_demo URL Configuration
 
 The `urlpatterns` list routes URLs to views. For more information please see:
-    https://docs.djangoproject.com/en/2.1/topics/http/urls/
+    https://docs.djangoproject.com/en/3.1/topics/http/urls/
 Examples:
 Function views
     1. Add an import:  from my_app import views

log_viewer_demo/log_viewer_demo/urls.py

@@ -4,7 +4,7 @@
 It exposes the WSGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/2.1/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/3.1/howto/deployment/wsgi/
 """
 
 import os