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())