diff options
| author | zeripath <art27@cantab.net> | 2021-03-01 21:08:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-01 22:08:10 +0100 |
| commit | f0e15250b9e322cc7731ba026d12387c2b549a42 (patch) | |
| tree | f13d46119077ba924d620ef172b91daa315bda0a /modules/setting/log.go | |
| parent | 59fd641d1fb021e35aea7f9f4a1916cc11ef5c51 (diff) | |
| download | gitea-f0e15250b9e322cc7731ba026d12387c2b549a42.tar.gz gitea-f0e15250b9e322cc7731ba026d12387c2b549a42.zip | |
Migrate to use jsoniter instead of encoding/json (#14841)
* Migrate to use jsoniter
* fix tests
* update gitea.com/go-chi/binding
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: 6543 <6543@obermui.de>
Diffstat (limited to 'modules/setting/log.go')
| -rw-r--r-- | modules/setting/log.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/setting/log.go b/modules/setting/log.go index 9fe2d5bda3..9bbeee27a2 100644 --- a/modules/setting/log.go +++ b/modules/setting/log.go @@ -5,7 +5,6 @@ package setting import ( - "encoding/json" "fmt" golog "log" "os" @@ -15,6 +14,7 @@ import ( "sync" "code.gitea.io/gitea/modules/log" + jsoniter "github.com/json-iterator/go" ini "gopkg.in/ini.v1" ) @@ -205,6 +205,7 @@ func generateLogConfig(sec *ini.Section, name string, defaults defaultLogOptions logConfig["colorize"] = sec.Key("COLORIZE").MustBool(false) + json := jsoniter.ConfigCompatibleWithStandardLibrary byteConfig, err := json.Marshal(logConfig) if err != nil { log.Error("Failed to marshal log configuration: %v %v", logConfig, err) |