mirror of
https://github.com/MacRimi/ProxMenux.git
synced 2025-11-18 11:36:17 +00:00
Update AppImage
This commit is contained in:
@@ -121,12 +121,22 @@ export function SystemLogs() {
|
|||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
console.log("[v0] Date filter changed:", dateFilter, "Custom days:", customDays)
|
||||||
if (dateFilter !== "now") {
|
if (dateFilter !== "now") {
|
||||||
console.log("[v0] Date filter changed to:", dateFilter)
|
setLoading(true)
|
||||||
fetchSystemLogs().then((newLogs) => {
|
fetchSystemLogs()
|
||||||
console.log("[v0] Loaded logs for date filter:", dateFilter, "Count:", newLogs.length)
|
.then((newLogs) => {
|
||||||
setLogs(newLogs)
|
console.log("[v0] Loaded logs for date filter:", dateFilter, "Count:", newLogs.length)
|
||||||
})
|
console.log("[v0] First log:", newLogs[0])
|
||||||
|
setLogs(newLogs)
|
||||||
|
setLoading(false)
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.error("[v0] Error loading logs:", err)
|
||||||
|
setLoading(false)
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
fetchAllData()
|
||||||
}
|
}
|
||||||
}, [dateFilter, customDays])
|
}, [dateFilter, customDays])
|
||||||
|
|
||||||
@@ -170,13 +180,13 @@ export function SystemLogs() {
|
|||||||
try {
|
try {
|
||||||
let apiUrl = getApiUrl("/api/logs")
|
let apiUrl = getApiUrl("/api/logs")
|
||||||
|
|
||||||
// Add date filter parameters if not "now"
|
|
||||||
if (dateFilter !== "now") {
|
if (dateFilter !== "now") {
|
||||||
const daysAgo = dateFilter === "custom" ? Number.parseInt(customDays) : Number.parseInt(dateFilter)
|
const daysAgo = dateFilter === "custom" ? Number.parseInt(customDays) : Number.parseInt(dateFilter)
|
||||||
apiUrl += `?since_days=${daysAgo}`
|
apiUrl += `?since_days=${daysAgo}`
|
||||||
console.log("[v0] Fetching logs with since_days:", daysAgo)
|
console.log("[v0] Fetching logs with API URL:", apiUrl, "since_days:", daysAgo)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log("[v0] Making fetch request to:", apiUrl)
|
||||||
const response = await fetch(apiUrl, {
|
const response = await fetch(apiUrl, {
|
||||||
method: "GET",
|
method: "GET",
|
||||||
headers: {
|
headers: {
|
||||||
@@ -185,12 +195,19 @@ export function SystemLogs() {
|
|||||||
cache: "no-store",
|
cache: "no-store",
|
||||||
})
|
})
|
||||||
|
|
||||||
|
console.log("[v0] Response status:", response.status, "OK:", response.ok)
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error(`Flask server responded with status: ${response.status}`)
|
throw new Error(`Flask server responded with status: ${response.status}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
return Array.isArray(data) ? data : data.logs || []
|
console.log("[v0] Received logs data, type:", typeof data, "is array:", Array.isArray(data))
|
||||||
|
console.log("[v0] Data length:", Array.isArray(data) ? data.length : data.logs ? data.logs.length : 0)
|
||||||
|
|
||||||
|
const logsArray = Array.isArray(data) ? data : data.logs || []
|
||||||
|
console.log("[v0] Returning logs array with length:", logsArray.length)
|
||||||
|
return logsArray
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("[v0] Failed to fetch system logs:", error)
|
console.error("[v0] Failed to fetch system logs:", error)
|
||||||
return []
|
return []
|
||||||
|
|||||||
@@ -3342,9 +3342,18 @@ def api_logs():
|
|||||||
limit = request.args.get('limit', '200')
|
limit = request.args.get('limit', '200')
|
||||||
priority = request.args.get('priority', None) # 0-7 (0=emerg, 3=err, 4=warning, 6=info)
|
priority = request.args.get('priority', None) # 0-7 (0=emerg, 3=err, 4=warning, 6=info)
|
||||||
service = request.args.get('service', None)
|
service = request.args.get('service', None)
|
||||||
|
since_days = request.args.get('since_days', None)
|
||||||
|
|
||||||
cmd = ['journalctl', '-n', limit, '--output', 'json', '--no-pager']
|
cmd = ['journalctl', '-n', limit, '--output', 'json', '--no-pager']
|
||||||
|
|
||||||
|
if since_days:
|
||||||
|
try:
|
||||||
|
days = int(since_days)
|
||||||
|
cmd.extend(['--since', f'{days} days ago'])
|
||||||
|
print(f"[API] Filtering logs since {days} days ago")
|
||||||
|
except ValueError:
|
||||||
|
print(f"[API] Invalid since_days value: {since_days}")
|
||||||
|
|
||||||
# Add priority filter if specified
|
# Add priority filter if specified
|
||||||
if priority:
|
if priority:
|
||||||
cmd.extend(['-p', priority])
|
cmd.extend(['-p', priority])
|
||||||
|
|||||||
Reference in New Issue
Block a user