From 1042c8e560e7717052a69fdbb011a02b8a4958c5 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Wed, 5 Jul 2023 15:29:26 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E9=9B=86=E7=BE=A4=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=20--=20=E7=BD=91=E7=AB=99=E8=AE=BE=E7=BD=AE=E2=80=9D=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E2=80=9C=E5=85=81=E8=AE=B8=E8=AE=B0=E5=BD=95=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E6=97=A5=E5=BF=97=E2=80=9D=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/nodes/http_request_log.go | 5 +++++ internal/nodes/node_tasks.go | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/nodes/http_request_log.go b/internal/nodes/http_request_log.go index 8001583..457bfc8 100644 --- a/internal/nodes/http_request_log.go +++ b/internal/nodes/http_request_log.go @@ -14,6 +14,11 @@ const ( // 日志 func (this *HTTPRequest) log() { + // 检查全局配置 + if this.nodeConfig != nil && this.nodeConfig.GlobalServerConfig != nil && !this.nodeConfig.GlobalServerConfig.HTTPAccessLog.IsOn { + return + } + var ref *serverconfigs.HTTPAccessLogRef if !this.forceLog { if this.disableLog { diff --git a/internal/nodes/node_tasks.go b/internal/nodes/node_tasks.go index 6bf9f9f..7cd0328 100644 --- a/internal/nodes/node_tasks.go +++ b/internal/nodes/node_tasks.go @@ -197,7 +197,7 @@ func (this *Node) execGlobalServerConfigChangedTask(rpcClient *rpc.RPCClient) er return err } if len(resp.GlobalServerConfigJSON) > 0 { - var globalServerConfig = serverconfigs.DefaultGlobalServerConfig() + var globalServerConfig = serverconfigs.NewGlobalServerConfig() err = json.Unmarshal(resp.GlobalServerConfigJSON, globalServerConfig) if err != nil { return errors.New("decode global server config failed: " + err.Error())