diff --git a/admin.go b/admin.go index 715f6b3f..25606501 100644 --- a/admin.go +++ b/admin.go @@ -20,11 +20,10 @@ import ( "fmt" "net/http" "os" + "reflect" "text/template" "time" - "reflect" - "github.com/astaxie/beego/grace" "github.com/astaxie/beego/logs" "github.com/astaxie/beego/toolbox" diff --git a/hooks.go b/hooks.go index c5ec8e2d..b8671d35 100644 --- a/hooks.go +++ b/hooks.go @@ -11,7 +11,7 @@ import ( "github.com/astaxie/beego/session" ) -// +// register MIME type with content type func registerMime() error { for k, v := range mimemaps { mime.AddExtensionType(k, v) diff --git a/router.go b/router.go index 5c78b42c..997b6854 100644 --- a/router.go +++ b/router.go @@ -133,14 +133,15 @@ type ControllerRegister struct { // NewControllerRegister returns a new ControllerRegister. func NewControllerRegister() *ControllerRegister { - cr := &ControllerRegister{ + return &ControllerRegister{ routers: make(map[string]*Tree), policies: make(map[string]*Tree), + pool: sync.Pool{ + New: func() interface{} { + return beecontext.NewContext() + }, + }, } - cr.pool.New = func() interface{} { - return beecontext.NewContext() - } - return cr } // Add controller handler and pattern rules to ControllerRegister. diff --git a/template.go b/template.go index d673a54d..1e654dd8 100644 --- a/template.go +++ b/template.go @@ -361,6 +361,8 @@ type templateFSFunc func() http.FileSystem func defaultFSFunc() http.FileSystem { return FileSystem{} } + +// SetTemplateFSFunc set default filesystem function func SetTemplateFSFunc(fnt templateFSFunc) { beeTemplateFS = fnt }