feat: Enhance logs view with level filtering and improved entry display
Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
Ross
+97
-15
@@ -1,6 +1,7 @@
|
||||
import secrets
|
||||
from typing import Any, Optional
|
||||
import os
|
||||
import re
|
||||
from django.conf import settings
|
||||
|
||||
from django_tables2 import SingleTableMixin
|
||||
@@ -246,32 +247,111 @@ def logs_view(request):
|
||||
Supports ?all=1 to show all entries without pagination limit.
|
||||
"""
|
||||
log_file_path = os.path.join(settings.BASE_DIR, "log.txt")
|
||||
entries = []
|
||||
search_query = request.GET.get("q", "").strip()
|
||||
level_filter = request.GET.get("level", "").strip().upper()
|
||||
show_all = request.GET.get("all") == "1"
|
||||
|
||||
|
||||
log_header_re = re.compile(
|
||||
r"^\[(?P<timestamp>[^\]]+)\]\s+(?P<level>[A-Z]+)\s+\[(?P<logger>[^:\]]+):(?P<line>\d+)\]\s+(?P<message>.*)$"
|
||||
)
|
||||
|
||||
parsed_entries: list[dict[str, Any]] = []
|
||||
if os.path.exists(log_file_path):
|
||||
try:
|
||||
with open(log_file_path, "r", encoding="utf-8", errors="ignore") as f:
|
||||
lines = f.readlines()
|
||||
|
||||
for line in reversed(lines):
|
||||
line = line.rstrip()
|
||||
if not line:
|
||||
|
||||
current_entry = None
|
||||
for raw_line in lines:
|
||||
line = raw_line.rstrip("\n")
|
||||
if not line.strip():
|
||||
if current_entry is not None:
|
||||
current_entry["details"].append("")
|
||||
continue
|
||||
|
||||
if search_query and search_query.lower() not in line.lower():
|
||||
|
||||
header_match = log_header_re.match(line)
|
||||
if header_match:
|
||||
if current_entry is not None:
|
||||
parsed_entries.append(current_entry)
|
||||
|
||||
current_entry = {
|
||||
"timestamp": header_match.group("timestamp"),
|
||||
"level": header_match.group("level"),
|
||||
"logger": header_match.group("logger"),
|
||||
"source_line": header_match.group("line"),
|
||||
"message": header_match.group("message"),
|
||||
"details": [],
|
||||
}
|
||||
continue
|
||||
|
||||
entries.append(line)
|
||||
|
||||
if current_entry is not None:
|
||||
current_entry["details"].append(line)
|
||||
else:
|
||||
parsed_entries.append(
|
||||
{
|
||||
"timestamp": "",
|
||||
"level": "RAW",
|
||||
"logger": "",
|
||||
"source_line": "",
|
||||
"message": line,
|
||||
"details": [],
|
||||
}
|
||||
)
|
||||
|
||||
if current_entry is not None:
|
||||
parsed_entries.append(current_entry)
|
||||
|
||||
except Exception as e:
|
||||
entries = [f"Error reading log file: {str(e)}"]
|
||||
parsed_entries = [
|
||||
{
|
||||
"timestamp": "",
|
||||
"level": "ERROR",
|
||||
"logger": "logs_view",
|
||||
"source_line": "",
|
||||
"message": f"Error reading log file: {str(e)}",
|
||||
"details": [],
|
||||
}
|
||||
]
|
||||
else:
|
||||
entries = [f"Log file not found at {log_file_path}"]
|
||||
|
||||
total = len(entries)
|
||||
parsed_entries = [
|
||||
{
|
||||
"timestamp": "",
|
||||
"level": "ERROR",
|
||||
"logger": "logs_view",
|
||||
"source_line": "",
|
||||
"message": f"Log file not found at {log_file_path}",
|
||||
"details": [],
|
||||
}
|
||||
]
|
||||
|
||||
# Most recent first.
|
||||
parsed_entries = list(reversed(parsed_entries))
|
||||
|
||||
available_levels = sorted({entry["level"] for entry in parsed_entries if entry["level"]})
|
||||
|
||||
filtered_entries = []
|
||||
search_lower = search_query.lower()
|
||||
for entry in parsed_entries:
|
||||
if level_filter and entry["level"] != level_filter:
|
||||
continue
|
||||
|
||||
haystack = "\n".join(
|
||||
[
|
||||
entry.get("timestamp", ""),
|
||||
entry.get("level", ""),
|
||||
entry.get("logger", ""),
|
||||
entry.get("message", ""),
|
||||
"\n".join(entry.get("details", [])),
|
||||
]
|
||||
).lower()
|
||||
if search_lower and search_lower not in haystack:
|
||||
continue
|
||||
|
||||
filtered_entries.append(entry)
|
||||
|
||||
total = len(filtered_entries)
|
||||
limit = None if show_all else 500
|
||||
displayed_entries = entries[:limit] if limit else entries
|
||||
displayed_entries = filtered_entries[:limit] if limit else filtered_entries
|
||||
|
||||
return render(
|
||||
request,
|
||||
@@ -280,6 +360,8 @@ def logs_view(request):
|
||||
"entries": displayed_entries,
|
||||
"total_entries": total,
|
||||
"search_query": search_query,
|
||||
"level_filter": level_filter,
|
||||
"available_levels": available_levels,
|
||||
"log_file_path": log_file_path,
|
||||
"show_all": show_all,
|
||||
"limit": limit,
|
||||
|
||||
@@ -1,5 +1,34 @@
|
||||
{% extends 'base.html' %}
|
||||
|
||||
{% block css %}
|
||||
{{ block.super }}
|
||||
<style>
|
||||
.log-row {
|
||||
border-bottom: 1px solid var(--bs-border-color);
|
||||
}
|
||||
.log-message {
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
|
||||
font-size: 0.9rem;
|
||||
white-space: pre-wrap;
|
||||
word-break: break-word;
|
||||
}
|
||||
.log-trace {
|
||||
margin: 0;
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
|
||||
font-size: 0.82rem;
|
||||
line-height: 1.35;
|
||||
white-space: pre-wrap;
|
||||
word-break: break-word;
|
||||
max-height: 24rem;
|
||||
overflow-y: auto;
|
||||
background: rgba(0, 0, 0, 0.15);
|
||||
border: 1px solid var(--bs-border-color);
|
||||
border-radius: 0.375rem;
|
||||
padding: 0.75rem;
|
||||
}
|
||||
</style>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="container-fluid py-4">
|
||||
<div class="d-flex justify-content-between align-items-start gap-3 mb-4">
|
||||
@@ -14,7 +43,7 @@
|
||||
{% if show_all %}
|
||||
Viewing all {{ total_entries }} entries
|
||||
{% else %}
|
||||
Showing {{ entries|length }}/{{ total_entries }} entries
|
||||
Showing {{ entries|length }}/{{ total_entries }} entries
|
||||
{% endif %}
|
||||
</span>
|
||||
</div>
|
||||
@@ -23,24 +52,32 @@
|
||||
<div class="card border-0 shadow-sm mb-4">
|
||||
<div class="card-body">
|
||||
<form method="get" class="row g-2">
|
||||
<div class="col-12 col-md-6">
|
||||
<div class="col-12 col-md-5">
|
||||
<input type="search"
|
||||
name="q"
|
||||
class="form-control"
|
||||
placeholder="Search logs by keyword (error, warning, etc)…"
|
||||
value="{{ search_query }}">
|
||||
</div>
|
||||
<div class="col-12 col-md-3">
|
||||
<select name="level" class="form-select">
|
||||
<option value="">All levels</option>
|
||||
{% for level in available_levels %}
|
||||
<option value="{{ level }}" {% if level_filter == level %}selected{% endif %}>{{ level }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-12 col-md-auto">
|
||||
<button type="submit" class="btn btn-primary">Search</button>
|
||||
{% if search_query %}
|
||||
{% if search_query or level_filter %}
|
||||
<a href="{% url 'logs_view' %}" class="btn btn-outline-secondary ms-1">Clear</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="col-12 col-md-auto">
|
||||
{% if show_all %}
|
||||
<a href="{% url 'logs_view' %}?q={{ search_query }}" class="btn btn-outline-secondary">Show recent only</a>
|
||||
<a href="{% url 'logs_view' %}?q={{ search_query }}&level={{ level_filter }}" class="btn btn-outline-secondary">Show recent only</a>
|
||||
{% else %}
|
||||
<a href="{% url 'logs_view' %}?q={{ search_query }}&all=1" class="btn btn-outline-info">View all logs</a>
|
||||
<a href="{% url 'logs_view' %}?q={{ search_query }}&level={{ level_filter }}&all=1" class="btn btn-outline-info">View all logs</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</form>
|
||||
@@ -49,10 +86,41 @@
|
||||
|
||||
{% if entries %}
|
||||
<div class="card border-0 shadow-sm">
|
||||
<div class="card-body p-0" style="max-height: 75vh; overflow-y: auto;">
|
||||
<pre style="margin: 0; padding: 1rem; font-size: 0.85rem; line-height: 1.5;">{% for entry in entries %}
|
||||
{{ entry }}
|
||||
<div class="card-body p-0" style="max-height: 78vh; overflow-y: auto;">
|
||||
{% for entry in entries %}
|
||||
<div class="p-3 log-row">
|
||||
<div class="d-flex flex-wrap align-items-center gap-2 mb-2">
|
||||
{% if entry.level == 'ERROR' or entry.level == 'CRITICAL' %}
|
||||
<span class="badge bg-danger">{{ entry.level }}</span>
|
||||
{% elif entry.level == 'WARNING' or entry.level == 'WARN' %}
|
||||
<span class="badge bg-warning text-dark">{{ entry.level }}</span>
|
||||
{% elif entry.level == 'DEBUG' %}
|
||||
<span class="badge bg-secondary">{{ entry.level }}</span>
|
||||
{% elif entry.level == 'INFO' %}
|
||||
<span class="badge bg-info text-dark">{{ entry.level }}</span>
|
||||
{% else %}
|
||||
<span class="badge bg-dark">{{ entry.level|default:'LOG' }}</span>
|
||||
{% endif %}
|
||||
{% if entry.timestamp %}
|
||||
<span class="text-muted small">{{ entry.timestamp }}</span>
|
||||
{% endif %}
|
||||
{% if entry.logger %}
|
||||
<span class="text-muted small">{{ entry.logger }}{% if entry.source_line %}:{{ entry.source_line }}{% endif %}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div class="log-message">{{ entry.message }}</div>
|
||||
|
||||
{% if entry.details %}
|
||||
<details class="mt-2">
|
||||
<summary class="small text-muted">Traceback / Details ({{ entry.details|length }} lines)</summary>
|
||||
<pre class="log-trace mt-2">{% for detail_line in entry.details %}
|
||||
{{ detail_line }}
|
||||
{% endfor %}</pre>
|
||||
</details>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -63,7 +131,7 @@
|
||||
{% else %}
|
||||
Displaying most recent 500 entries (newest first).
|
||||
{% if total_entries > 500 %}
|
||||
<a href="{% url 'logs_view' %}?q={{ search_query }}&all=1" class="alert-link">View all {{ total_entries }} entries</a>.
|
||||
<a href="{% url 'logs_view' %}?q={{ search_query }}&level={{ level_filter }}&all=1" class="alert-link">View all {{ total_entries }} entries</a>.
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if search_query %}
|
||||
|
||||
Reference in New Issue
Block a user