summaryrefslogtreecommitdiffstats
path: root/routers/private
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2021-03-01 21:08:10 +0000
committerGitHub <noreply@github.com>2021-03-01 22:08:10 +0100
commitf0e15250b9e322cc7731ba026d12387c2b549a42 (patch)
treef13d46119077ba924d620ef172b91daa315bda0a /routers/private
parent59fd641d1fb021e35aea7f9f4a1916cc11ef5c51 (diff)
downloadgitea-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 'routers/private')
-rw-r--r--routers/private/mail.go3
-rw-r--r--routers/private/manager.go3
2 files changed, 4 insertions, 2 deletions
diff --git a/routers/private/mail.go b/routers/private/mail.go
index 330de14c46..cda442ea04 100644
--- a/routers/private/mail.go
+++ b/routers/private/mail.go
@@ -5,7 +5,6 @@
package private
import (
- "encoding/json"
"fmt"
"net/http"
"strconv"
@@ -16,6 +15,7 @@ import (
"code.gitea.io/gitea/modules/private"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/services/mailer"
+ jsoniter "github.com/json-iterator/go"
)
// SendEmail pushes messages to mail queue
@@ -32,6 +32,7 @@ func SendEmail(ctx *context.PrivateContext) {
var mail private.Email
rd := ctx.Req.Body
defer rd.Close()
+ json := jsoniter.ConfigCompatibleWithStandardLibrary
if err := json.NewDecoder(rd).Decode(&mail); err != nil {
log.Error("%v", err)
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
diff --git a/routers/private/manager.go b/routers/private/manager.go
index e5b4583fd1..192c4947e7 100644
--- a/routers/private/manager.go
+++ b/routers/private/manager.go
@@ -5,7 +5,6 @@
package private
import (
- "encoding/json"
"fmt"
"net/http"
@@ -16,6 +15,7 @@ import (
"code.gitea.io/gitea/modules/queue"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/web"
+ jsoniter "github.com/json-iterator/go"
)
// FlushQueues flushes all the Queues
@@ -130,6 +130,7 @@ func AddLogger(ctx *context.PrivateContext) {
}
bufferLen := setting.Cfg.Section("log").Key("BUFFER_LEN").MustInt64(10000)
+ json := jsoniter.ConfigCompatibleWithStandardLibrary
byteConfig, err := json.Marshal(opts.Config)
if err != nil {
log.Error("Failed to marshal log configuration: %v %v", opts.Config, err)