From 0566b259a1b36cd1013a8dae50d96c91f9b484f2 Mon Sep 17 00:00:00 2001 From: akrike <1625167628@qq.com> Date: Fri, 14 Feb 2025 00:41:52 +0800 Subject: [PATCH] add ws connect timeout config --- config/config.go | 1 + internal/app/api/ws.go | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config/config.go b/config/config.go index f92aa4f..1aebabd 100644 --- a/config/config.go +++ b/config/config.go @@ -20,6 +20,7 @@ type configuration struct { ProcessExpireTime int64 `default:"60" describe:"进程控制权过期时间(秒)"` PerformanceInfoListLength int `default:"30" describe:"性能信息存储长度"` PerformanceInfoInterval int `default:"60" describe:"监控获取间隔时间(秒)"` + TerminalConnectTimeout int `default:"10" describe:"终端连接超时时间(分钟)"` UserPassWordMinLength int `default:"4" describe:"用户密码最小长度"` LogMinLenth int `default:"0" describe:"过滤日志最小长度"` LogHandlerPoolSize int `default:"10" describe:"日志处理并行数"` diff --git a/internal/app/api/ws.go b/internal/app/api/ws.go index 7d0db11..fb4a7b5 100644 --- a/internal/app/api/ws.go +++ b/internal/app/api/ws.go @@ -4,6 +4,7 @@ import ( "context" "time" + "github.com/lzh-1625/go_process_manager/config" "github.com/lzh-1625/go_process_manager/internal/app/constants" "github.com/lzh-1625/go_process_manager/internal/app/logic" "github.com/lzh-1625/go_process_manager/internal/app/middle" @@ -75,7 +76,7 @@ func (w *wsApi) WebsocketHandle(ctx *gin.Context) { select { case <-proc.StopChan: log.Logger.Infow("ws连接断开", "操作类型", "进程已停止,强制断开ws连接") - case <-time.After(time.Minute * 10): + case <-time.After(time.Minute * time.Duration(config.CF.TerminalConnectTimeout)): log.Logger.Infow("ws连接断开", "操作类型", "连接时间超过最大时长限制") case <-wsCtx.Done(): log.Logger.Infow("ws连接断开", "操作类型", "tcp连接建立已被关闭")