From 245a26263695cb0a02a0c6c2b3ac98122dc3d66c Mon Sep 17 00:00:00 2001 From: dnomd343 Date: Thu, 18 Aug 2022 11:52:26 +0800 Subject: [PATCH] fix: log configure format --- cmd/proxy/config.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/cmd/proxy/config.go b/cmd/proxy/config.go index d12fd83..6675383 100644 --- a/cmd/proxy/config.go +++ b/cmd/proxy/config.go @@ -37,9 +37,11 @@ var outboundsConfig = `{ }` type logObject struct { - Loglevel string `json:"loglevel"` - Access string `json:"access"` - Error string `json:"error"` + Log struct { + Loglevel string `json:"loglevel"` + Access string `json:"access"` + Error string `json:"error"` + } `json:"log"` } type inboundsObject struct { @@ -67,11 +69,11 @@ func loadLogConfig(logLevel string, logDir string) string { log.Warningf("Unknown log level -> %s", logLevel) logLevel = "warning" // using `warning` as default } - return common.JsonEncode(logObject{ - Loglevel: logLevel, - Access: logDir + "/access.log", - Error: logDir + "/error.log", - }) + logConfig := logObject{} + logConfig.Log.Loglevel = logLevel + logConfig.Log.Access = logDir + "/access.log" + logConfig.Log.Error = logDir + "/error.log" + return common.JsonEncode(logConfig) } func loadHttpConfig(tag string, port int, sniff sniffObject) interface{} {