mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-10-04 21:22:07 +03:00
kaveh
5366eb0d29
* Bound the syslog view with a journalctl timeout * fix(syslog): bound the journal scan window and soften the timeout message Limit journalctl to the last 30 days so a rare -p level cannot scan the whole journal, and drop the guessed cause and the host-wide vacuum advice from the timeout message. * fix(syslog): drop --since from the journalctl call and test the timeout On systemd 249/252 (Ubuntu 22.04, Debian 12) journalctl seeks to --since and reads forward when both --since and -n are given, so the Syslog view showed the oldest 200 lines of the 30-day window instead of the newest. Reproduced in debian:12, ubuntu:22.04 and ubuntu:24.04 containers on a synthetic journal; only 255 kept the newest lines. The window also bought nothing: on a 340 MB journal every variant (with or without --since, rare -p level or not) answered in ~10 ms on 252 and 255. Keep the 15s deadline as the guard against a stalled journalctl and cover it with a fake journalctl on PATH; the args test pinned the broken flag and is removed. --------- Co-authored-by: Sanaei <ho3ein.sanaei@gmail.com>
34 lines
1.0 KiB
Go
34 lines
1.0 KiB
Go
//go:build !windows
|
|
|
|
package service
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"slices"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
// A journalctl that never answers must not hang the Syslog request (#6629).
|
|
func TestGetLogsSyslogGivesUpOnAStalledJournalctl(t *testing.T) {
|
|
dir := t.TempDir()
|
|
if err := os.WriteFile(filepath.Join(dir, "journalctl"), []byte("#!/bin/sh\nexec sleep 5\n"), 0o755); err != nil {
|
|
t.Fatalf("write fake journalctl: %v", err)
|
|
}
|
|
t.Setenv("PATH", dir+string(os.PathListSeparator)+os.Getenv("PATH"))
|
|
saved := syslogTimeout
|
|
syslogTimeout = 200 * time.Millisecond
|
|
t.Cleanup(func() { syslogTimeout = saved })
|
|
|
|
start := time.Now()
|
|
got := (&ServerService{}).GetLogs("10", "err", "true")
|
|
want := []string{"journalctl did not answer in time. Try a smaller line count or a less strict level."}
|
|
if !slices.Equal(got, want) {
|
|
t.Fatalf("GetLogs = %q, want %q", got, want)
|
|
}
|
|
if elapsed := time.Since(start); elapsed > 3*time.Second {
|
|
t.Fatalf("GetLogs waited %v for a stalled journalctl, want about %v", elapsed, syslogTimeout)
|
|
}
|
|
}
|