forked from kevadesu/forgejo
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>
This commit is contained in:
parent
59fd641d1f
commit
f0e15250b9
77 changed files with 264 additions and 82 deletions
|
@ -6,9 +6,11 @@
|
|||
package log
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"net"
|
||||
|
||||
jsoniter "github.com/json-iterator/go"
|
||||
)
|
||||
|
||||
type connWriter struct {
|
||||
|
@ -104,9 +106,10 @@ func NewConn() LoggerProvider {
|
|||
// Init inits connection writer with json config.
|
||||
// json config only need key "level".
|
||||
func (log *ConnLogger) Init(jsonconfig string) error {
|
||||
json := jsoniter.ConfigCompatibleWithStandardLibrary
|
||||
err := json.Unmarshal([]byte(jsonconfig), log)
|
||||
if err != nil {
|
||||
return err
|
||||
return fmt.Errorf("Unable to parse JSON: %v", err)
|
||||
}
|
||||
log.NewWriterLogger(&connWriter{
|
||||
ReconnectOnMsg: log.ReconnectOnMsg,
|
||||
|
|
|
@ -98,7 +98,8 @@ func TestConnLoggerBadConfig(t *testing.T) {
|
|||
logger := NewConn()
|
||||
|
||||
err := logger.Init("{")
|
||||
assert.Equal(t, "unexpected end of JSON input", err.Error())
|
||||
assert.Error(t, err)
|
||||
assert.Contains(t, err.Error(), "Unable to parse JSON")
|
||||
logger.Close()
|
||||
}
|
||||
|
||||
|
|
|
@ -6,9 +6,11 @@
|
|||
package log
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
|
||||
jsoniter "github.com/json-iterator/go"
|
||||
)
|
||||
|
||||
// CanColorStdout reports if we can color the Stdout
|
||||
|
@ -50,9 +52,10 @@ func NewConsoleLogger() LoggerProvider {
|
|||
// Init inits connection writer with json config.
|
||||
// json config only need key "level".
|
||||
func (log *ConsoleLogger) Init(config string) error {
|
||||
json := jsoniter.ConfigCompatibleWithStandardLibrary
|
||||
err := json.Unmarshal([]byte(config), log)
|
||||
if err != nil {
|
||||
return err
|
||||
return fmt.Errorf("Unable to parse JSON: %v", err)
|
||||
}
|
||||
if log.Stderr {
|
||||
log.NewWriterLogger(&nopWriteCloser{
|
||||
|
|
|
@ -17,7 +17,8 @@ func TestConsoleLoggerBadConfig(t *testing.T) {
|
|||
logger := NewConsoleLogger()
|
||||
|
||||
err := logger.Init("{")
|
||||
assert.Equal(t, "unexpected end of JSON input", err.Error())
|
||||
assert.Error(t, err)
|
||||
assert.Contains(t, err.Error(), "Unable to parse JSON")
|
||||
logger.Close()
|
||||
}
|
||||
|
||||
|
|
|
@ -7,7 +7,6 @@ package log
|
|||
import (
|
||||
"bufio"
|
||||
"compress/gzip"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
|
@ -17,6 +16,7 @@ import (
|
|||
"time"
|
||||
|
||||
"code.gitea.io/gitea/modules/util"
|
||||
jsoniter "github.com/json-iterator/go"
|
||||
)
|
||||
|
||||
// FileLogger implements LoggerProvider.
|
||||
|
@ -101,8 +101,9 @@ func NewFileLogger() LoggerProvider {
|
|||
// "rotate":true
|
||||
// }
|
||||
func (log *FileLogger) Init(config string) error {
|
||||
json := jsoniter.ConfigCompatibleWithStandardLibrary
|
||||
if err := json.Unmarshal([]byte(config), log); err != nil {
|
||||
return err
|
||||
return fmt.Errorf("Unable to parse JSON: %v", err)
|
||||
}
|
||||
if len(log.Filename) == 0 {
|
||||
return errors.New("config must have filename")
|
||||
|
|
|
@ -6,10 +6,11 @@ package log
|
|||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
jsoniter "github.com/json-iterator/go"
|
||||
)
|
||||
|
||||
// Level is the level of the logger
|
||||
|
@ -103,6 +104,7 @@ func FromString(level string) Level {
|
|||
// UnmarshalJSON takes text and turns it into a Level
|
||||
func (l *Level) UnmarshalJSON(b []byte) error {
|
||||
var tmp interface{}
|
||||
json := jsoniter.ConfigCompatibleWithStandardLibrary
|
||||
err := json.Unmarshal(b, &tmp)
|
||||
if err != nil {
|
||||
fmt.Fprintf(os.Stderr, "Err: %v", err)
|
||||
|
|
|
@ -5,10 +5,10 @@
|
|||
package log
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
jsoniter "github.com/json-iterator/go"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
|
@ -17,6 +17,7 @@ type testLevel struct {
|
|||
}
|
||||
|
||||
func TestLevelMarshalUnmarshalJSON(t *testing.T) {
|
||||
json := jsoniter.ConfigCompatibleWithStandardLibrary
|
||||
levelBytes, err := json.Marshal(testLevel{
|
||||
Level: INFO,
|
||||
})
|
||||
|
|
|
@ -6,9 +6,11 @@
|
|||
package log
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/smtp"
|
||||
"strings"
|
||||
|
||||
jsoniter "github.com/json-iterator/go"
|
||||
)
|
||||
|
||||
type smtpWriter struct {
|
||||
|
@ -55,9 +57,10 @@ func NewSMTPLogger() LoggerProvider {
|
|||
// "level":LevelError
|
||||
// }
|
||||
func (log *SMTPLogger) Init(jsonconfig string) error {
|
||||
json := jsoniter.ConfigCompatibleWithStandardLibrary
|
||||
err := json.Unmarshal([]byte(jsonconfig), log)
|
||||
if err != nil {
|
||||
return err
|
||||
return fmt.Errorf("Unable to parse JSON: %v", err)
|
||||
}
|
||||
log.NewWriterLogger(&smtpWriter{
|
||||
owner: log,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue