zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: fix deprecated usages (#1871)

Browse Source 
* add conf documents

* chore: use {} instead of () for environment variables

* chore: fix deprecated usages

* chore: fix unstable tests

* chore: show stack on github actions
This commit is contained in:
Kevin Wan
2022-05-06 15:13:46 +08:00
committed by GitHub
parent 469e62067c
commit d0a59b13a6
4 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/logx/rotatelogger.go
View File

@@ -292,7 +292,7 @@ func compressLogFile(file string) {
start := time.Now() start := time.Now()
Infof("compressing log file: %s", file) Infof("compressing log file: %s", file)
if err := gzipFile(file); err != nil { if err := gzipFile(file); err != nil {
Errorf("compress error: %s", err) ErrorStackf("compress error: %s", err)
} else { } else {
Infof("compressed log file: %s, took %s", file, time.Since(start)) Infof("compressed log file: %s, took %s", file, time.Since(start))
} }

7
core/logx/rotatelogger_test.go
View File

@@ -75,10 +75,7 @@ func TestRotateLoggerMayCompressFileTrue(t *testing.T) {
logger, err := NewLogger(filename, new(DailyRotateRule), true) logger, err := NewLogger(filename, new(DailyRotateRule), true)
assert.Nil(t, err) assert.Nil(t, err)
if len(filename) > 0 { if len(filename) > 0 {
defer func() { defer os.Remove(filepath.Base(logger.getBackupFilename()) + ".gz")
os.Remove(filename)
os.Remove(filepath.Base(logger.getBackupFilename()) + ".gz")
}()
} }
logger.maybeCompressFile(filename) logger.maybeCompressFile(filename)
_, err = os.Stat(filename) _, err = os.Stat(filename)
@@ -92,7 +89,6 @@ func TestRotateLoggerRotate(t *testing.T) {
assert.Nil(t, err) assert.Nil(t, err)
if len(filename) > 0 { if len(filename) > 0 {
defer func() { defer func() {
os.Remove(filename)
os.Remove(logger.getBackupFilename()) os.Remove(logger.getBackupFilename())
os.Remove(filepath.Base(logger.getBackupFilename()) + ".gz") os.Remove(filepath.Base(logger.getBackupFilename()) + ".gz")
}() }()
@@ -115,7 +111,6 @@ func TestRotateLoggerWrite(t *testing.T) {
assert.Nil(t, err) assert.Nil(t, err)
if len(filename) > 0 { if len(filename) > 0 {
defer func() { defer func() {
os.Remove(filename)
os.Remove(logger.getBackupFilename()) os.Remove(logger.getBackupFilename())
os.Remove(filepath.Base(logger.getBackupFilename()) + ".gz") os.Remove(filepath.Base(logger.getBackupFilename()) + ".gz")
}() }()

10
rest/engine_test.go
View File

@@ -146,7 +146,7 @@ Verbose: true
for _, yaml := range yamls { for _, yaml := range yamls {
for _, route := range routes { for _, route := range routes {
var cnf RestConf var cnf RestConf
assert.Nil(t, conf.LoadConfigFromYamlBytes([]byte(yaml), &cnf)) assert.Nil(t, conf.LoadFromYamlBytes([]byte(yaml), &cnf))
ng := newEngine(cnf) ng := newEngine(cnf)
ng.addRoutes(route) ng.addRoutes(route)
ng.use(func(next http.HandlerFunc) http.HandlerFunc { ng.use(func(next http.HandlerFunc) http.HandlerFunc {
@@ -300,15 +300,15 @@ func TestEngine_notFoundHandlerNotNilWriteHeader(t *testing.T) {
type mockedRouter struct{} type mockedRouter struct{}
func (m mockedRouter) ServeHTTP(writer http.ResponseWriter, request *http.Request) { func (m mockedRouter) ServeHTTP(_ http.ResponseWriter, _ *http.Request) {
} }
func (m mockedRouter) Handle(method, path string, handler http.Handler) error { func (m mockedRouter) Handle(_, _ string, _ http.Handler) error {
return errors.New("foo") return errors.New("foo")
} }
func (m mockedRouter) SetNotFoundHandler(handler http.Handler) { func (m mockedRouter) SetNotFoundHandler(_ http.Handler) {
} }
func (m mockedRouter) SetNotAllowedHandler(handler http.Handler) { func (m mockedRouter) SetNotAllowedHandler(_ http.Handler) {
} }

8
rest/server_test.go
View File

@@ -21,7 +21,7 @@ Name: foo
Port: 54321 Port: 54321
` `
var cnf RestConf var cnf RestConf
assert.Nil(t, conf.LoadConfigFromYamlBytes([]byte(configYaml), &cnf)) assert.Nil(t, conf.LoadFromYamlBytes([]byte(configYaml), &cnf))
tests := []struct { tests := []struct {
c RestConf c RestConf
@@ -271,7 +271,7 @@ Name: foo
Port: 54321 Port: 54321
` `
var cnf RestConf var cnf RestConf
assert.Nil(t, conf.LoadConfigFromYamlBytes([]byte(configYaml), &cnf)) assert.Nil(t, conf.LoadFromYamlBytes([]byte(configYaml), &cnf))
testConfig := &tls.Config{ testConfig := &tls.Config{
CipherSuites: []uint16{ CipherSuites: []uint16{
@@ -309,7 +309,7 @@ Name: foo
Port: 54321 Port: 54321
` `
var cnf RestConf var cnf RestConf
assert.Nil(t, conf.LoadConfigFromYamlBytes([]byte(configYaml), &cnf)) assert.Nil(t, conf.LoadFromYamlBytes([]byte(configYaml), &cnf))
rt := router.NewRouter() rt := router.NewRouter()
svr, err := NewServer(cnf, WithRouter(rt)) svr, err := NewServer(cnf, WithRouter(rt))
assert.Nil(t, err) assert.Nil(t, err)
@@ -324,7 +324,7 @@ Name: foo
Port: 54321 Port: 54321
` `
var cnf RestConf var cnf RestConf
assert.Nil(t, conf.LoadConfigFromYamlBytes([]byte(configYaml), &cnf)) assert.Nil(t, conf.LoadFromYamlBytes([]byte(configYaml), &cnf))
rt := router.NewRouter() rt := router.NewRouter()
svr, err := NewServer(cnf, WithRouter(rt)) svr, err := NewServer(cnf, WithRouter(rt))
assert.Nil(t, err) assert.Nil(t, err)