pjandro/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-11-05 20:55:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bound the panel syslog view with a journalctl timeout (#6689)

Browse Source 
* 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>
This commit is contained in:
kaveh
2026-10-03 02:51:25 +03:30
committed by GitHub
parent 98db0710c9
commit 5366eb0d29
2 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/web/service/server.go
+9 -1
View File
@@ -1184,6 +1184,9 @@ func (s *ServerService) UpdateXray(version string) error {
return nil
}
// syslogTimeout keeps a stalled journalctl from hanging the Syslog request (#6629).
var syslogTimeout = 15 * time.Second
func (s *ServerService) GetLogs(count string, level string, syslog string) []string {
c, _ := strconv.Atoi(count)
var lines []string
@@ -1216,10 +1219,15 @@ func (s *ServerService) GetLogs(count string, level string, syslog string) []str
}
// Use hardcoded command with validated parameters
cmd := exec.CommandContext(context.Background(), "journalctl", "-u", "x-ui", "--no-pager", "-n", strconv.Itoa(countInt), "-p", level)
ctx, cancel := context.WithTimeout(context.Background(), syslogTimeout)
defer cancel()
cmd := exec.CommandContext(ctx, "journalctl", "-u", "x-ui", "--no-pager", "-n", strconv.Itoa(countInt), "-p", level)
var out bytes.Buffer
cmd.Stdout = &out
err = cmd.Run()
if errors.Is(ctx.Err(), context.DeadlineExceeded) {
return []string{"journalctl did not answer in time. Try a smaller line count or a less strict level."}
}
if err != nil {
return []string{"Failed to run journalctl command! Make sure systemd is available and x-ui service is registered."}
}