Formatting code

This commit is contained in:
wangle 2020-07-27 23:39:01 +08:00
parent 877c2b2b80
commit 147e776afb
3 changed files with 4 additions and 6 deletions

View File

@ -1,7 +1,6 @@
package beegopro package beegopro
import ( import (
"errors"
"github.com/beego/bee/internal/pkg/system" "github.com/beego/bee/internal/pkg/system"
beeLogger "github.com/beego/bee/logger" beeLogger "github.com/beego/bee/logger"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
@ -136,8 +135,7 @@ func (r *RenderFile) Exec(name string) {
var bts []byte var bts []byte
bts, err = format.Source([]byte(buf)) bts, err = format.Source([]byte(buf))
if err != nil { if err != nil {
err = errors.New("format buf error " + err.Error()) beeLogger.Log.Warnf("format buf error %s", err.Error())
return
} }
output = bts output = bts
} }

View File

@ -58,12 +58,12 @@ func (c *RenderFile) write(filename string, buf []byte) (err error) {
return return
} }
output := []byte(buf) var output []byte
if c.Option.EnableFormat && filepath.Ext(filename) == ".go" { if c.Option.EnableFormat && filepath.Ext(filename) == ".go" {
// format code // format code
var bts []byte var bts []byte
bts, err = format.Source([]byte(buf)) bts, err = format.Source(buf)
if err != nil { if err != nil {
err = errors.New("format buf error " + err.Error()) err = errors.New("format buf error " + err.Error())
return return

View File

@ -522,7 +522,7 @@ func goGetBee() {
select { select {
case <-done: case <-done:
return return
case <-time.After(time.Duration(30 * time.Second)): case <-time.After(time.Second * 30):
beeLogger.Log.Warn("Update Bee timeout!!!") beeLogger.Log.Warn("Update Bee timeout!!!")
} }
} }