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 /cmd | |
| 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 'cmd')
| -rw-r--r-- | cmd/dump.go | 3 | ||||
| -rw-r--r-- | cmd/serv.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cmd/dump.go b/cmd/dump.go index 1acc69f1c8..43997c8da8 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -6,7 +6,6 @@ package cmd import ( - "encoding/json" "fmt" "io/ioutil" "os" @@ -22,6 +21,7 @@ import ( "code.gitea.io/gitea/modules/util" "gitea.com/go-chi/session" + jsoniter "github.com/json-iterator/go" archiver "github.com/mholt/archiver/v3" "github.com/urfave/cli" ) @@ -296,6 +296,7 @@ func runDump(ctx *cli.Context) error { var excludes []string if setting.Cfg.Section("session").Key("PROVIDER").Value() == "file" { var opts session.Options + json := jsoniter.ConfigCompatibleWithStandardLibrary if err = json.Unmarshal([]byte(setting.SessionConfig.ProviderConfig), &opts); err != nil { return err } diff --git a/cmd/serv.go b/cmd/serv.go index 1e66cb5111..a8db623e16 100644 --- a/cmd/serv.go +++ b/cmd/serv.go @@ -6,7 +6,6 @@ package cmd import ( - "encoding/json" "fmt" "net/http" "net/url" @@ -25,6 +24,7 @@ import ( "code.gitea.io/gitea/modules/setting" "github.com/dgrijalva/jwt-go" + jsoniter "github.com/json-iterator/go" "github.com/kballard/go-shellquote" "github.com/urfave/cli" ) @@ -255,6 +255,7 @@ func runServ(c *cli.Context) error { } tokenAuthentication.Header["Authorization"] = fmt.Sprintf("Bearer %s", tokenString) + json := jsoniter.ConfigCompatibleWithStandardLibrary enc := json.NewEncoder(os.Stdout) err = enc.Encode(tokenAuthentication) if err != nil { |