Merge pull request #10 from kwangsooshin/feature/grap-log-file

Add: LOG_VIEWER_FILES_PATTERN

Author: agusmakmun

README.rst

@@ -44,6 +44,7 @@ Quick start
 ::
 
     LOG_VIEWER_FILES = ['logfile1', 'logfile2', ...]
+    LOG_VIEWER_FILES_PATTERN = 'logfile*'
     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/settings.py

@@ -6,6 +6,7 @@
 from django.conf import settings
 
 LOG_VIEWER_FILES = getattr(settings, 'LOG_VIEWER_FILES', [])
+LOG_VIEWER_FILES_PATTERN = getattr(settings, 'LOG_VIEWER_FILES_PATTERN', '*.log*')
 LOG_VIEWER_FILES_DIR = getattr(settings, 'LOG_VIEWER_FILES_DIR', 'logs/')
 LOG_VIEWER_PAGE_LENGTH = getattr(settings, 'LOG_VIEWER_PAGE_LENGTH', 25)
 LOG_VIEWER_MAX_READ_LINES = getattr(settings, 'LOG_VIEWER_MAX_READ_LINES', 1000)

log_viewer/views.py

@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 import os
+from fnmatch import fnmatch
 from itertools import islice
 from django.http import HttpResponse
 from django.views.generic import TemplateView
@@ -42,17 +43,16 @@ def get_log_json(self, original_context={}):
         len_logs_dir = len(settings.LOG_VIEWER_FILES_DIR)
 
         for root, _, files in os.walk(settings.LOG_VIEWER_FILES_DIR):
-            tmp_names = list(filter(lambda x: x.find('~') == -1, files))
-            # if LOG_VIEWER_FILES is not set in settings
-            # then all the files with '.log' extension are listed
-            if len(settings.LOG_VIEWER_FILES) > 0:
-                tmp_names = list(filter(lambda x: x in settings.LOG_VIEWER_FILES, tmp_names))
-            else:
-                tmp_names = [name for name in tmp_names if (name.split('.')[-1]) == 'log']
-
-            file_names += tmp_names
-            file_display += [('%s/%s' % (root[len_logs_dir:], name))[1:] for name in tmp_names]
-            file_urls += list(map(lambda x: '%s/%s' % (root, x), tmp_names))
+            all_files = list(filter(lambda x: x.find('~') == -1, files))
+
+            log_files = []
+            log_files.extend(list(filter(lambda x: x in settings.LOG_VIEWER_FILES, all_files)))
+            log_files.extend([x for x in all_files if fnmatch(x, settings.LOG_VIEWER_FILES_PATTERN)])
+            log_files = list(set(log_files))
+
+            file_names.extend(log_files)
+            file_display.extend([('%s/%s' % (root[len_logs_dir:], name))[1:] for name in log_files])
+            file_urls.extend(list(map(lambda x: '%s/%s' % (root, x), log_files)))
 
         for i, element in enumerate(file_display):
             context['log_files'].append({