Unverified Commit d5fd5cad authored by astaxie's avatar astaxie Committed by GitHub

Merge pull request #3417 from xpzouying/update_code_format

better format
parents 42ade6aa fab7c6b6
...@@ -20,11 +20,10 @@ import ( ...@@ -20,11 +20,10 @@ import (
"fmt" "fmt"
"net/http" "net/http"
"os" "os"
"reflect"
"text/template" "text/template"
"time" "time"
"reflect"
"github.com/astaxie/beego/grace" "github.com/astaxie/beego/grace"
"github.com/astaxie/beego/logs" "github.com/astaxie/beego/logs"
"github.com/astaxie/beego/toolbox" "github.com/astaxie/beego/toolbox"
......
...@@ -11,7 +11,7 @@ import ( ...@@ -11,7 +11,7 @@ import (
"github.com/astaxie/beego/session" "github.com/astaxie/beego/session"
) )
// // register MIME type with content type
func registerMime() error { func registerMime() error {
for k, v := range mimemaps { for k, v := range mimemaps {
mime.AddExtensionType(k, v) mime.AddExtensionType(k, v)
......
...@@ -133,14 +133,15 @@ type ControllerRegister struct { ...@@ -133,14 +133,15 @@ type ControllerRegister struct {
// NewControllerRegister returns a new ControllerRegister. // NewControllerRegister returns a new ControllerRegister.
func NewControllerRegister() *ControllerRegister { func NewControllerRegister() *ControllerRegister {
cr := &ControllerRegister{ return &ControllerRegister{
routers: make(map[string]*Tree), routers: make(map[string]*Tree),
policies: 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. // Add controller handler and pattern rules to ControllerRegister.
......
...@@ -361,6 +361,8 @@ type templateFSFunc func() http.FileSystem ...@@ -361,6 +361,8 @@ type templateFSFunc func() http.FileSystem
func defaultFSFunc() http.FileSystem { func defaultFSFunc() http.FileSystem {
return FileSystem{} return FileSystem{}
} }
// SetTemplateFSFunc set default filesystem function
func SetTemplateFSFunc(fnt templateFSFunc) { func SetTemplateFSFunc(fnt templateFSFunc) {
beeTemplateFS = fnt beeTemplateFS = fnt
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment