fixes
This commit is contained in:
47
app.py
47
app.py
@@ -121,21 +121,51 @@ def display_haproxy_logs():
|
||||
|
||||
@app.route('/api/logs', methods=['POST'])
|
||||
def api_get_logs():
|
||||
"""API endpoint for paginated and filtered logs"""
|
||||
try:
|
||||
log_file_path = '/var/log/haproxy.log'
|
||||
|
||||
if not os.path.exists(log_file_path):
|
||||
return jsonify({'error': 'Log file not found'}), 404
|
||||
return jsonify({'error': 'Log file not found', 'success': False}), 404
|
||||
|
||||
page = request.json.get('page', 1)
|
||||
per_page = request.json.get('per_page', 50)
|
||||
search_query = request.json.get('search', '').lower()
|
||||
exclude_phrases = request.json.get('exclude', [])
|
||||
|
||||
if page < 1:
|
||||
page = 1
|
||||
if per_page < 1 or per_page > 500:
|
||||
per_page = 50
|
||||
|
||||
print(f"[API] page={page}, per_page={per_page}, search={search_query}, exclude={len(exclude_phrases)}", flush=True)
|
||||
|
||||
# Parse all logs
|
||||
all_logs = parse_log_file(log_file_path)
|
||||
total_logs = len(all_logs)
|
||||
|
||||
# Reverse to show newest first
|
||||
all_logs = all_logs[::-1]
|
||||
|
||||
# Apply filters
|
||||
filtered_logs = all_logs
|
||||
|
||||
if search_query:
|
||||
filtered_logs = [log for log in filtered_logs if search_query in
|
||||
f"{log.get('timestamp', '')} {log.get('ip_address', '')} {log.get('http_method', '')} {log.get('requested_url', '')}".lower()]
|
||||
|
||||
if exclude_phrases:
|
||||
filtered_logs = [log for log in filtered_logs if not any(
|
||||
phrase in f"{log.get('message', '')}" for phrase in exclude_phrases
|
||||
)]
|
||||
|
||||
total_filtered = len(filtered_logs)
|
||||
|
||||
# Paginate
|
||||
offset = (page - 1) * per_page
|
||||
paginated_logs = filtered_logs[offset:offset + per_page]
|
||||
|
||||
logs = parse_log_file(log_file_path)
|
||||
total_logs = len(logs)
|
||||
|
||||
reversed_logs = logs[::-1]
|
||||
paginated_logs = reversed_logs[offset:offset + per_page]
|
||||
print(f"[API] total={total_logs}, filtered={total_filtered}, returned={len(paginated_logs)}", flush=True)
|
||||
|
||||
return jsonify({
|
||||
'success': True,
|
||||
@@ -143,12 +173,15 @@ def api_get_logs():
|
||||
'page': page,
|
||||
'per_page': per_page,
|
||||
'total': total_logs,
|
||||
'has_more': offset + per_page < total_logs
|
||||
'total_filtered': total_filtered,
|
||||
'loaded_count': len(paginated_logs),
|
||||
'has_more': offset + per_page < total_filtered
|
||||
})
|
||||
except Exception as e:
|
||||
print(f"[API] Error: {e}", flush=True)
|
||||
return jsonify({'error': str(e), 'success': False}), 500
|
||||
|
||||
|
||||
@app.route('/home')
|
||||
def home():
|
||||
frontend_count, backend_count, acl_count, layer7_count, layer4_count = count_frontends_and_backends()
|
||||
|
||||
Reference in New Issue
Block a user