mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-11-16 01:55:01 +03:00
fix: keep panel restarts from hanging on the CPU job and Telegram (#7029)
Restarting the panel left it unreachable for up to a minute. CheckCpuJob sampled cpu.Percent over its whole one-minute period, so cron.Stop nearly always waited on it; it now diffs cpu.Times against its previous run (iowait counted as idle, as before). With Telegram unreachable, bus.Stop waited on an in-flight send and tgbot.Start ran getMe/setMyCommands inline; each bot call now returns once StopBot closes the bot's stop channel, the bot stops before the bus, and the artwork/commands warm-up runs in the background.
This commit is contained in:
@@ -0,0 +1,68 @@
|
||||
package tgbot
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/mymmrac/telego"
|
||||
ta "github.com/mymmrac/telego/telegoapi"
|
||||
"github.com/valyala/fasthttp"
|
||||
)
|
||||
|
||||
// With Telegram unreachable a send hangs for its whole fasthttp timeout, and
|
||||
// the event bus, so the panel restart behind it, waited that long.
|
||||
func TestStopBotEndsInFlightTelegramCall(t *testing.T) {
|
||||
arrived := make(chan struct{}, 1)
|
||||
release := make(chan struct{})
|
||||
hang := httptest.NewServer(http.HandlerFunc(func(http.ResponseWriter, *http.Request) {
|
||||
arrived <- struct{}{}
|
||||
<-release
|
||||
}))
|
||||
t.Cleanup(func() { close(release); hang.Close() })
|
||||
|
||||
stop := make(chan struct{})
|
||||
b, err := telego.NewBot(testBotToken, telego.WithAPIServer(hang.URL),
|
||||
telego.WithAPICaller(stoppableCaller{inner: ta.FastHTTPCaller{Client: &fasthttp.Client{}}, stopped: stop}))
|
||||
if err != nil {
|
||||
t.Fatalf("NewBot: %v", err)
|
||||
}
|
||||
origBot := liveBot()
|
||||
botMu.Lock()
|
||||
bot, botStop = b, stop
|
||||
botMu.Unlock()
|
||||
t.Cleanup(func() { setTestBot(origBot) })
|
||||
|
||||
errc := make(chan error, 1)
|
||||
go func() {
|
||||
_, err := b.GetMe(context.Background())
|
||||
errc <- err
|
||||
}()
|
||||
select {
|
||||
case <-arrived:
|
||||
case <-time.After(5 * time.Second):
|
||||
t.Fatal("getMe never reached the fake Telegram API")
|
||||
}
|
||||
|
||||
StopBot()
|
||||
|
||||
select {
|
||||
case err := <-errc:
|
||||
if !errors.Is(err, errBotStopped) {
|
||||
t.Fatalf("getMe returned %v, want errBotStopped", err)
|
||||
}
|
||||
case <-time.After(2 * time.Second):
|
||||
t.Fatal("getMe still blocked 2s after StopBot")
|
||||
}
|
||||
if _, err := b.GetMe(context.Background()); !errors.Is(err, errBotStopped) {
|
||||
t.Fatalf("call after StopBot returned %v, want errBotStopped", err)
|
||||
}
|
||||
select {
|
||||
case <-arrived:
|
||||
t.Fatal("a call after StopBot still went out to Telegram")
|
||||
default:
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user