P7: restore agent node type, agent heartbeat expiry, build-version injection, remove log/history/xray-metrics modules, optional sub port
- nodes: port node-type (traditional/agent) picker back from web-src into the embedded frontend; backend annotates NodeView.nodeType from agent_nodes bindings; fix agent-node update path (skip reachability probe and apiToken requirement for agent-managed nodes); restore i18n keys in all 13 locales; install command now uses the Gitea mirror - jobs: expire agent-bound nodes whose agent_nodes.last_seen is older than max(3x heartbeat interval, 120s) = 180s; last_seen=0 (never registered) is left untouched; transitions reuse UpdateHeartbeat + node event broadcast - config: GetBaseVersion honors ldflags-injected buildVersion; release builds inject 3.7.0-agent.1 so the panel no longer reports a phantom update against the Gitea release tag - logger/server: remove the three log viewers (panel/xray/amneziawg), their API endpoints and the 10240-entry in-memory log buffer; file logging via lumberjack unchanged; tests assert via a new optional logger hook instead of the removed buffer - server: remove system history and xray metrics modules end to end (endpoints, sampling appends in RefreshStatus, per-minute persist cron, gob snapshot/restore, XrayMetricsService); realtime status and per-node history are untouched - settings: subPort may be 0/unset - subscription links are generated without a port while the subscription service keeps binding the default 2096; the settings form declares the cleared state via onNumber's new onClear option instead of snapping back to 1
This commit is contained in:
@@ -11,6 +11,7 @@ import (
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"strings"
|
||||
"sync"
|
||||
"testing"
|
||||
|
||||
"github.com/mhsanaei/3x-ui/v3/internal/logger"
|
||||
@@ -27,11 +28,28 @@ type testAddr string
|
||||
func (a testAddr) Network() string { return string(a) }
|
||||
func (a testAddr) String() string { return string(a) }
|
||||
|
||||
// captureLogLines installs a logger hook collecting "LEVEL message" lines
|
||||
// for the rest of the test. It replaces reads of the in-memory log buffer,
|
||||
// which was removed together with the web log viewer.
|
||||
func captureLogLines(t *testing.T) *[]string {
|
||||
t.Helper()
|
||||
var mu sync.Mutex
|
||||
lines := &[]string{}
|
||||
prev := logger.SetLogHook(func(level, msg string) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
*lines = append(*lines, level+" "+msg)
|
||||
})
|
||||
t.Cleanup(func() { logger.SetLogHook(prev) })
|
||||
return lines
|
||||
}
|
||||
|
||||
func TestServeHTTPLogsUnexpectedListenerFailure(t *testing.T) {
|
||||
errInjected := errors.New("injected listener failure")
|
||||
logLines := captureLogLines(t)
|
||||
ServeHTTP(&http.Server{}, failingListener{err: errInjected}, "Test server")
|
||||
|
||||
for _, line := range logger.GetLogs(100, "error") {
|
||||
for _, line := range *logLines {
|
||||
if strings.Contains(line, errInjected.Error()) {
|
||||
return
|
||||
}
|
||||
@@ -41,9 +59,10 @@ func TestServeHTTPLogsUnexpectedListenerFailure(t *testing.T) {
|
||||
|
||||
func TestServeHTTPSuppressesNormalServerClose(t *testing.T) {
|
||||
const marker = "normal-close-must-stay-silent"
|
||||
logLines := captureLogLines(t)
|
||||
ServeHTTP(&http.Server{}, failingListener{err: http.ErrServerClosed}, marker)
|
||||
|
||||
for _, line := range logger.GetLogs(100, "error") {
|
||||
for _, line := range *logLines {
|
||||
if strings.Contains(line, marker) {
|
||||
t.Fatalf("normal http.ErrServerClosed was recorded as an error: %s", line)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user