From 647e6ae1c42fade1283a095ac9298919785cb6c6 Mon Sep 17 00:00:00 2001 From: Lei Cao Date: Mon, 24 Nov 2014 23:21:03 +0800 Subject: [PATCH 001/436] Added JWT plugin --- plugins/jwt/jwt.go | 135 +++++++++++++++++++++++++++++++++++ plugins/jwt/jwt_test.go | 88 +++++++++++++++++++++++ plugins/jwt/test/jwt.rsa | 15 ++++ plugins/jwt/test/jwt.rsa.pub | 6 ++ 4 files changed, 244 insertions(+) create mode 100644 plugins/jwt/jwt.go create mode 100644 plugins/jwt/jwt_test.go create mode 100644 plugins/jwt/test/jwt.rsa create mode 100644 plugins/jwt/test/jwt.rsa.pub diff --git a/plugins/jwt/jwt.go b/plugins/jwt/jwt.go new file mode 100644 index 00000000..fd064686 --- /dev/null +++ b/plugins/jwt/jwt.go @@ -0,0 +1,135 @@ +// Copyright 2014 beego Author. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Package jwt provides JWT (Json Web Token) authentication +// +// Usage +// In file main.go +// +// import ( +// "github.com/astaxie/beego" +// "github.com/astaxie/beego/plugins/jwt" +// ) +// +// func main() { +// // JWT for Url matching /v1/* +// // PrivateKeyPath: The path for the private RSA key used by JWT +// // PublicKeyPath: The path for the public RSA key used by JWT +// // The list of Urls should be excluded from the JWT Auth +// beego.InsertFilter("/v1/*", beego.BeforeRouter, jwt.AuthRequest(&jwt.Options{ +// PrivateKeyPath: "conf/beeblog.rsa", +// PublicKeyPath: "conf/beeblog.rsa.pub", +// WhiteList: []string{"/v1/jwt/issue-token", "/docs"}, +// })) +// beego.Run() +// } +// +// In file routers/router.go +// +// import ( +// "github.com/astaxie/beego" +// "github.com/astaxie/beego/plugins/jwt" +// ) +// func init() { +// ns := beego.NSNamespace("/jwt", +// beego.NSInclude( +// &jwt.JwtController{}, +// ), +// ) +// beego.AddNamespace(ns) +// } +// + +package jwt + +import ( + "github.com/astaxie/beego" + "github.com/astaxie/beego/context" + "github.com/astaxie/beego/logs" + goJwt "github.com/dgrijalva/jwt-go" + "io/ioutil" + "net/http" + "time" +) + +// Options for the JWT Auth +type Options struct { + PrivateKeyPath string + PublicKeyPath string + WhiteList []string +} + +var RSAKeys struct { + PrivateKey []byte + PublicKey []byte +} + +func AuthRequest(o *Options) beego.FilterFunc { + RSAKeys.PrivateKey, _ = ioutil.ReadFile(o.PrivateKeyPath) + RSAKeys.PublicKey, _ = ioutil.ReadFile(o.PublicKeyPath) + + return func(ctx *context.Context) { + // :TODO the url patterns should be considered here. + // Shouldn't only use the string equal + for _, method := range o.WhiteList { + if method == ctx.Request.URL.Path { + return + } + } + + parsedToken, err := goJwt.ParseFromRequest(ctx.Request, func(t *goJwt.Token) (interface{}, error) { + return RSAKeys.PublicKey, nil + }) + + if err == nil && parsedToken.Valid { + ctx.Output.SetStatus(http.StatusOK) + } else { + ctx.Output.SetStatus(http.StatusUnauthorized) + } + + } +} + +// oprations for Jwt +type JwtController struct { + beego.Controller +} + +func (this *JwtController) URLMapping() { + this.Mapping("IssueToken", this.IssueToken) +} + +// @Title IssueToken +// @Description Issue a Json Web Token +// @Success 200 string +// @Failure 403 no privilege to access +// @Failure 500 server inner error +// @router /issue-token [get] +func (this *JwtController) IssueToken() { + this.Data["json"] = CreateToken() + this.ServeJson() +} + +func CreateToken() map[string]string { + log := logs.NewLogger(10000) + log.SetLogger("console", "") + + token := goJwt.New(goJwt.GetSigningMethod("RS256")) // Create a Token that will be signed with RSA 256. + token.Claims["ID"] = "This is my super fake ID" + token.Claims["exp"] = time.Now().Unix() + 36000 + // The claims object allows you to store information in the actual token. + tokenString, _ := token.SignedString(RSAKeys.PrivateKey) + // tokenString Contains the actual token you should share with your client. + return map[string]string{"token": tokenString} +} diff --git a/plugins/jwt/jwt_test.go b/plugins/jwt/jwt_test.go new file mode 100644 index 00000000..dd8cafe7 --- /dev/null +++ b/plugins/jwt/jwt_test.go @@ -0,0 +1,88 @@ +package jwt + +import ( + "github.com/astaxie/beego" + "net/http" + "net/http/httptest" + "testing" +) + +func testRequest(method, path string) (*httptest.ResponseRecorder, *http.Request) { + request, _ := http.NewRequest(method, path, nil) + recorder := httptest.NewRecorder() + + return recorder, request +} + +func Test_IssueTokenAction(t *testing.T) { + url := "/v1/jwt/issue-token" + + mux := beego.NewControllerRegister() + + mux.InsertFilter("*", beego.BeforeRouter, AuthRequest(&Options{ + PrivateKeyPath: "test/jwt.rsa", + PublicKeyPath: "test/jwt.rsa.pub", + WhiteList: []string{"/v1/jwt/issue-token", "/docs"}, + })) + + mux.Add("/v1/jwt/issue-token", &JwtController{}, "get:IssueToken") + + rw, r := testRequest("GET", url) + mux.ServeHTTP(rw, r) + + if rw.Code != http.StatusOK { + t.Errorf("Shoud return 200") + } +} + +func (tc *JwtController) Foo() { + tc.Ctx.Output.Body([]byte("ok")) +} + +func Test_AuthRequestWithAuthorizationHeader(t *testing.T) { + + url := "/foo" + + mux := beego.NewControllerRegister() + + mux.InsertFilter("*", beego.BeforeRouter, AuthRequest(&Options{ + PrivateKeyPath: "test/jwt.rsa", + PublicKeyPath: "test/jwt.rsa.pub", + WhiteList: []string{"/v1/jwt/issue-token", "/docs"}, + })) + + mux.Add("/foo", &JwtController{}, "get:Foo") + newToken := CreateToken() + + rw, r := testRequest("GET", url) + r.Header.Add("Authorization", "Bearer "+newToken["token"]) + mux.ServeHTTP(rw, r) + + if rw.Code != http.StatusOK { + t.Errorf("Shoud return 200") + } + if rw.Body.String() != "ok" { + t.Errorf("Should output ok") + } +} + +func Test_AuthRequestWithoutAuthorizationHeader(t *testing.T) { + url := "/foo" + + mux := beego.NewControllerRegister() + + mux.InsertFilter("*", beego.BeforeRouter, AuthRequest(&Options{ + PrivateKeyPath: "test/jwt.rsa", + PublicKeyPath: "test/jwt.rsa.pub", + WhiteList: []string{"/v1/jwt/issue-token", "/docs"}, + })) + + mux.Add("/foo", &JwtController{}, "get:Foo") + + rw, r := testRequest("GET", url) + mux.ServeHTTP(rw, r) + + if rw.Code != http.StatusUnauthorized { + t.Errorf("Shoud return 401") + } +} diff --git a/plugins/jwt/test/jwt.rsa b/plugins/jwt/test/jwt.rsa new file mode 100644 index 00000000..8d584fc6 --- /dev/null +++ b/plugins/jwt/test/jwt.rsa @@ -0,0 +1,15 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICWwIBAAKBgQCdu+23Y/0J/FTQKnIPnxupoOo9/OYCv90DPXN/KLLRAMjYzgcC +DsBST2xVR5jlimI/gyfCpVB62dwpSzzr0cA3MoDhbaGWuTdQUX9zmiLoQ4I7X6h0 +dwyiihOz+CzOMlAg5+qBhiTGcKvIFlfEc1FUcn/tB3PVRG9j6B1Ibz5CnQIDAQAB +AoGAFGg+/i4ai9MwqeoD7c95Bb5C8BgrLgnir0uhCL+cOvwuABbPw01jRoLuEi58 +Mp5vzaXLXByFSA+ts03/qMbvZkDGac5g5kLli5TjHIONMxVBrdfGQ1+OApnaPayN +N+HYjZKs6xao6J5iFqfA0FqzDR9kQhUoeosdQoo1GlxDckECQQDO/0LJrFiLzYWe +qS/DxfAnFu2BlClKZjxRJ3vIkRRaON6HPl8BeJW901bFKG5+WSfO+OwQ9egWaf3X +fFm/oEHRAkEAwxMor4fOkBZbL4KPW7sen169vwnXuYusqj0t3dIeiIVrCigkOMT4 +OvX/63u4CTdXh1D5u/4Z/1HTYH92VCP7DQJAJPxbNKnE0IYSf/z++d4eQP3JxkNw +9Ug7Msz5QycZGd3bdRLh6uNe7iIa+PN2esD3afX0SDuIEqkxoBUp/CFoYQJAUmi3 +mV+/7bLkFrALK+9iwmTdt+TKk4HkEY8C32CysW3biFDo7GqZix79XFfJqWsNuQaG +WdrA1NGWgH+YV3dTyQJAIWEZGAuUXRkQB20LfjGzpsKgQFbqjTisMS0qe3JjnDwu +0JR8sYXapgeEEEisH+OtkZKIfyeFOwoUyNC83bcvgw== +-----END RSA PRIVATE KEY----- diff --git a/plugins/jwt/test/jwt.rsa.pub b/plugins/jwt/test/jwt.rsa.pub new file mode 100644 index 00000000..3fdd8ce7 --- /dev/null +++ b/plugins/jwt/test/jwt.rsa.pub @@ -0,0 +1,6 @@ +-----BEGIN PUBLIC KEY----- +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdu+23Y/0J/FTQKnIPnxupoOo9 +/OYCv90DPXN/KLLRAMjYzgcCDsBST2xVR5jlimI/gyfCpVB62dwpSzzr0cA3MoDh +baGWuTdQUX9zmiLoQ4I7X6h0dwyiihOz+CzOMlAg5+qBhiTGcKvIFlfEc1FUcn/t +B3PVRG9j6B1Ibz5CnQIDAQAB +-----END PUBLIC KEY----- From 223f57bb4cfe27d844c565d248ba99881766dec5 Mon Sep 17 00:00:00 2001 From: Hubery Date: Fri, 6 Mar 2015 14:12:24 +0800 Subject: [PATCH 002/436] add JsonBody --- httplib/httplib.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/httplib/httplib.go b/httplib/httplib.go index 7ff2f1d2..bd8bc776 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -253,6 +253,22 @@ func (b *BeegoHttpRequest) Body(data interface{}) *BeegoHttpRequest { return b } + +// JsonBody adds request raw body encoding by JSON. +func (b *BeegoHttpRequest) JsonBody(obj interface{}) (*BeegoHttpRequest, error) { + if b.req.Body == nil && obj != nil { + buf := bytes.NewBuffer(nil) + enc := json.NewEncoder(buf) + if err := enc.Encode(obj); err != nil { + return b, err + } + b.req.Body = ioutil.NopCloser(buf) + b.req.ContentLength = int64(buf.Len()) + b.req.Header.Set("Content-Type", "application/json") + } + return b, nil +} + func (b *BeegoHttpRequest) buildUrl(paramBody string) { // build GET url with query string if b.req.Method == "GET" && len(paramBody) > 0 { From 2d26f7df2f44e8df1de5dbf20468c0caa6c1dea7 Mon Sep 17 00:00:00 2001 From: supiyun Date: Mon, 16 Mar 2015 17:40:55 +0800 Subject: [PATCH 003/436] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81reload?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当页面放置一段时间，验证码将从缓存中失效。当用户再来刷新验证码将出现验证码404。对于reload操作应该直接生成验证码。 --- utils/captcha/captcha.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/utils/captcha/captcha.go b/utils/captcha/captcha.go index 62adc81d..14c6c3b3 100644 --- a/utils/captcha/captcha.go +++ b/utils/captcha/captcha.go @@ -132,15 +132,6 @@ func (c *Captcha) Handler(ctx *context.Context) { key := c.key(id) - if v, ok := c.store.Get(key).([]byte); ok { - chars = v - } else { - ctx.Output.SetStatus(404) - ctx.WriteString("captcha not found") - return - } - - // reload captcha if len(ctx.Input.Query("reload")) > 0 { chars = c.genRandChars() if err := c.store.Put(key, chars, c.Expiration); err != nil { @@ -149,6 +140,14 @@ func (c *Captcha) Handler(ctx *context.Context) { beego.Error("Reload Create Captcha Error:", err) return } + } else { + if v, ok := c.store.Get(key).([]byte); ok { + chars = v + } else { + ctx.Output.SetStatus(404) + ctx.WriteString("captcha not found") + return + } } img := NewImage(chars, c.StdWidth, c.StdHeight) From 8aa9455900261b9123d65c88de8afb80915c1499 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 19 Mar 2015 22:29:01 -0700 Subject: [PATCH 004/436] gofmt -s & go_vet --- cache/memory.go | 2 +- orm/db.go | 12 +- orm/models_test.go | 8 +- orm/orm_raw.go | 4 +- orm/orm_test.go | 32 +-- orm/utils.go | 4 +- router.go | 6 +- session/memcache/sess_memcache.go | 1 - session/sess_mem.go | 398 +++++++++++++++--------------- utils/mail.go | 2 +- utils/pagination/paginator.go | 6 +- utils/slice.go | 2 +- validation/util.go | 2 +- 13 files changed, 239 insertions(+), 240 deletions(-) diff --git a/cache/memory.go b/cache/memory.go index b90d227c..0233be7d 100644 --- a/cache/memory.go +++ b/cache/memory.go @@ -202,7 +202,7 @@ func (bc *MemoryCache) vaccuum() { if bc.items == nil { return } - for name, _ := range bc.items { + for name := range bc.items { bc.item_expired(name) } } diff --git a/orm/db.go b/orm/db.go index 10f65fee..060d83bc 100644 --- a/orm/db.go +++ b/orm/db.go @@ -324,7 +324,7 @@ func (d *dbBase) Read(q dbQuerier, mi *modelInfo, ind reflect.Value, tz *time.Lo query := fmt.Sprintf("SELECT %s%s%s FROM %s%s%s WHERE %s%s%s = ?", Q, sels, Q, Q, mi.table, Q, Q, wheres, Q) refs := make([]interface{}, colsNum) - for i, _ := range refs { + for i := range refs { var ref interface{} refs[i] = &ref } @@ -423,7 +423,7 @@ func (d *dbBase) InsertValue(q dbQuerier, mi *modelInfo, isMulti bool, names []s Q := d.ins.TableQuote() marks := make([]string, len(names)) - for i, _ := range marks { + for i := range marks { marks[i] = "?" } @@ -693,7 +693,7 @@ func (d *dbBase) DeleteBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Con } marks := make([]string, len(args)) - for i, _ := range marks { + for i := range marks { marks[i] = "?" } sql := fmt.Sprintf("IN (%s)", strings.Join(marks, ", ")) @@ -824,7 +824,7 @@ func (d *dbBase) ReadBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condi } refs := make([]interface{}, colsNum) - for i, _ := range refs { + for i := range refs { var ref interface{} refs[i] = &ref } @@ -964,7 +964,7 @@ func (d *dbBase) GenerateOperatorSql(mi *modelInfo, fi *fieldInfo, operator stri switch operator { case "in": marks := make([]string, len(params)) - for i, _ := range marks { + for i := range marks { marks[i] = "?" } sql = fmt.Sprintf("IN (%s)", strings.Join(marks, ", ")) @@ -1460,7 +1460,7 @@ func (d *dbBase) ReadValues(q dbQuerier, qs *querySet, mi *modelInfo, cond *Cond } refs := make([]interface{}, len(cols)) - for i, _ := range refs { + for i := range refs { var ref interface{} refs[i] = &ref } diff --git a/orm/models_test.go b/orm/models_test.go index 1a92ef5d..6ca9590c 100644 --- a/orm/models_test.go +++ b/orm/models_test.go @@ -242,14 +242,14 @@ type User struct { func (u *User) TableIndex() [][]string { return [][]string{ - []string{"Id", "UserName"}, - []string{"Id", "Created"}, + {"Id", "UserName"}, + {"Id", "Created"}, } } func (u *User) TableUnique() [][]string { return [][]string{ - []string{"UserName", "Email"}, + {"UserName", "Email"}, } } @@ -287,7 +287,7 @@ type Post struct { func (u *Post) TableIndex() [][]string { return [][]string{ - []string{"Id", "Created"}, + {"Id", "Created"}, } } diff --git a/orm/orm_raw.go b/orm/orm_raw.go index 1393d414..1452d6fc 100644 --- a/orm/orm_raw.go +++ b/orm/orm_raw.go @@ -585,7 +585,7 @@ func (o *rawSet) readValues(container interface{}, needCols []string) (int64, er cols = columns refs = make([]interface{}, len(cols)) - for i, _ := range refs { + for i := range refs { var ref sql.NullString refs[i] = &ref @@ -711,7 +711,7 @@ func (o *rawSet) queryRowsTo(container interface{}, keyCol, valueCol string) (in } else { cols = columns refs = make([]interface{}, len(cols)) - for i, _ := range refs { + for i := range refs { if keyCol == cols[i] { keyIndex = i } diff --git a/orm/orm_test.go b/orm/orm_test.go index e1c8e0f0..14eadabd 100644 --- a/orm/orm_test.go +++ b/orm/orm_test.go @@ -586,29 +586,29 @@ func TestInsertTestData(t *testing.T) { throwFail(t, AssertIs(id, 4)) tags := []*Tag{ - &Tag{Name: "golang", BestPost: &Post{Id: 2}}, - &Tag{Name: "example"}, - &Tag{Name: "format"}, - &Tag{Name: "c++"}, + {Name: "golang", BestPost: &Post{Id: 2}}, + {Name: "example"}, + {Name: "format"}, + {Name: "c++"}, } posts := []*Post{ - &Post{User: users[0], Tags: []*Tag{tags[0]}, Title: "Introduction", Content: `Go is a new language. Although it borrows ideas from existing languages, it has unusual properties that make effective Go programs different in character from programs written in its relatives. A straightforward translation of a C++ or Java program into Go is unlikely to produce a satisfactory result—Java programs are written in Java, not Go. On the other hand, thinking about the problem from a Go perspective could produce a successful but quite different program. In other words, to write Go well, it's important to understand its properties and idioms. It's also important to know the established conventions for programming in Go, such as naming, formatting, program construction, and so on, so that programs you write will be easy for other Go programmers to understand. + {User: users[0], Tags: []*Tag{tags[0]}, Title: "Introduction", Content: `Go is a new language. Although it borrows ideas from existing languages, it has unusual properties that make effective Go programs different in character from programs written in its relatives. A straightforward translation of a C++ or Java program into Go is unlikely to produce a satisfactory result—Java programs are written in Java, not Go. On the other hand, thinking about the problem from a Go perspective could produce a successful but quite different program. In other words, to write Go well, it's important to understand its properties and idioms. It's also important to know the established conventions for programming in Go, such as naming, formatting, program construction, and so on, so that programs you write will be easy for other Go programmers to understand. This document gives tips for writing clear, idiomatic Go code. It augments the language specification, the Tour of Go, and How to Write Go Code, all of which you should read first.`}, - &Post{User: users[1], Tags: []*Tag{tags[0], tags[1]}, Title: "Examples", Content: `The Go package sources are intended to serve not only as the core library but also as examples of how to use the language. Moreover, many of the packages contain working, self-contained executable examples you can run directly from the golang.org web site, such as this one (click on the word "Example" to open it up). If you have a question about how to approach a problem or how something might be implemented, the documentation, code and examples in the library can provide answers, ideas and background.`}, - &Post{User: users[1], Tags: []*Tag{tags[0], tags[2]}, Title: "Formatting", Content: `Formatting issues are the most contentious but the least consequential. People can adapt to different formatting styles but it's better if they don't have to, and less time is devoted to the topic if everyone adheres to the same style. The problem is how to approach this Utopia without a long prescriptive style guide. + {User: users[1], Tags: []*Tag{tags[0], tags[1]}, Title: "Examples", Content: `The Go package sources are intended to serve not only as the core library but also as examples of how to use the language. Moreover, many of the packages contain working, self-contained executable examples you can run directly from the golang.org web site, such as this one (click on the word "Example" to open it up). If you have a question about how to approach a problem or how something might be implemented, the documentation, code and examples in the library can provide answers, ideas and background.`}, + {User: users[1], Tags: []*Tag{tags[0], tags[2]}, Title: "Formatting", Content: `Formatting issues are the most contentious but the least consequential. People can adapt to different formatting styles but it's better if they don't have to, and less time is devoted to the topic if everyone adheres to the same style. The problem is how to approach this Utopia without a long prescriptive style guide. With Go we take an unusual approach and let the machine take care of most formatting issues. The gofmt program (also available as go fmt, which operates at the package level rather than source file level) reads a Go program and emits the source in a standard style of indentation and vertical alignment, retaining and if necessary reformatting comments. If you want to know how to handle some new layout situation, run gofmt; if the answer doesn't seem right, rearrange your program (or file a bug about gofmt), don't work around it.`}, - &Post{User: users[2], Tags: []*Tag{tags[3]}, Title: "Commentary", Content: `Go provides C-style /* */ block comments and C++-style // line comments. Line comments are the norm; block comments appear mostly as package comments, but are useful within an expression or to disable large swaths of code. + {User: users[2], Tags: []*Tag{tags[3]}, Title: "Commentary", Content: `Go provides C-style /* */ block comments and C++-style // line comments. Line comments are the norm; block comments appear mostly as package comments, but are useful within an expression or to disable large swaths of code. The program—and web server—godoc processes Go source files to extract documentation about the contents of the package. Comments that appear before top-level declarations, with no intervening newlines, are extracted along with the declaration to serve as explanatory text for the item. The nature and style of these comments determines the quality of the documentation godoc produces.`}, } comments := []*Comment{ - &Comment{Post: posts[0], Content: "a comment"}, - &Comment{Post: posts[1], Content: "yes"}, - &Comment{Post: posts[1]}, - &Comment{Post: posts[1]}, - &Comment{Post: posts[2]}, - &Comment{Post: posts[2]}, + {Post: posts[0], Content: "a comment"}, + {Post: posts[1], Content: "yes"}, + {Post: posts[1]}, + {Post: posts[1]}, + {Post: posts[2]}, + {Post: posts[2]}, } for _, tag := range tags { @@ -1248,7 +1248,7 @@ func TestQueryM2M(t *testing.T) { post := Post{Id: 4} m2m := dORM.QueryM2M(&post, "Tags") - tag1 := []*Tag{&Tag{Name: "TestTag1"}, &Tag{Name: "TestTag2"}} + tag1 := []*Tag{{Name: "TestTag1"}, {Name: "TestTag2"}} tag2 := &Tag{Name: "TestTag3"} tag3 := []interface{}{&Tag{Name: "TestTag4"}} @@ -1311,7 +1311,7 @@ func TestQueryM2M(t *testing.T) { m2m = dORM.QueryM2M(&tag, "Posts") - post1 := []*Post{&Post{Title: "TestPost1"}, &Post{Title: "TestPost2"}} + post1 := []*Post{{Title: "TestPost1"}, {Title: "TestPost2"}} post2 := &Post{Title: "TestPost3"} post3 := []interface{}{&Post{Title: "TestPost4"}} diff --git a/orm/utils.go b/orm/utils.go index df6147c1..88168763 100644 --- a/orm/utils.go +++ b/orm/utils.go @@ -195,7 +195,7 @@ func snakeString(s string) string { } data = append(data, d) } - return strings.ToLower(string(data[:len(data)])) + return strings.ToLower(string(data[:])) } // camel string, xx_yy to XxYy @@ -220,7 +220,7 @@ func camelString(s string) string { } data = append(data, d) } - return string(data[:len(data)]) + return string(data[:]) } type argString []string diff --git a/router.go b/router.go index b9d649a2..c1bda637 100644 --- a/router.go +++ b/router.go @@ -88,7 +88,7 @@ func (l *logFilter) Filter(ctx *beecontext.Context) bool { if requestPath == "/favicon.ico" || requestPath == "/robots.txt" { return true } - for prefix, _ := range StaticDir { + for prefix := range StaticDir { if strings.HasPrefix(requestPath, prefix) { return true } @@ -171,7 +171,7 @@ func (p *ControllerRegistor) Add(pattern string, c ControllerInterface, mappingM p.addToRouter(m, pattern, route) } } else { - for k, _ := range methods { + for k := range methods { if k == "*" { for _, m := range HTTPMETHOD { p.addToRouter(m, pattern, route) @@ -332,7 +332,7 @@ func (p *ControllerRegistor) AddMethod(method, pattern string, f FilterFunc) { methods[strings.ToUpper(method)] = strings.ToUpper(method) } route.methods = methods - for k, _ := range methods { + for k := range methods { if k == "*" { for _, m := range HTTPMETHOD { p.addToRouter(m, pattern, route) diff --git a/session/memcache/sess_memcache.go b/session/memcache/sess_memcache.go index 5827a0a9..24aecb82 100644 --- a/session/memcache/sess_memcache.go +++ b/session/memcache/sess_memcache.go @@ -179,7 +179,6 @@ func (rp *MemProvider) SessionRegenerate(oldsid, sid string) (session.SessionSto } else { client.Delete(oldsid) item.Key = sid - item.Value = item.Value item.Expiration = int32(rp.maxlifetime) client.Set(item) contain = item.Value diff --git a/session/sess_mem.go b/session/sess_mem.go index 627a3246..dd066703 100644 --- a/session/sess_mem.go +++ b/session/sess_mem.go @@ -1,199 +1,199 @@ -// Copyright 2014 beego Author. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package session - -import ( - "container/list" - "net/http" - "sync" - "time" -) - -var mempder = &MemProvider{list: list.New(), sessions: make(map[string]*list.Element)} - -// memory session store. -// it saved sessions in a map in memory. -type MemSessionStore struct { - sid string //session id - timeAccessed time.Time //last access time - value map[interface{}]interface{} //session store - lock sync.RWMutex -} - -// set value to memory session -func (st *MemSessionStore) Set(key, value interface{}) error { - st.lock.Lock() - defer st.lock.Unlock() - st.value[key] = value - return nil -} - -// get value from memory session by key -func (st *MemSessionStore) Get(key interface{}) interface{} { - st.lock.RLock() - defer st.lock.RUnlock() - if v, ok := st.value[key]; ok { - return v - } else { - return nil - } -} - -// delete in memory session by key -func (st *MemSessionStore) Delete(key interface{}) error { - st.lock.Lock() - defer st.lock.Unlock() - delete(st.value, key) - return nil -} - -// clear all values in memory session -func (st *MemSessionStore) Flush() error { - st.lock.Lock() - defer st.lock.Unlock() - st.value = make(map[interface{}]interface{}) - return nil -} - -// get this id of memory session store -func (st *MemSessionStore) SessionID() string { - return st.sid -} - -// Implement method, no used. -func (st *MemSessionStore) SessionRelease(w http.ResponseWriter) { -} - -type MemProvider struct { - lock sync.RWMutex // locker - sessions map[string]*list.Element // map in memory - list *list.List // for gc - maxlifetime int64 - savePath string -} - -// init memory session -func (pder *MemProvider) SessionInit(maxlifetime int64, savePath string) error { - pder.maxlifetime = maxlifetime - pder.savePath = savePath - return nil -} - -// get memory session store by sid -func (pder *MemProvider) SessionRead(sid string) (SessionStore, error) { - pder.lock.RLock() - if element, ok := pder.sessions[sid]; ok { - go pder.SessionUpdate(sid) - pder.lock.RUnlock() - return element.Value.(*MemSessionStore), nil - } else { - pder.lock.RUnlock() - pder.lock.Lock() - newsess := &MemSessionStore{sid: sid, timeAccessed: time.Now(), value: make(map[interface{}]interface{})} - element := pder.list.PushBack(newsess) - pder.sessions[sid] = element - pder.lock.Unlock() - return newsess, nil - } -} - -// check session store exist in memory session by sid -func (pder *MemProvider) SessionExist(sid string) bool { - pder.lock.RLock() - defer pder.lock.RUnlock() - if _, ok := pder.sessions[sid]; ok { - return true - } else { - return false - } -} - -// generate new sid for session store in memory session -func (pder *MemProvider) SessionRegenerate(oldsid, sid string) (SessionStore, error) { - pder.lock.RLock() - if element, ok := pder.sessions[oldsid]; ok { - go pder.SessionUpdate(oldsid) - pder.lock.RUnlock() - pder.lock.Lock() - element.Value.(*MemSessionStore).sid = sid - pder.sessions[sid] = element - delete(pder.sessions, oldsid) - pder.lock.Unlock() - return element.Value.(*MemSessionStore), nil - } else { - pder.lock.RUnlock() - pder.lock.Lock() - newsess := &MemSessionStore{sid: sid, timeAccessed: time.Now(), value: make(map[interface{}]interface{})} - element := pder.list.PushBack(newsess) - pder.sessions[sid] = element - pder.lock.Unlock() - return newsess, nil - } -} - -// delete session store in memory session by id -func (pder *MemProvider) SessionDestroy(sid string) error { - pder.lock.Lock() - defer pder.lock.Unlock() - if element, ok := pder.sessions[sid]; ok { - delete(pder.sessions, sid) - pder.list.Remove(element) - return nil - } - return nil -} - -// clean expired session stores in memory session -func (pder *MemProvider) SessionGC() { - pder.lock.RLock() - for { - element := pder.list.Back() - if element == nil { - break - } - if (element.Value.(*MemSessionStore).timeAccessed.Unix() + pder.maxlifetime) < time.Now().Unix() { - pder.lock.RUnlock() - pder.lock.Lock() - pder.list.Remove(element) - delete(pder.sessions, element.Value.(*MemSessionStore).sid) - pder.lock.Unlock() - pder.lock.RLock() - } else { - break - } - } - pder.lock.RUnlock() -} - -// get count number of memory session -func (pder *MemProvider) SessionAll() int { - return pder.list.Len() -} - -// expand time of session store by id in memory session -func (pder *MemProvider) SessionUpdate(sid string) error { - pder.lock.Lock() - defer pder.lock.Unlock() - if element, ok := pder.sessions[sid]; ok { - element.Value.(*MemSessionStore).timeAccessed = time.Now() - pder.list.MoveToFront(element) - return nil - } - return nil -} - -func init() { - Register("memory", mempder) -} +// Copyright 2014 beego Author. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package session + +import ( + "container/list" + "net/http" + "sync" + "time" +) + +var mempder = &MemProvider{list: list.New(), sessions: make(map[string]*list.Element)} + +// memory session store. +// it saved sessions in a map in memory. +type MemSessionStore struct { + sid string //session id + timeAccessed time.Time //last access time + value map[interface{}]interface{} //session store + lock sync.RWMutex +} + +// set value to memory session +func (st *MemSessionStore) Set(key, value interface{}) error { + st.lock.Lock() + defer st.lock.Unlock() + st.value[key] = value + return nil +} + +// get value from memory session by key +func (st *MemSessionStore) Get(key interface{}) interface{} { + st.lock.RLock() + defer st.lock.RUnlock() + if v, ok := st.value[key]; ok { + return v + } else { + return nil + } +} + +// delete in memory session by key +func (st *MemSessionStore) Delete(key interface{}) error { + st.lock.Lock() + defer st.lock.Unlock() + delete(st.value, key) + return nil +} + +// clear all values in memory session +func (st *MemSessionStore) Flush() error { + st.lock.Lock() + defer st.lock.Unlock() + st.value = make(map[interface{}]interface{}) + return nil +} + +// get this id of memory session store +func (st *MemSessionStore) SessionID() string { + return st.sid +} + +// Implement method, no used. +func (st *MemSessionStore) SessionRelease(w http.ResponseWriter) { +} + +type MemProvider struct { + lock sync.RWMutex // locker + sessions map[string]*list.Element // map in memory + list *list.List // for gc + maxlifetime int64 + savePath string +} + +// init memory session +func (pder *MemProvider) SessionInit(maxlifetime int64, savePath string) error { + pder.maxlifetime = maxlifetime + pder.savePath = savePath + return nil +} + +// get memory session store by sid +func (pder *MemProvider) SessionRead(sid string) (SessionStore, error) { + pder.lock.RLock() + if element, ok := pder.sessions[sid]; ok { + go pder.SessionUpdate(sid) + pder.lock.RUnlock() + return element.Value.(*MemSessionStore), nil + } else { + pder.lock.RUnlock() + pder.lock.Lock() + newsess := &MemSessionStore{sid: sid, timeAccessed: time.Now(), value: make(map[interface{}]interface{})} + element := pder.list.PushBack(newsess) + pder.sessions[sid] = element + pder.lock.Unlock() + return newsess, nil + } +} + +// check session store exist in memory session by sid +func (pder *MemProvider) SessionExist(sid string) bool { + pder.lock.RLock() + defer pder.lock.RUnlock() + if _, ok := pder.sessions[sid]; ok { + return true + } else { + return false + } +} + +// generate new sid for session store in memory session +func (pder *MemProvider) SessionRegenerate(oldsid, sid string) (SessionStore, error) { + pder.lock.RLock() + if element, ok := pder.sessions[oldsid]; ok { + go pder.SessionUpdate(oldsid) + pder.lock.RUnlock() + pder.lock.Lock() + element.Value.(*MemSessionStore).sid = sid + pder.sessions[sid] = element + delete(pder.sessions, oldsid) + pder.lock.Unlock() + return element.Value.(*MemSessionStore), nil + } else { + pder.lock.RUnlock() + pder.lock.Lock() + newsess := &MemSessionStore{sid: sid, timeAccessed: time.Now(), value: make(map[interface{}]interface{})} + element := pder.list.PushBack(newsess) + pder.sessions[sid] = element + pder.lock.Unlock() + return newsess, nil + } +} + +// delete session store in memory session by id +func (pder *MemProvider) SessionDestroy(sid string) error { + pder.lock.Lock() + defer pder.lock.Unlock() + if element, ok := pder.sessions[sid]; ok { + delete(pder.sessions, sid) + pder.list.Remove(element) + return nil + } + return nil +} + +// clean expired session stores in memory session +func (pder *MemProvider) SessionGC() { + pder.lock.RLock() + for { + element := pder.list.Back() + if element == nil { + break + } + if (element.Value.(*MemSessionStore).timeAccessed.Unix() + pder.maxlifetime) < time.Now().Unix() { + pder.lock.RUnlock() + pder.lock.Lock() + pder.list.Remove(element) + delete(pder.sessions, element.Value.(*MemSessionStore).sid) + pder.lock.Unlock() + pder.lock.RLock() + } else { + break + } + } + pder.lock.RUnlock() +} + +// get count number of memory session +func (pder *MemProvider) SessionAll() int { + return pder.list.Len() +} + +// expand time of session store by id in memory session +func (pder *MemProvider) SessionUpdate(sid string) error { + pder.lock.Lock() + defer pder.lock.Unlock() + if element, ok := pder.sessions[sid]; ok { + element.Value.(*MemSessionStore).timeAccessed = time.Now() + pder.list.MoveToFront(element) + return nil + } + return nil +} + +func init() { + Register("memory", mempder) +} diff --git a/utils/mail.go b/utils/mail.go index aa219626..4959268c 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -292,7 +292,7 @@ func qpEscape(dest []byte, c byte) { const nums = "0123456789ABCDEF" dest[0] = '=' dest[1] = nums[(c&0xf0)>>4] - dest[2] = nums[(c&0xf)] + dest[2] = nums[(c & 0xf)] } // headerToBytes enumerates the key and values in the header, and writes the results to the IO Writer diff --git a/utils/pagination/paginator.go b/utils/pagination/paginator.go index e537f1ad..e813f798 100644 --- a/utils/pagination/paginator.go +++ b/utils/pagination/paginator.go @@ -92,18 +92,18 @@ func (p *Paginator) Pages() []int { case page >= pageNums-4 && pageNums > 9: start := pageNums - 9 + 1 pages = make([]int, 9) - for i, _ := range pages { + for i := range pages { pages[i] = start + i } case page >= 5 && pageNums > 9: start := page - 5 + 1 pages = make([]int, int(math.Min(9, float64(page+4+1)))) - for i, _ := range pages { + for i := range pages { pages[i] = start + i } default: pages = make([]int, int(math.Min(9, float64(pageNums)))) - for i, _ := range pages { + for i := range pages { pages[i] = i + 1 } } diff --git a/utils/slice.go b/utils/slice.go index 25032b7f..e413004d 100644 --- a/utils/slice.go +++ b/utils/slice.go @@ -51,7 +51,7 @@ func SliceRandList(min, max int) []int { t0 := time.Now() rand.Seed(int64(t0.Nanosecond())) list := rand.Perm(length) - for index, _ := range list { + for index := range list { list[index] += min } return list diff --git a/validation/util.go b/validation/util.go index 249462d4..367da5dc 100644 --- a/validation/util.go +++ b/validation/util.go @@ -137,7 +137,7 @@ func getRegFuncs(tag, key string) (vfs []ValidFunc, str string, err error) { if err != nil { return } - vfs = []ValidFunc{ValidFunc{"Match", []interface{}{reg, key + ".Match"}}} + vfs = []ValidFunc{{"Match", []interface{}{reg, key + ".Match"}}} str = strings.TrimSpace(tag[:index]) + strings.TrimSpace(tag[end+len("/)"):]) return } From 74e0af4a9a72d299e94dbbe02d676c297dca5f69 Mon Sep 17 00:00:00 2001 From: toalexjin Date: Wed, 25 Mar 2015 15:14:57 +0800 Subject: [PATCH 005/436] For enhancing performance, check log level before fmt.Sprintf() --- logs/log.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/logs/log.go b/logs/log.go index 32e0187c..e9d2673c 100644 --- a/logs/log.go +++ b/logs/log.go @@ -207,48 +207,72 @@ func (bl *BeeLogger) startLogger() { // Log EMERGENCY level message. func (bl *BeeLogger) Emergency(format string, v ...interface{}) { + if LevelEmergency > bl.level { + return + } msg := fmt.Sprintf("[M] "+format, v...) bl.writerMsg(LevelEmergency, msg) } // Log ALERT level message. func (bl *BeeLogger) Alert(format string, v ...interface{}) { + if LevelAlert > bl.level { + return + } msg := fmt.Sprintf("[A] "+format, v...) bl.writerMsg(LevelAlert, msg) } // Log CRITICAL level message. func (bl *BeeLogger) Critical(format string, v ...interface{}) { + if LevelCritical > bl.level { + return + } msg := fmt.Sprintf("[C] "+format, v...) bl.writerMsg(LevelCritical, msg) } // Log ERROR level message. func (bl *BeeLogger) Error(format string, v ...interface{}) { + if LevelError > bl.level { + return + } msg := fmt.Sprintf("[E] "+format, v...) bl.writerMsg(LevelError, msg) } // Log WARNING level message. func (bl *BeeLogger) Warning(format string, v ...interface{}) { + if LevelWarning > bl.level { + return + } msg := fmt.Sprintf("[W] "+format, v...) bl.writerMsg(LevelWarning, msg) } // Log NOTICE level message. func (bl *BeeLogger) Notice(format string, v ...interface{}) { + if LevelNotice > bl.level { + return + } msg := fmt.Sprintf("[N] "+format, v...) bl.writerMsg(LevelNotice, msg) } // Log INFORMATIONAL level message. func (bl *BeeLogger) Informational(format string, v ...interface{}) { + if LevelInformational > bl.level { + return + } msg := fmt.Sprintf("[I] "+format, v...) bl.writerMsg(LevelInformational, msg) } // Log DEBUG level message. func (bl *BeeLogger) Debug(format string, v ...interface{}) { + if LevelDebug > bl.level { + return + } msg := fmt.Sprintf("[D] "+format, v...) bl.writerMsg(LevelDebug, msg) } From 185ee872c45756b01901b1a63c23e92da0b81d86 Mon Sep 17 00:00:00 2001 From: Donal Byrne Date: Wed, 25 Mar 2015 14:47:20 +0100 Subject: [PATCH 006/436] Added to input.go: AcceptHtml, AcceptsXml and AcceptsJson functions which check the header agains a regex for simpler mult-content-type handling. --- context/input.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/context/input.go b/context/input.go index f535e6a2..95f56c1f 100644 --- a/context/input.go +++ b/context/input.go @@ -21,12 +21,21 @@ import ( "net/http" "net/url" "reflect" + "regexp" "strconv" "strings" "github.com/astaxie/beego/session" ) +// Regexes for checking the accept headers +// TODO make sure these are correct +var ( + acceptsHtmlRegex = regexp.MustCompile(`(text/html|application/xhtml\+xml)(?:,|$)`) + acceptsXmlRegex = regexp.MustCompile(`(application/xml|text/xml)(?:,|$)`) + acceptsJsonRegex = regexp.MustCompile(`(application/json)(?:,|$)?`) +) + // BeegoInput operates the http request header, data, cookie and body. // it also contains router params and current session. type BeegoInput struct { @@ -163,6 +172,21 @@ func (input *BeegoInput) IsUpload() bool { return strings.Contains(input.Header("Content-Type"), "multipart/form-data") } +// Checks if request accepts html response +func (input *BeegoInput) AcceptsHtml() bool { + return acceptsHtmlRegex.MatchString(input.Header("Accept")) +} + +// Checks if request accepts xml response +func (input *BeegoInput) AcceptsXml() bool { + return acceptsXmlRegex.MatchString(input.Header("Accept")) +} + +// Checks if request accepts json response +func (input *BeegoInput) AcceptsJson() bool { + return acceptsJsonRegex.MatchString(input.Header("Accept")) +} + // IP returns request client ip. // if in proxy, return first proxy id. // if error, return 127.0.0.1. From 06b5c7f644eb67724ebb9fa2654063397c5466ee Mon Sep 17 00:00:00 2001 From: Donal Byrne Date: Wed, 25 Mar 2015 14:54:39 +0100 Subject: [PATCH 007/436] Remove unnecessary optional group flag '?' since has to match one of comma or end of string --- context/input.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/context/input.go b/context/input.go index 95f56c1f..24d43bbb 100644 --- a/context/input.go +++ b/context/input.go @@ -33,7 +33,7 @@ import ( var ( acceptsHtmlRegex = regexp.MustCompile(`(text/html|application/xhtml\+xml)(?:,|$)`) acceptsXmlRegex = regexp.MustCompile(`(application/xml|text/xml)(?:,|$)`) - acceptsJsonRegex = regexp.MustCompile(`(application/json)(?:,|$)?`) + acceptsJsonRegex = regexp.MustCompile(`(application/json)(?:,|$)`) ) // BeegoInput operates the http request header, data, cookie and body. From d3cdebbee280717ace26b3a32b30e3baaa8f8c26 Mon Sep 17 00:00:00 2001 From: toalexjin Date: Thu, 26 Mar 2015 14:40:12 +0800 Subject: [PATCH 008/436] Do not check log level in writerMsg() because the check is already done outside. --- logs/log.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/logs/log.go b/logs/log.go index e9d2673c..3103ac15 100644 --- a/logs/log.go +++ b/logs/log.go @@ -148,9 +148,6 @@ func (bl *BeeLogger) DelLogger(adaptername string) error { } func (bl *BeeLogger) writerMsg(loglevel int, msg string) error { - if loglevel > bl.level { - return nil - } lm := new(logMsg) lm.level = loglevel if bl.enableFuncCallDepth { From 260b5b19518a3c02137ad1d77c1e47dc8dcb105a Mon Sep 17 00:00:00 2001 From: Donal Byrne Date: Thu, 26 Mar 2015 20:23:00 +0100 Subject: [PATCH 009/436] Set ErrorsMap to nil in Validation.Clear function --- validation/validation.go | 1 + 1 file changed, 1 insertion(+) diff --git a/validation/validation.go b/validation/validation.go index addf6b7e..90a757a9 100644 --- a/validation/validation.go +++ b/validation/validation.go @@ -107,6 +107,7 @@ type Validation struct { // Clean all ValidationError. func (v *Validation) Clear() { v.Errors = []*ValidationError{} + v.ErrorsMap = nil } // Has ValidationError nor not. From 5fa55ca2d3ec0e73c02ac83e208bd43aa77e9f67 Mon Sep 17 00:00:00 2001 From: pylemon Date: Fri, 27 Mar 2015 13:30:59 +0800 Subject: [PATCH 010/436] bugfix: if a form field type is bool, valid Required should always return true instead of return its value. --- validation/validators.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/validation/validators.go b/validation/validators.go index 25415bdd..725b1f7a 100644 --- a/validation/validators.go +++ b/validation/validators.go @@ -64,8 +64,8 @@ func (r Required) IsSatisfied(obj interface{}) bool { if str, ok := obj.(string); ok { return len(str) > 0 } - if b, ok := obj.(bool); ok { - return b + if _, ok := obj.(bool); ok { + return true } if i, ok := obj.(int); ok { return i != 0 From caa260f053de2b5ea5c0e33e8dd8cb70e008329d Mon Sep 17 00:00:00 2001 From: pylemon Date: Fri, 27 Mar 2015 13:43:20 +0800 Subject: [PATCH 011/436] add tests to ensure bool value require test always return true. --- validation/validation_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/validation/validation_test.go b/validation/validation_test.go index be63ac93..0727fda4 100644 --- a/validation/validation_test.go +++ b/validation/validation_test.go @@ -26,6 +26,12 @@ func TestRequired(t *testing.T) { if valid.Required(nil, "nil").Ok { t.Error("nil object should be false") } + if !valid.Required(true, "bool").Ok { + t.Error("Bool value should always return true") + } + if !valid.Required(false, "bool").Ok { + t.Error("Bool value should always return true") + } if valid.Required("", "string").Ok { t.Error("\"'\" string should be false") } From eedaea2feae952dd1d192a0807094b6099da3ad3 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 30 Mar 2015 20:35:57 +0800 Subject: [PATCH 012/436] fix #1073 --- error.go | 18 +++++++++--------- router.go | 14 +++----------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/error.go b/error.go index 71be6916..6db4a5a8 100644 --- a/error.go +++ b/error.go @@ -439,24 +439,26 @@ func exception(errcode string, ctx *context.Context) { if err != nil { code = 503 } - ctx.ResponseWriter.WriteHeader(code) if h, ok := ErrorMaps[errcode]; ok { - executeError(h, ctx) + executeError(h, ctx, code) return } else if h, ok := ErrorMaps["503"]; ok { - executeError(h, ctx) + executeError(h, ctx, code) return } else { + ctx.ResponseWriter.WriteHeader(code) ctx.WriteString(errcode) } } -func executeError(err *errorInfo, ctx *context.Context) { +func executeError(err *errorInfo, ctx *context.Context, code int) { if err.errorType == errorTypeHandler { + ctx.ResponseWriter.WriteHeader(code) err.handler(ctx.ResponseWriter, ctx.Request) return } if err.errorType == errorTypeController { + ctx.Output.SetStatus(code) //Invoke the request handler vc := reflect.New(err.controllerType) execController, ok := vc.Interface().(ControllerInterface) @@ -476,11 +478,9 @@ func executeError(err *errorInfo, ctx *context.Context) { method.Call(in) //render template - if ctx.Output.Status == 0 { - if AutoRender { - if err := execController.Render(); err != nil { - panic(err) - } + if AutoRender { + if err := execController.Render(); err != nil { + panic(err) } } diff --git a/router.go b/router.go index c1bda637..e9f45615 100644 --- a/router.go +++ b/router.go @@ -862,8 +862,8 @@ func (p *ControllerRegistor) recoverPanic(context *beecontext.Context) { panic(err) } else { if ErrorsShow { - if handler, ok := ErrorMaps[fmt.Sprint(err)]; ok { - executeError(handler, context) + if _, ok := ErrorMaps[fmt.Sprint(err)]; ok { + exception(fmt.Sprint(err), context) return } } @@ -886,15 +886,7 @@ func (p *ControllerRegistor) recoverPanic(context *beecontext.Context) { } else { // in production model show all infomation if ErrorsShow { - if handler, ok := ErrorMaps[fmt.Sprint(err)]; ok { - executeError(handler, context) - return - } else if handler, ok := ErrorMaps["503"]; ok { - executeError(handler, context) - return - } else { - context.WriteString(fmt.Sprint(err)) - } + exception(fmt.Sprint(err), context) } else { Critical("the request url is ", context.Input.Url()) Critical("Handler crashed with error", err) From 217e24815bc014b23f84171b74260b1c96f85716 Mon Sep 17 00:00:00 2001 From: Yongzheng Lai Date: Tue, 31 Mar 2015 12:30:47 +0800 Subject: [PATCH 013/436] Update output.go fix cookie not work in IE --- context/output.go | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/context/output.go b/context/output.go index 2141513d..f981df50 100644 --- a/context/output.go +++ b/context/output.go @@ -98,28 +98,30 @@ func (output *BeegoOutput) Body(content []byte) { func (output *BeegoOutput) Cookie(name string, value string, others ...interface{}) { var b bytes.Buffer fmt.Fprintf(&b, "%s=%s", sanitizeName(name), sanitizeValue(value)) - if len(others) > 0 { - switch v := others[0].(type) { - case int: - if v > 0 { - fmt.Fprintf(&b, "; Max-Age=%d", v) - } else if v < 0 { - fmt.Fprintf(&b, "; Max-Age=0") - } - case int64: - if v > 0 { - fmt.Fprintf(&b, "; Max-Age=%d", v) - } else if v < 0 { - fmt.Fprintf(&b, "; Max-Age=0") - } - case int32: - if v > 0 { - fmt.Fprintf(&b, "; Max-Age=%d", v) - } else if v < 0 { - fmt.Fprintf(&b, "; Max-Age=0") - } - } - } + + //fix cookie not work in IE + if len(others) > 0 { + switch v := others[0].(type) { + case int: + if v > 0 { + fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v) * time.Second).UTC().Format(time.RFC1123), v) + } else if v < 0 { + fmt.Fprintf(&b, "; Max-Age=0") + } + case int64: + if v > 0 { + fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v) * time.Second).UTC().Format(time.RFC1123), v) + } else if v < 0 { + fmt.Fprintf(&b, "; Max-Age=0") + } + case int32: + if v > 0 { + fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v) * time.Second).UTC().Format(time.RFC1123), v) + } else if v < 0 { + fmt.Fprintf(&b, "; Max-Age=0") + } + } + } // the settings below // Path, Domain, Secure, HttpOnly From 9261c80509cbb08f65d28e64fd396be5722eb2d2 Mon Sep 17 00:00:00 2001 From: Yongzheng Lai Date: Tue, 31 Mar 2015 12:36:39 +0800 Subject: [PATCH 014/436] Update output.go --- context/output.go | 1 + 1 file changed, 1 insertion(+) diff --git a/context/output.go b/context/output.go index f981df50..7edde552 100644 --- a/context/output.go +++ b/context/output.go @@ -29,6 +29,7 @@ import ( "path/filepath" "strconv" "strings" + "time" ) // BeegoOutput does work for sending response header. From 49c0f8906f7eafaad8f4794483080cc03d6f2d9b Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 1 Apr 2015 23:31:40 +0800 Subject: [PATCH 015/436] fix #1081 --- controller.go | 72 ++++++++++++++++++++------------------------------- 1 file changed, 28 insertions(+), 44 deletions(-) diff --git a/controller.go b/controller.go index e056f52d..81ee1230 100644 --- a/controller.go +++ b/controller.go @@ -406,106 +406,90 @@ func (c *Controller) GetStrings(key string, def ...[]string) []string { // GetInt returns input as an int or the default value while it's present and input is blank func (c *Controller) GetInt(key string, def ...int) (int, error) { - var defv int - if len(def) > 0 { - defv = def[0] - } - if strv := c.Ctx.Input.Query(key); strv != "" { return strconv.Atoi(strv) + } else if len(def) > 0 { + return def[0], nil } else { - return defv, nil + return strconv.Atoi(strv) } } // GetInt8 return input as an int8 or the default value while it's present and input is blank func (c *Controller) GetInt8(key string, def ...int8) (int8, error) { - var defv int8 - if len(def) > 0 { - defv = def[0] - } - if strv := c.Ctx.Input.Query(key); strv != "" { i64, err := strconv.ParseInt(strv, 10, 8) i8 := int8(i64) return i8, err + } else if len(def) > 0 { + return def[0], nil } else { - return defv, nil + i64, err := strconv.ParseInt(strv, 10, 8) + i8 := int8(i64) + return i8, err } } // GetInt16 returns input as an int16 or the default value while it's present and input is blank func (c *Controller) GetInt16(key string, def ...int16) (int16, error) { - var defv int16 - if len(def) > 0 { - defv = def[0] - } - if strv := c.Ctx.Input.Query(key); strv != "" { i64, err := strconv.ParseInt(strv, 10, 16) i16 := int16(i64) - return i16, err + } else if len(def) > 0 { + return def[0], nil } else { - return defv, nil + i64, err := strconv.ParseInt(strv, 10, 16) + i16 := int16(i64) + return i16, err } } // GetInt32 returns input as an int32 or the default value while it's present and input is blank func (c *Controller) GetInt32(key string, def ...int32) (int32, error) { - var defv int32 - if len(def) > 0 { - defv = def[0] - } - if strv := c.Ctx.Input.Query(key); strv != "" { i64, err := strconv.ParseInt(c.Ctx.Input.Query(key), 10, 32) i32 := int32(i64) return i32, err + } else if len(def) > 0 { + return def[0], nil } else { - return defv, nil + i64, err := strconv.ParseInt(c.Ctx.Input.Query(key), 10, 32) + i32 := int32(i64) + return i32, err } } // GetInt64 returns input value as int64 or the default value while it's present and input is blank. func (c *Controller) GetInt64(key string, def ...int64) (int64, error) { - var defv int64 - if len(def) > 0 { - defv = def[0] - } - if strv := c.Ctx.Input.Query(key); strv != "" { return strconv.ParseInt(strv, 10, 64) + } else if len(def) > 0 { + return def[0], nil } else { - return defv, nil + return strconv.ParseInt(strv, 10, 64) } } // GetBool returns input value as bool or the default value while it's present and input is blank. func (c *Controller) GetBool(key string, def ...bool) (bool, error) { - var defv bool - if len(def) > 0 { - defv = def[0] - } - if strv := c.Ctx.Input.Query(key); strv != "" { return strconv.ParseBool(strv) + } else if len(def) > 0 { + return def[0], nil } else { - return defv, nil + return strconv.ParseBool(strv) } } // GetFloat returns input value as float64 or the default value while it's present and input is blank. func (c *Controller) GetFloat(key string, def ...float64) (float64, error) { - var defv float64 - if len(def) > 0 { - defv = def[0] - } - if strv := c.Ctx.Input.Query(key); strv != "" { - return strconv.ParseFloat(c.Ctx.Input.Query(key), 64) + return strconv.ParseFloat(strv, 64) + } else if len(def) > 0 { + return def[0], nil } else { - return defv, nil + return strconv.ParseFloat(strv, 64) } } From 8a82e25e85f3f1a091b711a1cd3b1b793a1dcf12 Mon Sep 17 00:00:00 2001 From: peeped Date: Thu, 2 Apr 2015 12:07:12 +0800 Subject: [PATCH 016/436] Update validators.go edit mobile regular expression ; add 184 Section No. --- validation/validators.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validation/validators.go b/validation/validators.go index 725b1f7a..645f4ec3 100644 --- a/validation/validators.go +++ b/validation/validators.go @@ -457,7 +457,7 @@ func (b Base64) GetLimitValue() interface{} { } // just for chinese mobile phone number -var mobilePattern = regexp.MustCompile("^((\\+86)|(86))?(1(([35][0-9])|(47)|[8][012356789]))\\d{8}$") +var mobilePattern = regexp.MustCompile("^((\\+86)|(86))?(1(([35][0-9])|(47)|[8][0-9]))\\d{8}$") type Mobile struct { Match From e675594e465189ead90bdc57308fea9cd1c960f5 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 2 Apr 2015 14:02:39 +0800 Subject: [PATCH 017/436] session cookie support IE --- session/session.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/session/session.go b/session/session.go index 3cbd2b05..01aae1a5 100644 --- a/session/session.go +++ b/session/session.go @@ -151,6 +151,7 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se Domain: manager.config.Domain} if manager.config.CookieLifeTime >= 0 { cookie.MaxAge = manager.config.CookieLifeTime + cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) } if manager.config.EnableSetCookie { http.SetCookie(w, cookie) @@ -177,6 +178,7 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se Domain: manager.config.Domain} if manager.config.CookieLifeTime >= 0 { cookie.MaxAge = manager.config.CookieLifeTime + cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) } if manager.config.EnableSetCookie { http.SetCookie(w, cookie) From a5124a1d4501567eaa9d5c9450ec4e7402d7792f Mon Sep 17 00:00:00 2001 From: Yongzheng Lai Date: Fri, 3 Apr 2015 17:41:09 +0800 Subject: [PATCH 018/436] Update session.go move expire in line 154 to 247, because it will cause session_cookie not writen to explorer --- session/session.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/session/session.go b/session/session.go index 01aae1a5..35561242 100644 --- a/session/session.go +++ b/session/session.go @@ -151,7 +151,6 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se Domain: manager.config.Domain} if manager.config.CookieLifeTime >= 0 { cookie.MaxAge = manager.config.CookieLifeTime - cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) } if manager.config.EnableSetCookie { http.SetCookie(w, cookie) @@ -245,6 +244,7 @@ func (manager *Manager) SessionRegenerateId(w http.ResponseWriter, r *http.Reque } if manager.config.CookieLifeTime >= 0 { cookie.MaxAge = manager.config.CookieLifeTime + cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) } http.SetCookie(w, cookie) r.AddCookie(cookie) From 5e1e618d0fc83406942ef09c6a070829f9ad2d52 Mon Sep 17 00:00:00 2001 From: Yongzheng Lai Date: Sat, 4 Apr 2015 00:44:22 +0800 Subject: [PATCH 019/436] Update session.go remove = in if statement --- session/session.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/session/session.go b/session/session.go index 35561242..4214320c 100644 --- a/session/session.go +++ b/session/session.go @@ -149,8 +149,9 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se HttpOnly: true, Secure: manager.config.Secure, Domain: manager.config.Domain} - if manager.config.CookieLifeTime >= 0 { + if manager.config.CookieLifeTime > 0 { cookie.MaxAge = manager.config.CookieLifeTime + cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) } if manager.config.EnableSetCookie { http.SetCookie(w, cookie) @@ -175,7 +176,7 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se HttpOnly: true, Secure: manager.config.Secure, Domain: manager.config.Domain} - if manager.config.CookieLifeTime >= 0 { + if manager.config.CookieLifeTime > 0 { cookie.MaxAge = manager.config.CookieLifeTime cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) } @@ -242,7 +243,7 @@ func (manager *Manager) SessionRegenerateId(w http.ResponseWriter, r *http.Reque cookie.HttpOnly = true cookie.Path = "/" } - if manager.config.CookieLifeTime >= 0 { + if manager.config.CookieLifeTime > 0 { cookie.MaxAge = manager.config.CookieLifeTime cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) } From e0e8b986222d333f52a50fffb885ab0d5aac9b52 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 5 Apr 2015 23:11:50 +0800 Subject: [PATCH 020/436] fix #1112 --- tree.go | 42 +++++++++++++++++++++++------------------- tree_test.go | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 19 deletions(-) diff --git a/tree.go b/tree.go index 93e87470..e0d9c1c2 100644 --- a/tree.go +++ b/tree.go @@ -70,18 +70,23 @@ func (t *Tree) addtree(segments []string, tree *Tree, wildcards []string, reg st } else { regexpStr = "/" + regexpStr } - } else { - for _, w := range wildcards { - if w == "." || w == ":" { - continue + } else if reg != "" { + if seg == "*.*" { + regexpStr = "([^.]+).(.+)" + } else { + for _, w := range params { + if w == "." || w == ":" { + continue + } + regexpStr = "([^/]+)/" + regexpStr } - regexpStr = "([^/]+)/" + regexpStr } } - reg = strings.Trim(reg+regexpStr, "/") + reg = strings.Trim(reg+"/"+regexpStr, "/") filterTreeWithPrefix(tree, append(wildcards, params...), reg) t.wildcard = tree } else { + reg = strings.Trim(reg+"/"+regexpStr, "/") filterTreeWithPrefix(tree, append(wildcards, params...), reg) t.fixrouters[seg] = tree } @@ -104,23 +109,23 @@ func (t *Tree) addtree(segments []string, tree *Tree, wildcards []string, reg st rr = rr + "([^/]+)/" } } - regexpStr = rr + regexpStr + "/" + regexpStr = rr + regexpStr } else { - regexpStr = "/" + regexpStr + "/" + regexpStr = "/" + regexpStr } - } else { - for _, w := range wildcards { - if w == "." || w == ":" { - continue - } - if w == ":splat" { - regexpStr = "(.+)/" + regexpStr - } else { + } else if reg != "" { + if seg == "*.*" { + regexpStr = "([^.]+).(.+)" + } else { + for _, w := range params { + if w == "." || w == ":" { + continue + } regexpStr = "([^/]+)/" + regexpStr } } } - reg = reg + regexpStr + reg = strings.TrimRight(strings.TrimRight(reg, "/")+"/"+regexpStr, "/") t.wildcard.addtree(segments[1:], tree, append(wildcards, params...), reg) } else { subTree := NewTree() @@ -140,7 +145,7 @@ func filterTreeWithPrefix(t *Tree, wildcards []string, reg string) { if reg != "" { if l.regexps != nil { l.wildcards = append(wildcards, l.wildcards...) - l.regexps = regexp.MustCompile("^" + reg + strings.Trim(l.regexps.String(), "^$") + "$") + l.regexps = regexp.MustCompile("^" + reg + "/" + strings.Trim(l.regexps.String(), "^$") + "$") } else { for _, v := range l.wildcards { if v == ":" || v == "." { @@ -248,7 +253,6 @@ func (t *Tree) addseg(segments []string, route interface{}, wildcards []string, regexpStr = "/([^/]+)" + regexpStr } } - } t.wildcard.addseg(segments[1:], route, append(wildcards, params...), reg+regexpStr) } else { diff --git a/tree_test.go b/tree_test.go index fa289716..1d2890e1 100644 --- a/tree_test.go +++ b/tree_test.go @@ -148,6 +148,50 @@ func TestAddTree2(t *testing.T) { } } +func TestAddTree3(t *testing.T) { + tr := NewTree() + tr.AddRouter("/create", "astaxie") + tr.AddRouter("/shop/:sd/account", "astaxie") + t3 := NewTree() + t3.AddTree("/table/:num", tr) + obj, param := t3.Match("/table/123/shop/123/account") + if obj == nil || obj.(string) != "astaxie" { + t.Fatal("/table/:num/shop/:sd/account can't get obj ") + } + if param == nil { + t.Fatal("get param error") + } + if param[":num"] != "123" || param[":sd"] != "123" { + t.Fatal("get :num :sd param error") + } + obj, param = t3.Match("/table/123/create") + if obj == nil || obj.(string) != "astaxie" { + t.Fatal("/table/:num/create can't get obj ") + } +} + +func TestAddTree4(t *testing.T) { + tr := NewTree() + tr.AddRouter("/create", "astaxie") + tr.AddRouter("/shop/:sd/:account", "astaxie") + t4 := NewTree() + t4.AddTree("/:info:int/:num/:id", tr) + obj, param := t4.Match("/12/123/456/shop/123/account") + if obj == nil || obj.(string) != "astaxie" { + t.Fatal("/:info:int/:num/:id/shop/:sd/:account can't get obj ") + } + if param == nil { + t.Fatal("get param error") + } + if param[":info"] != "12" || param[":num"] != "123" || param[":id"] != "456" || param[":sd"] != "123" || param[":account"] != "account" { + t.Fatal("get :info :num :id :sd :account param error") + } + obj, param = t4.Match("/12/123/456/create") + if obj == nil || obj.(string) != "astaxie" { + t.Fatal("/:info:int/:num/:id/create can't get obj ") + } +} + func TestSplitPath(t *testing.T) { a := splitPath("") if len(a) != 0 { From 47848fa77bed27a4971b986a456223afb5089a99 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 5 Apr 2015 23:21:13 +0800 Subject: [PATCH 021/436] config read and set support Runmode --- config.go | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/config.go b/config.go index f326ad22..a649eaa8 100644 --- a/config.go +++ b/config.go @@ -98,6 +98,10 @@ func newAppConfig(AppConfigProvider, AppConfigPath string) (*beegoAppConfig, err } func (b *beegoAppConfig) Set(key, val string) error { + err := b.innerConfig.Set(RunMode+"::"+key, val) + if err == nil { + return err + } return b.innerConfig.Set(key, val) } @@ -150,26 +154,50 @@ func (b *beegoAppConfig) Float(key string) (float64, error) { } func (b *beegoAppConfig) DefaultString(key string, defaultval string) string { + v := b.String(key) + if v != "" { + return v + } return b.innerConfig.DefaultString(key, defaultval) } func (b *beegoAppConfig) DefaultStrings(key string, defaultval []string) []string { + v := b.Strings(key) + if len(v) != 0 { + return v + } return b.innerConfig.DefaultStrings(key, defaultval) } func (b *beegoAppConfig) DefaultInt(key string, defaultval int) int { + v, err := b.Int(key) + if err == nil { + return v + } return b.innerConfig.DefaultInt(key, defaultval) } func (b *beegoAppConfig) DefaultInt64(key string, defaultval int64) int64 { + v, err := b.Int64(key) + if err == nil { + return v + } return b.innerConfig.DefaultInt64(key, defaultval) } func (b *beegoAppConfig) DefaultBool(key string, defaultval bool) bool { + v, err := b.Bool(key) + if err == nil { + return v + } return b.innerConfig.DefaultBool(key, defaultval) } func (b *beegoAppConfig) DefaultFloat(key string, defaultval float64) float64 { + v, err := b.Float(key) + if err == nil { + return v + } return b.innerConfig.DefaultFloat(key, defaultval) } From 7caeb91f9b0124f6c13e293d5da2e36283b4ecdc Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 5 Apr 2015 23:23:35 +0800 Subject: [PATCH 022/436] improve the defaultval --- config.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config.go b/config.go index a649eaa8..b22db163 100644 --- a/config.go +++ b/config.go @@ -158,7 +158,7 @@ func (b *beegoAppConfig) DefaultString(key string, defaultval string) string { if v != "" { return v } - return b.innerConfig.DefaultString(key, defaultval) + return defaultval } func (b *beegoAppConfig) DefaultStrings(key string, defaultval []string) []string { @@ -166,7 +166,7 @@ func (b *beegoAppConfig) DefaultStrings(key string, defaultval []string) []strin if len(v) != 0 { return v } - return b.innerConfig.DefaultStrings(key, defaultval) + return defaultval } func (b *beegoAppConfig) DefaultInt(key string, defaultval int) int { @@ -174,7 +174,7 @@ func (b *beegoAppConfig) DefaultInt(key string, defaultval int) int { if err == nil { return v } - return b.innerConfig.DefaultInt(key, defaultval) + return defaultval } func (b *beegoAppConfig) DefaultInt64(key string, defaultval int64) int64 { @@ -182,7 +182,7 @@ func (b *beegoAppConfig) DefaultInt64(key string, defaultval int64) int64 { if err == nil { return v } - return b.innerConfig.DefaultInt64(key, defaultval) + return defaultval } func (b *beegoAppConfig) DefaultBool(key string, defaultval bool) bool { @@ -190,7 +190,7 @@ func (b *beegoAppConfig) DefaultBool(key string, defaultval bool) bool { if err == nil { return v } - return b.innerConfig.DefaultBool(key, defaultval) + return defaultval } func (b *beegoAppConfig) DefaultFloat(key string, defaultval float64) float64 { @@ -198,7 +198,7 @@ func (b *beegoAppConfig) DefaultFloat(key string, defaultval float64) float64 { if err == nil { return v } - return b.innerConfig.DefaultFloat(key, defaultval) + return defaultval } func (b *beegoAppConfig) DIY(key string) (interface{}, error) { From 56dfe418dd6e5a53334ac64aee148877775961bb Mon Sep 17 00:00:00 2001 From: Lionel Lee Date: Tue, 7 Apr 2015 10:35:18 +0800 Subject: [PATCH 023/436] fix a comment error. --- context/input.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/context/input.go b/context/input.go index d9aa2634..00e65ee7 100644 --- a/context/input.go +++ b/context/input.go @@ -306,7 +306,7 @@ func (input *BeegoInput) ParseFormOrMulitForm(maxMemory int64) error { // Bind data from request.Form[key] to dest // like /?id=123&isok=true&ft=1.2&ol[0]=1&ol[1]=2&ul[]=str&ul[]=array&user.Name=astaxie // var id int beegoInput.Bind(&id, "id") id ==123 -// var isok bool beegoInput.Bind(&isok, "isok") id ==true +// var isok bool beegoInput.Bind(&isok, "isok") isok ==true // var ft float64 beegoInput.Bind(&ft, "ft") ft ==1.2 // ol := make([]int, 0, 2) beegoInput.Bind(&ol, "ol") ol ==[1 2] // ul := make([]string, 0, 2) beegoInput.Bind(&ul, "ul") ul ==[str array] From d1c9cb228118ce6a84ff82054a6119aec337e51e Mon Sep 17 00:00:00 2001 From: peeped Date: Tue, 7 Apr 2015 17:48:51 +0800 Subject: [PATCH 024/436] Update validators.go MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit //176 中国联通 //177 中国电信 //145 中国联通 //147 中国移动 //149 中国电信 --- validation/validators.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validation/validators.go b/validation/validators.go index 645f4ec3..61b0414a 100644 --- a/validation/validators.go +++ b/validation/validators.go @@ -457,7 +457,7 @@ func (b Base64) GetLimitValue() interface{} { } // just for chinese mobile phone number -var mobilePattern = regexp.MustCompile("^((\\+86)|(86))?(1(([35][0-9])|(47)|[8][0-9]))\\d{8}$") +var mobilePattern = regexp.MustCompile("^((\\+86)|(86))?(1(([35][0-9])|[8][0-9]|[7][67]|[4][579]))\\d{8}$") type Mobile struct { Match From 642a69de0253ad909e4e079332be278313245364 Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 8 Apr 2015 20:12:10 +0800 Subject: [PATCH 025/436] add sethost --- httplib/httplib.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index bd8bc776..bdd2d65a 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -184,6 +184,12 @@ func (b *BeegoHttpRequest) Header(key, value string) *BeegoHttpRequest { return b } +// Set HOST +func (b *BeegoHttpRequest) SetHost(host string) *BeegoHttpRequest { + b.req.Host = host + return b +} + // Set the protocol version for incoming requests. // Client requests always use HTTP/1.1. func (b *BeegoHttpRequest) SetProtocolVersion(vers string) *BeegoHttpRequest { @@ -253,7 +259,6 @@ func (b *BeegoHttpRequest) Body(data interface{}) *BeegoHttpRequest { return b } - // JsonBody adds request raw body encoding by JSON. func (b *BeegoHttpRequest) JsonBody(obj interface{}) (*BeegoHttpRequest, error) { if b.req.Body == nil && obj != nil { From 6f6b412709ab117c384b88568d209fac1ea9fc9e Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 8 Apr 2015 21:45:00 +0800 Subject: [PATCH 026/436] httplib support gzip --- httplib/httplib.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index bdd2d65a..284aef7b 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -32,6 +32,7 @@ package httplib import ( "bytes" + "compress/gzip" "crypto/tls" "encoding/json" "encoding/xml" @@ -50,7 +51,7 @@ import ( "time" ) -var defaultSetting = BeegoHttpSettings{false, "beegoServer", 60 * time.Second, 60 * time.Second, nil, nil, nil, false} +var defaultSetting = BeegoHttpSettings{false, "beegoServer", 60 * time.Second, 60 * time.Second, nil, nil, nil, false, true} var defaultCookieJar http.CookieJar var settingMutex sync.Mutex @@ -122,6 +123,7 @@ type BeegoHttpSettings struct { Proxy func(*http.Request) (*url.URL, error) Transport http.RoundTripper EnableCookie bool + Gzip bool } // BeegoHttpRequest provides more useful methods for requesting one url than http.Request. @@ -434,7 +436,15 @@ func (b *BeegoHttpRequest) Bytes() ([]byte, error) { return nil, nil } defer resp.Body.Close() - b.body, err = ioutil.ReadAll(resp.Body) + if b.setting.Gzip && resp.Header.Get("Content-Encoding") == "gzip" { + reader, err := gzip.NewReader(resp.Body) + if err != nil { + return nil, err + } + b.body, err = ioutil.ReadAll(reader) + } else { + b.body, err = ioutil.ReadAll(resp.Body) + } if err != nil { return nil, err } From cc5ca458ab7cbb0d8040404e13695d47a2b38e2a Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 8 Apr 2015 22:58:37 +0800 Subject: [PATCH 027/436] add DumpRequest --- httplib/httplib.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/httplib/httplib.go b/httplib/httplib.go index 284aef7b..aba7f534 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -167,6 +167,11 @@ func (b *BeegoHttpRequest) Debug(isdebug bool) *BeegoHttpRequest { return b } +// return the DumpRequest +func (b *BeegoHttpRequest) DumpRequest() { + return httputil.DumpRequest(b.req, true) +} + // SetTimeout sets connect time out and read-write time out for BeegoRequest. func (b *BeegoHttpRequest) SetTimeout(connectTimeout, readWriteTimeout time.Duration) *BeegoHttpRequest { b.setting.ConnectTimeout = connectTimeout From 44a39a6b3ebde75843341af3efcd3d418a871ab0 Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 8 Apr 2015 23:00:08 +0800 Subject: [PATCH 028/436] fix the params --- httplib/httplib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index aba7f534..57d3de61 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -168,7 +168,7 @@ func (b *BeegoHttpRequest) Debug(isdebug bool) *BeegoHttpRequest { } // return the DumpRequest -func (b *BeegoHttpRequest) DumpRequest() { +func (b *BeegoHttpRequest) DumpRequest() (dump []byte, err error) { return httputil.DumpRequest(b.req, true) } From 44c8534477441a5fb09f448ce634c1e4c45a2211 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 9 Apr 2015 00:11:25 +0800 Subject: [PATCH 029/436] fix the dump has no body --- httplib/httplib.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 57d3de61..f09c8509 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -135,6 +135,7 @@ type BeegoHttpRequest struct { setting BeegoHttpSettings resp *http.Response body []byte + dump []byte } // Change request settings @@ -168,8 +169,8 @@ func (b *BeegoHttpRequest) Debug(isdebug bool) *BeegoHttpRequest { } // return the DumpRequest -func (b *BeegoHttpRequest) DumpRequest() (dump []byte, err error) { - return httputil.DumpRequest(b.req, true) +func (b *BeegoHttpRequest) DumpRequest() []byte { + return b.dump } // SetTimeout sets connect time out and read-write time out for BeegoRequest. @@ -405,6 +406,7 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { if err != nil { println(err.Error()) } + b.dump = dump println(string(dump)) } From d55997e520bd363cea70f725c0e28c1b3601fc1c Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 9 Apr 2015 00:12:41 +0800 Subject: [PATCH 030/436] fix the init struct --- httplib/httplib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index f09c8509..8ee56bcd 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -85,7 +85,7 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest { ProtoMajor: 1, ProtoMinor: 1, } - return &BeegoHttpRequest{url, &req, map[string]string{}, map[string]string{}, defaultSetting, &resp, nil} + return &BeegoHttpRequest{url, &req, map[string]string{}, map[string]string{}, defaultSetting, &resp, nil, nil} } // Get returns *BeegoHttpRequest with GET method. From ecb27f34e6ad361092786657158c17b8047f8c31 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 9 Apr 2015 00:18:02 +0800 Subject: [PATCH 031/436] no output the dump --- httplib/httplib.go | 1 - 1 file changed, 1 deletion(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 8ee56bcd..935b7a71 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -407,7 +407,6 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { println(err.Error()) } b.dump = dump - println(string(dump)) } resp, err := client.Do(b.req) From e229a4762f36ad0a6805b989ae822d1ec8ed0311 Mon Sep 17 00:00:00 2001 From: wuranbo Date: Mon, 13 Apr 2015 10:33:57 +0800 Subject: [PATCH 032/436] =?UTF-8?q?*feature)=20=E5=A2=9E=E5=8A=A0logcallde?= =?UTF-8?q?pth=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BD=BF=E5=BE=97=E8=83=BD?= =?UTF-8?q?=E7=AE=80=E5=8D=95=E5=86=8D=E6=AC=A1=E5=B0=81=E8=A3=85log?= =?UTF-8?q?=E7=B3=BB=E5=88=97=E5=87=BD=E6=95=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logs/log.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/logs/log.go b/logs/log.go index 3103ac15..5f5f1cea 100644 --- a/logs/log.go +++ b/logs/log.go @@ -181,6 +181,11 @@ func (bl *BeeLogger) SetLogFuncCallDepth(d int) { bl.loggerFuncCallDepth = d } +// get log funcCallDepth for wrapper +func (bl *BeeLogger) GetLogFuncCallDepth() int { + return bl.loggerFuncCallDepth +} + // enable log funcCallDepth func (bl *BeeLogger) EnableFuncCallDepth(b bool) { bl.enableFuncCallDepth = b From 6d72fc63ab2c8a90fdce7f47a16130a53deddbe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20V=C4=83n=20Thanh?= Date: Wed, 15 Apr 2015 17:41:41 +0700 Subject: [PATCH 033/436] fixed: when RelatedSel have multi string/relation, it only get last string --- orm/orm_queryset.go | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/orm/orm_queryset.go b/orm/orm_queryset.go index 4f5d5485..5cc47617 100644 --- a/orm/orm_queryset.go +++ b/orm/orm_queryset.go @@ -115,23 +115,21 @@ func (o querySet) OrderBy(exprs ...string) QuerySeter { // set relation model to query together. // it will query relation models and assign to parent model. func (o querySet) RelatedSel(params ...interface{}) QuerySeter { - var related []string - if len(params) == 0 { - o.relDepth = DefaultRelsDepth - } else { - for _, p := range params { - switch val := p.(type) { - case string: - related = append(o.related, val) - case int: - o.relDepth = val - default: - panic(fmt.Errorf(" wrong param kind: %v", val)) - } - } - } - o.related = related - return &o + if len(params) == 0 { + o.relDepth = DefaultRelsDepth + } else { + for _, p := range params { + switch val := p.(type) { + case string: + o.related = append(o.related, val) + case int: + o.relDepth = val + default: + panic(fmt.Errorf(" wrong param kind: %v", val)) + } + } + } + return &o } // set condition to QuerySeter. From dc58ec83161d42a7162b639ab4f5fb55125db381 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 19 Apr 2015 15:40:23 +0800 Subject: [PATCH 034/436] remove unreached code --- admin.go | 1 - 1 file changed, 1 deletion(-) diff --git a/admin.go b/admin.go index 90142c55..7eb07cc0 100644 --- a/admin.go +++ b/admin.go @@ -333,7 +333,6 @@ func profIndex(rw http.ResponseWriter, r *http.Request) { tmpl = template.Must(tmpl.Parse(defaultScriptsTpl)) } tmpl.Execute(rw, data) - } else { } } From d0e7dd686bd151c0b3fce7c0004819576360a00d Mon Sep 17 00:00:00 2001 From: Wyatt Fang Date: Fri, 24 Apr 2015 10:58:46 +0800 Subject: [PATCH 035/436] add Recursively validation --- validation/validation.go | 39 +++++++++++++++++++++++++++++++++++ validation/validation_test.go | 30 +++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/validation/validation.go b/validation/validation.go index addf6b7e..d91679f7 100644 --- a/validation/validation.go +++ b/validation/validation.go @@ -333,3 +333,42 @@ func (v *Validation) Valid(obj interface{}) (b bool, err error) { return !v.HasErrors(), nil } + +// Recursively validate a struct. +// Step1: Validate by v.Valid +// Step2: If pass on step1, then reflect obj's fields +// Step3: Do the Recursively validation to all struct or struct pointer fields +// Anonymous fields will be ignored +func (v *Validation) RecursiveValid(objc interface{}) (bool, error) { + //Step 1: validate obj itself firstly + pass, err := v.Valid(objc) + if err != nil || false == pass { + return pass, err // Stop recursive validation + } else { //pass + // Step 2: Validate struct's struct fields + objT := reflect.TypeOf(objc) + objV := reflect.ValueOf(objc) + if isStruct(objT) || isStructPtr(objT) { + + if isStructPtr(objT) { + objT = objT.Elem() + objV = objV.Elem() + } + + for i := 0; i < objT.NumField(); i++ { + + t := objT.Field(i).Type + + if isStruct(t) || isStructPtr(t) { + // Step 3: do the recursive validation + // Only valid the Public field recursively + if objV.Field(i).CanInterface() { + pass, err = v.RecursiveValid(objV.Field(i).Interface()) + } + } + } + } + + return pass, err + } +} diff --git a/validation/validation_test.go b/validation/validation_test.go index be63ac93..78201198 100644 --- a/validation/validation_test.go +++ b/validation/validation_test.go @@ -343,3 +343,33 @@ func TestValid(t *testing.T) { t.Errorf("Message key should be `Name.Match` but got %s", valid.Errors[0].Key) } } + +func TestRecursiveValid(t *testing.T) { + type User struct { + Id int + Name string `valid:"Required;Match(/^(test)?\\w*@(/test/);com$/)"` + Age int `valid:"Required;Range(1, 140)"` + } + + type AnonymouseUser struct { + Id2 int + Name2 string `valid:"Required;Match(/^(test)?\\w*@(/test/);com$/)"` + Age2 int `valid:"Required;Range(1, 140)"` + } + + type Account struct { + Password string `valid:"Required"` + U User + AnonymouseUser + } + valid := Validation{} + + u := Account{Password: "abc123_", U: User{}} + b, err := valid.RecursiveValid(u) + if err != nil { + t.Fatal(err) + } + if b { + t.Error("validation should not be passed") + } +} From 73650e1f2be427a355e313179560831d242500dd Mon Sep 17 00:00:00 2001 From: Wyatt Fang Date: Fri, 24 Apr 2015 11:14:49 +0800 Subject: [PATCH 036/436] remove the double isStruct/isStructPtr check --- validation/validation.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/validation/validation.go b/validation/validation.go index d91679f7..21226e02 100644 --- a/validation/validation.go +++ b/validation/validation.go @@ -341,6 +341,7 @@ func (v *Validation) Valid(obj interface{}) (b bool, err error) { // Anonymous fields will be ignored func (v *Validation) RecursiveValid(objc interface{}) (bool, error) { //Step 1: validate obj itself firstly + // fails if objc is not struct pass, err := v.Valid(objc) if err != nil || false == pass { return pass, err // Stop recursive validation @@ -348,23 +349,22 @@ func (v *Validation) RecursiveValid(objc interface{}) (bool, error) { // Step 2: Validate struct's struct fields objT := reflect.TypeOf(objc) objV := reflect.ValueOf(objc) - if isStruct(objT) || isStructPtr(objT) { - if isStructPtr(objT) { - objT = objT.Elem() - objV = objV.Elem() - } + if isStructPtr(objT) { + objT = objT.Elem() + objV = objV.Elem() + } - for i := 0; i < objT.NumField(); i++ { + for i := 0; i < objT.NumField(); i++ { - t := objT.Field(i).Type + t := objT.Field(i).Type - if isStruct(t) || isStructPtr(t) { - // Step 3: do the recursive validation - // Only valid the Public field recursively - if objV.Field(i).CanInterface() { - pass, err = v.RecursiveValid(objV.Field(i).Interface()) - } + // Recursive applies to struct or pointer to structs fields + if isStruct(t) || isStructPtr(t) { + // Step 3: do the recursive validation + // Only valid the Public field recursively + if objV.Field(i).CanInterface() { + pass, err = v.RecursiveValid(objV.Field(i).Interface()) } } } From 5534258e222b905994e59b5c553653f109fbc7ae Mon Sep 17 00:00:00 2001 From: Wyatt Fang Date: Fri, 24 Apr 2015 11:17:12 +0800 Subject: [PATCH 037/436] remove useless comments --- validation/validation.go | 1 - 1 file changed, 1 deletion(-) diff --git a/validation/validation.go b/validation/validation.go index 21226e02..362e14ad 100644 --- a/validation/validation.go +++ b/validation/validation.go @@ -338,7 +338,6 @@ func (v *Validation) Valid(obj interface{}) (b bool, err error) { // Step1: Validate by v.Valid // Step2: If pass on step1, then reflect obj's fields // Step3: Do the Recursively validation to all struct or struct pointer fields -// Anonymous fields will be ignored func (v *Validation) RecursiveValid(objc interface{}) (bool, error) { //Step 1: validate obj itself firstly // fails if objc is not struct From 4498a02c1555490b477767bf7a0eef4de28ab926 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 01:23:18 +0800 Subject: [PATCH 038/436] better go style --- httplib/httplib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 935b7a71..ab734b3c 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -51,7 +51,7 @@ import ( "time" ) -var defaultSetting = BeegoHttpSettings{false, "beegoServer", 60 * time.Second, 60 * time.Second, nil, nil, nil, false, true} +var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectionTimeout: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Giz: true} var defaultCookieJar http.CookieJar var settingMutex sync.Mutex From e1d20aea5d0d270304bbdac7c72277b25d4c2e9d Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 02:04:34 +0800 Subject: [PATCH 039/436] better code and fixed --- httplib/httplib.go | 53 +++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index ab734b3c..ca893163 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -85,7 +85,14 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest { ProtoMajor: 1, ProtoMinor: 1, } - return &BeegoHttpRequest{url, &req, map[string]string{}, map[string]string{}, defaultSetting, &resp, nil, nil} + return &BeegoHttpRequest{ + url: url, + req: &req, + paras: map[string]string{}, + files: map[string]string{}, + setting: defaultSetting, + resp: &resp, + } } // Get returns *BeegoHttpRequest with GET method. @@ -157,14 +164,14 @@ func (b *BeegoHttpRequest) SetEnableCookie(enable bool) *BeegoHttpRequest { } // SetUserAgent sets User-Agent header field -func (b *BeegoHttpRequest) SetUserAgent(useragent string) *BeegoHttpRequest { - b.setting.UserAgent = useragent +func (b *BeegoHttpRequest) SetUserAgent(userAgent string) *BeegoHttpRequest { + b.setting.UserAgent = userAgent return b } // Debug sets show debug or not when executing request. -func (b *BeegoHttpRequest) Debug(isdebug bool) *BeegoHttpRequest { - b.setting.ShowDebug = isdebug +func (b *BeegoHttpRequest) Debug(isDebug bool) *BeegoHttpRequest { + b.setting.ShowDebug = isDebug return b } @@ -409,12 +416,8 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { b.dump = dump } - resp, err := client.Do(b.req) - if err != nil { - return nil, err - } - b.resp = resp - return resp, nil + b.resp, err = client.Do(b.req) + return b.resp, err } // String returns the body string in response. @@ -435,12 +438,9 @@ func (b *BeegoHttpRequest) Bytes() ([]byte, error) { return b.body, nil } resp, err := b.getResponse() - if err != nil { + if resp == nil || resp.Body == nil { return nil, err } - if resp.Body == nil { - return nil, nil - } defer resp.Body.Close() if b.setting.Gzip && resp.Header.Get("Content-Encoding") == "gzip" { reader, err := gzip.NewReader(resp.Body) @@ -451,29 +451,24 @@ func (b *BeegoHttpRequest) Bytes() ([]byte, error) { } else { b.body, err = ioutil.ReadAll(resp.Body) } - if err != nil { - return nil, err - } - return b.body, nil + return b.body, err } // ToFile saves the body data in response to one file. // it calls Response inner. func (b *BeegoHttpRequest) ToFile(filename string) error { + resp, err := b.getResponse() + if resp == nil || resp.Body == nil { + return err + } + defer resp.Body.Close() + f, err := os.Create(filename) if err != nil { return err } defer f.Close() - resp, err := b.getResponse() - if err != nil { - return err - } - if resp.Body == nil { - return nil - } - defer resp.Body.Close() _, err = io.Copy(f, resp.Body) return err } @@ -510,7 +505,7 @@ func TimeoutDialer(cTimeout time.Duration, rwTimeout time.Duration) func(net, ad if err != nil { return nil, err } - conn.SetDeadline(time.Now().Add(rwTimeout)) - return conn, nil + err = conn.SetDeadline(time.Now().Add(rwTimeout)) + return conn, err } } From cddb4fdb609715664ae0d10987fa2ae3461f9277 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 02:05:50 +0800 Subject: [PATCH 040/436] typo fixed --- httplib/httplib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index ca893163..502ef276 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -51,7 +51,7 @@ import ( "time" ) -var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectionTimeout: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Giz: true} +var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectTimeoutt: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Gzip: true} var defaultCookieJar http.CookieJar var settingMutex sync.Mutex From 0c1bb6409a86dbb77ac5f90ecad7e8737da93742 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 02:06:19 +0800 Subject: [PATCH 041/436] typo fixed --- httplib/httplib.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 502ef276..6e0acdab 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -51,7 +51,7 @@ import ( "time" ) -var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectTimeoutt: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Gzip: true} +var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectTimeout: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Gzip: true} var defaultCookieJar http.CookieJar var settingMutex sync.Mutex @@ -88,7 +88,7 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest { return &BeegoHttpRequest{ url: url, req: &req, - paras: map[string]string{}, + params: map[string]string{}, files: map[string]string{}, setting: defaultSetting, resp: &resp, From da8c3c39103bee08796f89a9ef47071839b06373 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 02:17:46 +0800 Subject: [PATCH 042/436] zero timeout means wait until resp --- httplib/httplib.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 6e0acdab..140d541b 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -65,14 +65,8 @@ func createDefaultCookie() { // Overwrite default settings func SetDefaultSetting(setting BeegoHttpSettings) { settingMutex.Lock() - defer settingMutex.Unlock() defaultSetting = setting - if defaultSetting.ConnectTimeout == 0 { - defaultSetting.ConnectTimeout = 60 * time.Second - } - if defaultSetting.ReadWriteTimeout == 0 { - defaultSetting.ReadWriteTimeout = 60 * time.Second - } + settingMutex.Unlock() } // return *BeegoHttpRequest with specific method @@ -262,11 +256,11 @@ func (b *BeegoHttpRequest) PostFile(formname, filename string) *BeegoHttpRequest // it supports string and []byte. func (b *BeegoHttpRequest) Body(data interface{}) *BeegoHttpRequest { switch t := data.(type) { - case string: + case string: bf := bytes.NewBufferString(t) b.req.Body = ioutil.NopCloser(bf) b.req.ContentLength = int64(len(t)) - case []byte: + case []byte: bf := bytes.NewBuffer(t) b.req.Body = ioutil.NopCloser(bf) b.req.ContentLength = int64(len(t)) From 973306b28ddba2b27a9fb63036d073c51347ea4a Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 02:19:38 +0800 Subject: [PATCH 043/436] no need defer here --- httplib/httplib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 140d541b..f84586a5 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -58,8 +58,8 @@ var settingMutex sync.Mutex // createDefaultCookie creates a global cookiejar to store cookies. func createDefaultCookie() { settingMutex.Lock() - defer settingMutex.Unlock() defaultCookieJar, _ = cookiejar.New(nil) + settingMutex.Unlock() } // Overwrite default settings From 0afd04ec6f8e4420f880be81a7a2b69d773d0e52 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 15:24:04 +0800 Subject: [PATCH 044/436] no need lock here --- httplib/httplib.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index f84586a5..54c70283 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -47,26 +47,20 @@ import ( "net/url" "os" "strings" - "sync" "time" ) var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectTimeout: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Gzip: true} var defaultCookieJar http.CookieJar -var settingMutex sync.Mutex // createDefaultCookie creates a global cookiejar to store cookies. func createDefaultCookie() { - settingMutex.Lock() defaultCookieJar, _ = cookiejar.New(nil) - settingMutex.Unlock() } // Overwrite default settings func SetDefaultSetting(setting BeegoHttpSettings) { - settingMutex.Lock() defaultSetting = setting - settingMutex.Unlock() } // return *BeegoHttpRequest with specific method @@ -82,7 +76,7 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest { return &BeegoHttpRequest{ url: url, req: &req, - params: map[string]string{}, + params: map[string]string{}, files: map[string]string{}, setting: defaultSetting, resp: &resp, @@ -256,11 +250,11 @@ func (b *BeegoHttpRequest) PostFile(formname, filename string) *BeegoHttpRequest // it supports string and []byte. func (b *BeegoHttpRequest) Body(data interface{}) *BeegoHttpRequest { switch t := data.(type) { - case string: + case string: bf := bytes.NewBufferString(t) b.req.Body = ioutil.NopCloser(bf) b.req.ContentLength = int64(len(t)) - case []byte: + case []byte: bf := bytes.NewBuffer(t) b.req.Body = ioutil.NopCloser(bf) b.req.ContentLength = int64(len(t)) From d8fa118727d40238e03a2ec700bc05e53285a6f2 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 15:42:10 +0800 Subject: [PATCH 045/436] more fixed --- httplib/httplib.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 54c70283..ae50791c 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -36,6 +36,7 @@ import ( "crypto/tls" "encoding/json" "encoding/xml" + "fmt" "io" "io/ioutil" "log" @@ -278,12 +279,15 @@ func (b *BeegoHttpRequest) JsonBody(obj interface{}) (*BeegoHttpRequest, error) } func (b *BeegoHttpRequest) buildUrl(paramBody string) { + if paramBody == "" { + return + } // build GET url with query string - if b.req.Method == "GET" && len(paramBody) > 0 { - if strings.Index(b.url, "?") != -1 { - b.url += "&" + paramBody - } else { + if b.req.Method == "GET" { + if strings.Index(b.url, "?") == -1 { b.url = b.url + "?" + paramBody + } else { + b.url += "&" + paramBody } return } @@ -336,18 +340,14 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { } var paramBody string if len(b.params) > 0 { - var buf bytes.Buffer for k, v := range b.params { - buf.WriteString(url.QueryEscape(k)) - buf.WriteByte('=') - buf.WriteString(url.QueryEscape(v)) - buf.WriteByte('&') + paramBody += fmt.Sprintf("&%s=%v", url.QueryEscape(k), url.QueryEscape(v)) } - paramBody = buf.String() - paramBody = paramBody[0 : len(paramBody)-1] + paramBody = paramBody[1:] } b.buildUrl(paramBody) + url, err := url.Parse(b.url) if err != nil { return nil, err @@ -399,7 +399,7 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { if b.setting.ShowDebug { dump, err := httputil.DumpRequest(b.req, true) if err != nil { - println(err.Error()) + log.Println(err.Error()) } b.dump = dump } From f56bdb628448d7dac14eabede88e3351a415dc92 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 16:08:25 +0800 Subject: [PATCH 046/436] set default timeout --- httplib/httplib.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/httplib/httplib.go b/httplib/httplib.go index ae50791c..7464c16f 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -357,6 +357,13 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { trans := b.setting.Transport + if b.setting.ConnectTimeout == 0 { + b.setting.ConnectTimeout = 30 * time.Second + } + if b.setting.ReadWriteTimeout == 0 { + b.setting.ReadWriteTimeout = 30 * time.Second + } + if trans == nil { // create default transport trans = &http.Transport{ From 6c3e274b6ec143a3325c185247a8da8459d0925c Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 16:10:18 +0800 Subject: [PATCH 047/436] set default timeout --- httplib/httplib.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 7464c16f..2389a7cb 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -358,10 +358,10 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { trans := b.setting.Transport if b.setting.ConnectTimeout == 0 { - b.setting.ConnectTimeout = 30 * time.Second + b.setting.ConnectTimeout = 60 * time.Second } if b.setting.ReadWriteTimeout == 0 { - b.setting.ReadWriteTimeout = 30 * time.Second + b.setting.ReadWriteTimeout = 60 * time.Second } if trans == nil { From c0bb5b9237dfd3292dd4e80c4c5c3f99dd1a9b86 Mon Sep 17 00:00:00 2001 From: cr7pt0gr4ph7 Date: Sun, 3 May 2015 23:21:32 +0200 Subject: [PATCH 048/436] Improve documentation of filter.go. --- filter.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/filter.go b/filter.go index ddd61094..f673ab66 100644 --- a/filter.go +++ b/filter.go @@ -16,11 +16,12 @@ package beego import "github.com/astaxie/beego/context" -// FilterFunc defines filter function type. +// FilterFunc defines a filter function which is invoked before the controller handler is executed. type FilterFunc func(*context.Context) -// FilterRouter defines filter operation before controller handler execution. -// it can match patterned url and do filter function when action arrives. +// FilterRouter defines a filter operation which is invoked before the controller handler is executed. +// It can match the URL against a pattern, and execute a filter function +// when a request with a matching URL arrives. type FilterRouter struct { filterFunc FilterFunc tree *Tree @@ -28,10 +29,11 @@ type FilterRouter struct { returnOnOutput bool } -// ValidRouter check current request is valid for this filter. -// if matched, returns parsed params in this request by defined filter router pattern. -func (f *FilterRouter) ValidRouter(router string) (bool, map[string]string) { - isok, params := f.tree.Match(router) +// ValidRouter checks if the current request is matched by this filter. +// If the request is matched, the values of the URL parameters defined +// by the filter pattern are also returned. +func (f *FilterRouter) ValidRouter(url string) (bool, map[string]string) { + isok, params := f.tree.Match(url) if isok == nil { return false, nil } From 1d72629334fe4712253aa58ca8b5725fab70221f Mon Sep 17 00:00:00 2001 From: mlgd Date: Mon, 4 May 2015 15:54:03 +0200 Subject: [PATCH 049/436] Fix save config ini file --- config/ini.go | 54 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/config/ini.go b/config/ini.go index 837c9ffe..31fe9b5f 100644 --- a/config/ini.go +++ b/config/ini.go @@ -300,21 +300,8 @@ func (c *IniConfigContainer) SaveConfigFile(filename string) (err error) { defer f.Close() buf := bytes.NewBuffer(nil) - for section, dt := range c.data { - // Write section comments. - if v, ok := c.sectionComment[section]; ok { - if _, err = buf.WriteString(string(bNumComment) + v + lineBreak); err != nil { - return err - } - } - - if section != DEFAULT_SECTION { - // Write section name. - if _, err = buf.WriteString(string(sectionStart) + section + string(sectionEnd) + lineBreak); err != nil { - return err - } - } - + // Save default section at first place + if dt, ok := c.data[DEFAULT_SECTION]; ok { for key, val := range dt { if key != " " { // Write key comments. @@ -336,6 +323,43 @@ func (c *IniConfigContainer) SaveConfigFile(filename string) (err error) { return err } } + // Save named sections + for section, dt := range c.data { + if section != DEFAULT_SECTION { + // Write section comments. + if v, ok := c.sectionComment[section]; ok { + if _, err = buf.WriteString(string(bNumComment) + v + lineBreak); err != nil { + return err + } + } + + // Write section name. + if _, err = buf.WriteString(string(sectionStart) + section + string(sectionEnd) + lineBreak); err != nil { + return err + } + + for key, val := range dt { + if key != " " { + // Write key comments. + if v, ok := c.keyComment[key]; ok { + if _, err = buf.WriteString(string(bNumComment) + v + lineBreak); err != nil { + return err + } + } + + // Write key and value. + if _, err = buf.WriteString(key + string(bEqual) + val + lineBreak); err != nil { + return err + } + } + } + + // Put a line between sections. + if _, err = buf.WriteString(lineBreak); err != nil { + return err + } + } + } if _, err = buf.WriteTo(f); err != nil { return err From 47be2fadb5a0d356ccdb46811f43cd66f3f55590 Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 5 May 2015 21:36:31 +0800 Subject: [PATCH 050/436] fix #1143 --- error.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/error.go b/error.go index 6db4a5a8..99a1fcf3 100644 --- a/error.go +++ b/error.go @@ -92,7 +92,7 @@ func showErr(err interface{}, ctx *context.Context, Stack string) { data["Stack"] = Stack data["BeegoVersion"] = VERSION data["GoVersion"] = runtime.Version() - ctx.Output.SetStatus(500) + ctx.ResponseWriter.WriteHeader(500) t.Execute(ctx.ResponseWriter, data) } From 56e2143630fd1cb61a08d9bc39905df800bbb693 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sat, 9 May 2015 14:54:30 +0800 Subject: [PATCH 051/436] add apk mime --- mime.go | 1 + 1 file changed, 1 insertion(+) diff --git a/mime.go b/mime.go index 155e5e12..20246c21 100644 --- a/mime.go +++ b/mime.go @@ -40,6 +40,7 @@ var mimemaps map[string]string = map[string]string{ ".ani": "application/x-navi-animation", ".aos": "application/x-nokia-9000-communicator-add-on-software", ".aps": "application/mime", + ".apk": "application/vnd.android.package-archive", ".arc": "application/x-arc-compressed", ".arj": "application/arj", ".art": "image/x-jg", From 98289cd8de5a8e6eea70844366ba8a66bdbad897 Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 13 May 2015 21:17:47 +0800 Subject: [PATCH 052/436] beego suppot graceful restart application --- admin.go | 12 +- app.go | 133 ++++++++----- config.go | 4 + grace/grace.go | 522 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 621 insertions(+), 50 deletions(-) create mode 100644 grace/grace.go diff --git a/admin.go b/admin.go index 7eb07cc0..52388c76 100644 --- a/admin.go +++ b/admin.go @@ -19,9 +19,11 @@ import ( "encoding/json" "fmt" "net/http" + "os" "text/template" "time" + "github.com/astaxie/beego/grace" "github.com/astaxie/beego/toolbox" "github.com/astaxie/beego/utils" ) @@ -458,8 +460,14 @@ func (admin *adminApp) Run() { http.Handle(p, f) } BeeLogger.Info("Admin server Running on %s", addr) - err := http.ListenAndServe(addr, nil) + + var err error + if Graceful { + err = grace.ListenAndServe(addr, nil) + } else { + err = http.ListenAndServe(addr, nil) + } if err != nil { - BeeLogger.Critical("Admin ListenAndServe: ", err) + BeeLogger.Critical("Admin ListenAndServe: ", err, fmt.Sprint(os.Getpid())) } } diff --git a/app.go b/app.go index 35040f33..4740e7e5 100644 --- a/app.go +++ b/app.go @@ -22,6 +22,7 @@ import ( "os" "time" + "github.com/astaxie/beego/grace" "github.com/astaxie/beego/utils" ) @@ -76,57 +77,93 @@ func (app *App) Run() { err = fcgi.Serve(l, app.Handlers) } } else { - app.Server.Addr = addr - app.Server.Handler = app.Handlers - app.Server.ReadTimeout = time.Duration(HttpServerTimeOut) * time.Second - app.Server.WriteTimeout = time.Duration(HttpServerTimeOut) * time.Second + if Graceful { + if EnableHttpTLS { + go func() { + time.Sleep(20 * time.Microsecond) + if HttpsPort != 0 { + addr = fmt.Sprintf("%s:%d", HttpAddr, HttpsPort) + } + server := grace.NewServer(addr, app.Handlers) + server.Server.ReadTimeout = time.Duration(HttpServerTimeOut) * time.Second + server.Server.WriteTimeout = time.Duration(HttpServerTimeOut) * time.Second + err := server.ListenAndServeTLS(HttpCertFile, HttpKeyFile) + if err != nil { + BeeLogger.Critical("ListenAndServeTLS: ", err) + time.Sleep(100 * time.Microsecond) + endRunning <- true + } + }() + } + if EnableHttpListen { + go func() { + server := grace.NewServer(addr, app.Handlers) + server.Server.ReadTimeout = time.Duration(HttpServerTimeOut) * time.Second + server.Server.WriteTimeout = time.Duration(HttpServerTimeOut) * time.Second + if ListenTCP4 && HttpAddr == "" { + server.Network = "tcp4" + } + err := server.ListenAndServe() + if err != nil { + BeeLogger.Critical("ListenAndServe: ", err, fmt.Sprint(os.Getpid())) + time.Sleep(100 * time.Microsecond) + endRunning <- true + } + }() + } + } else { + app.Server.Addr = addr + app.Server.Handler = app.Handlers + app.Server.ReadTimeout = time.Duration(HttpServerTimeOut) * time.Second + app.Server.WriteTimeout = time.Duration(HttpServerTimeOut) * time.Second - if EnableHttpTLS { - go func() { - time.Sleep(20 * time.Microsecond) - if HttpsPort != 0 { - app.Server.Addr = fmt.Sprintf("%s:%d", HttpAddr, HttpsPort) - } - BeeLogger.Info("https server Running on %s", app.Server.Addr) - err := app.Server.ListenAndServeTLS(HttpCertFile, HttpKeyFile) - if err != nil { - BeeLogger.Critical("ListenAndServeTLS: ", err) - time.Sleep(100 * time.Microsecond) - endRunning <- true - } - }() + if EnableHttpTLS { + go func() { + time.Sleep(20 * time.Microsecond) + if HttpsPort != 0 { + app.Server.Addr = fmt.Sprintf("%s:%d", HttpAddr, HttpsPort) + } + BeeLogger.Info("https server Running on %s", app.Server.Addr) + err := app.Server.ListenAndServeTLS(HttpCertFile, HttpKeyFile) + if err != nil { + BeeLogger.Critical("ListenAndServeTLS: ", err) + time.Sleep(100 * time.Microsecond) + endRunning <- true + } + }() + } + + if EnableHttpListen { + go func() { + app.Server.Addr = addr + BeeLogger.Info("http server Running on %s", app.Server.Addr) + if ListenTCP4 && HttpAddr == "" { + ln, err := net.Listen("tcp4", app.Server.Addr) + if err != nil { + BeeLogger.Critical("ListenAndServe: ", err) + time.Sleep(100 * time.Microsecond) + endRunning <- true + return + } + err = app.Server.Serve(ln) + if err != nil { + BeeLogger.Critical("ListenAndServe: ", err) + time.Sleep(100 * time.Microsecond) + endRunning <- true + return + } + } else { + err := app.Server.ListenAndServe() + if err != nil { + BeeLogger.Critical("ListenAndServe: ", err) + time.Sleep(100 * time.Microsecond) + endRunning <- true + } + } + }() + } } - if EnableHttpListen { - go func() { - app.Server.Addr = addr - BeeLogger.Info("http server Running on %s", app.Server.Addr) - if ListenTCP4 && HttpAddr == "" { - ln, err := net.Listen("tcp4", app.Server.Addr) - if err != nil { - BeeLogger.Critical("ListenAndServe: ", err) - time.Sleep(100 * time.Microsecond) - endRunning <- true - return - } - err = app.Server.Serve(ln) - if err != nil { - BeeLogger.Critical("ListenAndServe: ", err) - time.Sleep(100 * time.Microsecond) - endRunning <- true - return - } - } else { - err := app.Server.ListenAndServe() - if err != nil { - BeeLogger.Critical("ListenAndServe: ", err) - time.Sleep(100 * time.Microsecond) - endRunning <- true - } - } - }() - } } - <-endRunning } diff --git a/config.go b/config.go index b22db163..09d0df24 100644 --- a/config.go +++ b/config.go @@ -82,6 +82,7 @@ var ( EnableDocs bool // enable generate docs & server docs API Swagger RouterCaseSensitive bool // router case sensitive default is true AccessLogs bool // print access logs, default is false + Graceful bool // use graceful start the server ) type beegoAppConfig struct { @@ -509,5 +510,8 @@ func ParseConfig() (err error) { if casesensitive, err := AppConfig.Bool("RouterCaseSensitive"); err == nil { RouterCaseSensitive = casesensitive } + if graceful, err := AppConfig.Bool("Graceful"); err == nil { + Graceful = graceful + } return nil } diff --git a/grace/grace.go b/grace/grace.go new file mode 100644 index 00000000..e77112d0 --- /dev/null +++ b/grace/grace.go @@ -0,0 +1,522 @@ +// Copyright 2014 beego Author. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Description: http://grisha.org/blog/2014/06/03/graceful-restart-in-golang/ +// +// Usage: +// +// import( +// "log" +// "net/http" +// "os" +// +// "github.com/astaxie/beego/grace" +// ) +// +// func handler(w http.ResponseWriter, r *http.Request) { +// w.Write([]byte("WORLD!")) +// } +// +// func main() { +// mux := http.NewServeMux() +// mux.HandleFunc("/hello", handler) +// +// err := grace.ListenAndServe("localhost:8080", mux1) +// if err != nil { +// log.Println(err) +// } +// log.Println("Server on 8080 stopped") +// os.Exit(0) +// } +package grace + +import ( + "crypto/tls" + "flag" + "fmt" + "log" + "net" + "net/http" + "os" + "os/exec" + "os/signal" + "strings" + "sync" + "syscall" + "time" +) + +const ( + PRE_SIGNAL = iota + POST_SIGNAL + + STATE_INIT + STATE_RUNNING + STATE_SHUTTING_DOWN + STATE_TERMINATE +) + +var ( + regLock *sync.Mutex + runningServers map[string]*graceServer + runningServersOrder []string + socketPtrOffsetMap map[string]uint + runningServersForked bool + + DefaultReadTimeOut time.Duration + DefaultWriteTimeOut time.Duration + DefaultMaxHeaderBytes int + DefaultTimeout time.Duration + + isChild bool + socketOrder string +) + +func init() { + regLock = &sync.Mutex{} + flag.BoolVar(&isChild, "graceful", false, "listen on open fd (after forking)") + flag.StringVar(&socketOrder, "socketorder", "", "previous initialization order - used when more than one listener was started") + runningServers = make(map[string]*graceServer) + runningServersOrder = []string{} + socketPtrOffsetMap = make(map[string]uint) + + DefaultMaxHeaderBytes = 0 + + // after a restart the parent will finish ongoing requests before + // shutting down. set to a negative value to disable + DefaultTimeout = 60 * time.Second +} + +type graceServer struct { + http.Server + GraceListener net.Listener + SignalHooks map[int]map[os.Signal][]func() + tlsInnerListener *graceListener + wg sync.WaitGroup + sigChan chan os.Signal + isChild bool + state uint8 + Network string +} + +// NewServer returns an intialized graceServer. Calling Serve on it will +// actually "start" the server. +func NewServer(addr string, handler http.Handler) (srv *graceServer) { + regLock.Lock() + defer regLock.Unlock() + if !flag.Parsed() { + flag.Parse() + } + if len(socketOrder) > 0 { + for i, addr := range strings.Split(socketOrder, ",") { + socketPtrOffsetMap[addr] = uint(i) + } + } else { + socketPtrOffsetMap[addr] = uint(len(runningServersOrder)) + } + + srv = &graceServer{ + wg: sync.WaitGroup{}, + sigChan: make(chan os.Signal), + isChild: isChild, + SignalHooks: map[int]map[os.Signal][]func(){ + PRE_SIGNAL: map[os.Signal][]func(){ + syscall.SIGHUP: []func(){}, + syscall.SIGUSR1: []func(){}, + syscall.SIGUSR2: []func(){}, + syscall.SIGINT: []func(){}, + syscall.SIGTERM: []func(){}, + syscall.SIGTSTP: []func(){}, + }, + POST_SIGNAL: map[os.Signal][]func(){ + syscall.SIGHUP: []func(){}, + syscall.SIGUSR1: []func(){}, + syscall.SIGUSR2: []func(){}, + syscall.SIGINT: []func(){}, + syscall.SIGTERM: []func(){}, + syscall.SIGTSTP: []func(){}, + }, + }, + state: STATE_INIT, + Network: "tcp", + } + + srv.Server.Addr = addr + srv.Server.ReadTimeout = DefaultReadTimeOut + srv.Server.WriteTimeout = DefaultWriteTimeOut + srv.Server.MaxHeaderBytes = DefaultMaxHeaderBytes + srv.Server.Handler = handler + + runningServersOrder = append(runningServersOrder, addr) + runningServers[addr] = srv + + return +} + +// ListenAndServe listens on the TCP network address addr +// and then calls Serve to handle requests on incoming connections. +func ListenAndServe(addr string, handler http.Handler) error { + server := NewServer(addr, handler) + return server.ListenAndServe() +} + +// ListenAndServeTLS listens on the TCP network address addr and then calls +// Serve to handle requests on incoming TLS connections. +// +// Filenames containing a certificate and matching private key for the server must be provided. +// If the certificate is signed by a certificate authority, +// the certFile should be the concatenation of the server's certificate followed by the CA's certificate. +func ListenAndServeTLS(addr string, certFile string, keyFile string, handler http.Handler) error { + server := NewServer(addr, handler) + return server.ListenAndServeTLS(certFile, keyFile) +} + +// Serve accepts incoming connections on the Listener l, +// creating a new service goroutine for each. +// The service goroutines read requests and then call srv.Handler to reply to them. +func (srv *graceServer) Serve() (err error) { + srv.state = STATE_RUNNING + err = srv.Server.Serve(srv.GraceListener) + log.Println(syscall.Getpid(), "Waiting for connections to finish...") + srv.wg.Wait() + srv.state = STATE_TERMINATE + return +} + +// ListenAndServe listens on the TCP network address srv.Addr and then calls Serve +// to handle requests on incoming connections. If srv.Addr is blank, ":http" is +// used. +func (srv *graceServer) ListenAndServe() (err error) { + addr := srv.Addr + if addr == "" { + addr = ":http" + } + + go srv.handleSignals() + + l, err := srv.getListener(addr) + if err != nil { + log.Println(err) + return + } + + srv.GraceListener = newGraceListener(l, srv) + + if srv.isChild { + syscall.Kill(syscall.Getppid(), syscall.SIGTERM) + } + + log.Println(syscall.Getpid(), srv.Addr) + return srv.Serve() +} + +// ListenAndServeTLS listens on the TCP network address srv.Addr and then calls +// Serve to handle requests on incoming TLS connections. +// +// Filenames containing a certificate and matching private key for the server must +// be provided. If the certificate is signed by a certificate authority, the +// certFile should be the concatenation of the server's certificate followed by the +// CA's certificate. +// +// If srv.Addr is blank, ":https" is used. +func (srv *graceServer) ListenAndServeTLS(certFile, keyFile string) (err error) { + addr := srv.Addr + if addr == "" { + addr = ":https" + } + + config := &tls.Config{} + if srv.TLSConfig != nil { + *config = *srv.TLSConfig + } + if config.NextProtos == nil { + config.NextProtos = []string{"http/1.1"} + } + + config.Certificates = make([]tls.Certificate, 1) + config.Certificates[0], err = tls.LoadX509KeyPair(certFile, keyFile) + if err != nil { + return + } + + go srv.handleSignals() + + l, err := srv.getListener(addr) + if err != nil { + log.Println(err) + return + } + + srv.tlsInnerListener = newGraceListener(l, srv) + srv.GraceListener = tls.NewListener(srv.tlsInnerListener, config) + + if srv.isChild { + syscall.Kill(syscall.Getppid(), syscall.SIGTERM) + } + + log.Println(syscall.Getpid(), srv.Addr) + return srv.Serve() +} + +// getListener either opens a new socket to listen on, or takes the acceptor socket +// it got passed when restarted. +func (srv *graceServer) getListener(laddr string) (l net.Listener, err error) { + if srv.isChild { + var ptrOffset uint = 0 + if len(socketPtrOffsetMap) > 0 { + ptrOffset = socketPtrOffsetMap[laddr] + log.Println("laddr", laddr, "ptr offset", socketPtrOffsetMap[laddr]) + } + + f := os.NewFile(uintptr(3+ptrOffset), "") + l, err = net.FileListener(f) + if err != nil { + err = fmt.Errorf("net.FileListener error: %v", err) + return + } + } else { + l, err = net.Listen(srv.Network, laddr) + if err != nil { + err = fmt.Errorf("net.Listen error: %v", err) + return + } + } + return +} + +// handleSignals listens for os Signals and calls any hooked in function that the +// user had registered with the signal. +func (srv *graceServer) handleSignals() { + var sig os.Signal + + signal.Notify( + srv.sigChan, + syscall.SIGHUP, + syscall.SIGUSR1, + syscall.SIGUSR2, + syscall.SIGINT, + syscall.SIGTERM, + syscall.SIGTSTP, + ) + + pid := syscall.Getpid() + for { + sig = <-srv.sigChan + srv.signalHooks(PRE_SIGNAL, sig) + switch sig { + case syscall.SIGHUP: + log.Println(pid, "Received SIGHUP. forking.") + err := srv.fork() + if err != nil { + log.Println("Fork err:", err) + } + case syscall.SIGUSR1: + log.Println(pid, "Received SIGUSR1.") + case syscall.SIGUSR2: + log.Println(pid, "Received SIGUSR2.") + srv.serverTimeout(0 * time.Second) + case syscall.SIGINT: + log.Println(pid, "Received SIGINT.") + srv.shutdown() + case syscall.SIGTERM: + log.Println(pid, "Received SIGTERM.") + srv.shutdown() + case syscall.SIGTSTP: + log.Println(pid, "Received SIGTSTP.") + default: + log.Printf("Received %v: nothing i care about...\n", sig) + } + srv.signalHooks(POST_SIGNAL, sig) + } +} + +func (srv *graceServer) signalHooks(ppFlag int, sig os.Signal) { + if _, notSet := srv.SignalHooks[ppFlag][sig]; !notSet { + return + } + for _, f := range srv.SignalHooks[ppFlag][sig] { + f() + } + return +} + +// shutdown closes the listener so that no new connections are accepted. it also +// starts a goroutine that will hammer (stop all running requests) the server +// after DefaultTimeout. +func (srv *graceServer) shutdown() { + if srv.state != STATE_RUNNING { + return + } + + srv.state = STATE_SHUTTING_DOWN + if DefaultTimeout >= 0 { + go srv.serverTimeout(DefaultTimeout) + } + err := srv.GraceListener.Close() + if err != nil { + log.Println(syscall.Getpid(), "Listener.Close() error:", err) + } else { + log.Println(syscall.Getpid(), srv.GraceListener.Addr(), "Listener closed.") + } +} + +// hammerTime forces the server to shutdown in a given timeout - whether it +// finished outstanding requests or not. if Read/WriteTimeout are not set or the +// max header size is very big a connection could hang... +// +// srv.Serve() will not return until all connections are served. this will +// unblock the srv.wg.Wait() in Serve() thus causing ListenAndServe(TLS) to +// return. +func (srv *graceServer) serverTimeout(d time.Duration) { + defer func() { + // we are calling srv.wg.Done() until it panics which means we called + // Done() when the counter was already at 0 and we're done. + // (and thus Serve() will return and the parent will exit) + if r := recover(); r != nil { + log.Println("WaitGroup at 0", r) + } + }() + if srv.state != STATE_SHUTTING_DOWN { + return + } + time.Sleep(d) + log.Println("[STOP - Hammer Time] Forcefully shutting down parent") + for { + if srv.state == STATE_TERMINATE { + break + } + srv.wg.Done() + } +} + +func (srv *graceServer) fork() (err error) { + // only one server isntance should fork! + regLock.Lock() + defer regLock.Unlock() + if runningServersForked { + return + } + runningServersForked = true + + var files = make([]*os.File, len(runningServers)) + var orderArgs = make([]string, len(runningServers)) + // get the accessor socket fds for _all_ server instances + for _, srvPtr := range runningServers { + // introspect.PrintTypeDump(srvPtr.EndlessListener) + switch srvPtr.GraceListener.(type) { + case *graceListener: + // normal listener + files[socketPtrOffsetMap[srvPtr.Server.Addr]] = srvPtr.GraceListener.(*graceListener).File() + default: + // tls listener + files[socketPtrOffsetMap[srvPtr.Server.Addr]] = srvPtr.tlsInnerListener.File() + } + orderArgs[socketPtrOffsetMap[srvPtr.Server.Addr]] = srvPtr.Server.Addr + } + + log.Println(files) + path := os.Args[0] + var args []string + if len(os.Args) > 1 { + for _, arg := range os.Args[1:] { + if arg == "-graceful" { + break + } + args = append(args, arg) + } + } + args = append(args, "-graceful") + if len(runningServers) > 1 { + args = append(args, fmt.Sprintf(`-socketorder=%s`, strings.Join(orderArgs, ","))) + log.Println(args) + } + cmd := exec.Command(path, args...) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + cmd.ExtraFiles = files + err = cmd.Start() + if err != nil { + log.Fatalf("Restart: Failed to launch, error: %v", err) + } + + return +} + +type graceListener struct { + net.Listener + stop chan error + stopped bool + server *graceServer +} + +func (gl *graceListener) Accept() (c net.Conn, err error) { + tc, err := gl.Listener.(*net.TCPListener).AcceptTCP() + if err != nil { + return + } + + tc.SetKeepAlive(true) // see http.tcpKeepAliveListener + tc.SetKeepAlivePeriod(3 * time.Minute) // see http.tcpKeepAliveListener + + c = graceConn{ + Conn: tc, + server: gl.server, + } + + gl.server.wg.Add(1) + return +} + +func newGraceListener(l net.Listener, srv *graceServer) (el *graceListener) { + el = &graceListener{ + Listener: l, + stop: make(chan error), + server: srv, + } + + // Starting the listener for the stop signal here because Accept blocks on + // el.Listener.(*net.TCPListener).AcceptTCP() + // The goroutine will unblock it by closing the listeners fd + go func() { + _ = <-el.stop + el.stopped = true + el.stop <- el.Listener.Close() + }() + return +} + +func (el *graceListener) Close() error { + if el.stopped { + return syscall.EINVAL + } + el.stop <- nil + return <-el.stop +} + +func (el *graceListener) File() *os.File { + // returns a dup(2) - FD_CLOEXEC flag *not* set + tl := el.Listener.(*net.TCPListener) + fl, _ := tl.File() + return fl +} + +type graceConn struct { + net.Conn + server *graceServer +} + +func (c graceConn) Close() error { + c.server.wg.Done() + return c.Conn.Close() +} From 740a5261057b3300e21ffe404996450a325966a3 Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 13 May 2015 21:20:50 +0800 Subject: [PATCH 053/436] fix sesseion redis db error --- session/redis/sess_redis.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/session/redis/sess_redis.go b/session/redis/sess_redis.go index 887fb520..d31feb2c 100644 --- a/session/redis/sess_redis.go +++ b/session/redis/sess_redis.go @@ -145,7 +145,7 @@ func (rp *RedisProvider) SessionInit(maxlifetime int64, savePath string) error { rp.password = configs[2] } if len(configs) > 3 { - dbnum, err := strconv.Atoi(configs[1]) + dbnum, err := strconv.Atoi(configs[3]) if err != nil || dbnum < 0 { rp.dbNum = 0 } else { From 519602a553a2897cf813dd52a8d8308cb4bbe7e9 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 15 May 2015 15:04:08 +0800 Subject: [PATCH 054/436] fix #1152 --- session/session.go | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/session/session.go b/session/session.go index 4214320c..ffc08edc 100644 --- a/session/session.go +++ b/session/session.go @@ -147,7 +147,7 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se Value: url.QueryEscape(sid), Path: "/", HttpOnly: true, - Secure: manager.config.Secure, + Secure: manager.isSecure(r), Domain: manager.config.Domain} if manager.config.CookieLifeTime > 0 { cookie.MaxAge = manager.config.CookieLifeTime @@ -174,7 +174,7 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se Value: url.QueryEscape(sid), Path: "/", HttpOnly: true, - Secure: manager.config.Secure, + Secure: manager.isSecure(r), Domain: manager.config.Domain} if manager.config.CookieLifeTime > 0 { cookie.MaxAge = manager.config.CookieLifeTime @@ -233,7 +233,7 @@ func (manager *Manager) SessionRegenerateId(w http.ResponseWriter, r *http.Reque Value: url.QueryEscape(sid), Path: "/", HttpOnly: true, - Secure: manager.config.Secure, + Secure: manager.isSecure(r), Domain: manager.config.Domain, } } else { @@ -270,3 +270,17 @@ func (manager *Manager) sessionId(r *http.Request) (string, error) { } return hex.EncodeToString(b), nil } + +// Set cookie with https. +func (manager *Manager) isSecure(req *http.Request) bool { + if !manager.config.Secure { + return false + } + if req.URL.Scheme != "" { + return req.URL.Scheme == "https" + } + if req.TLS == nil { + return false + } + return true +} From 9bb985515370a3cd577f4097b60fa35dfd46dca3 Mon Sep 17 00:00:00 2001 From: ziyel Date: Mon, 18 May 2015 14:42:18 +0800 Subject: [PATCH 055/436] Let filter function get more params info from ctx.Input.Params --- router.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/router.go b/router.go index b9d649a2..232f67d2 100644 --- a/router.go +++ b/router.go @@ -612,6 +612,9 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) if l, ok := p.filters[pos]; ok { for _, filterR := range l { if ok, p := filterR.ValidRouter(urlPath); ok { + for k, v := range context.Input.Params { + p[k] = v + } context.Input.Params = p filterR.filterFunc(context) if filterR.returnOnOutput && w.started { From 185089299cfac2cf66b90d8acfb62b0cbce1d9b1 Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 20 May 2015 11:07:23 +0800 Subject: [PATCH 056/436] sync beeApp.Server to graceful --- app.go | 11 +++++++---- grace/grace.go | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app.go b/app.go index 4740e7e5..6c1eeab6 100644 --- a/app.go +++ b/app.go @@ -78,15 +78,19 @@ func (app *App) Run() { } } else { if Graceful { + app.Server.Addr = addr + app.Server.Handler = app.Handlers + app.Server.ReadTimeout = time.Duration(HttpServerTimeOut) * time.Second + app.Server.WriteTimeout = time.Duration(HttpServerTimeOut) * time.Second if EnableHttpTLS { go func() { time.Sleep(20 * time.Microsecond) if HttpsPort != 0 { addr = fmt.Sprintf("%s:%d", HttpAddr, HttpsPort) + app.Server.Addr = addr } server := grace.NewServer(addr, app.Handlers) - server.Server.ReadTimeout = time.Duration(HttpServerTimeOut) * time.Second - server.Server.WriteTimeout = time.Duration(HttpServerTimeOut) * time.Second + server.Server = app.Server err := server.ListenAndServeTLS(HttpCertFile, HttpKeyFile) if err != nil { BeeLogger.Critical("ListenAndServeTLS: ", err) @@ -98,8 +102,7 @@ func (app *App) Run() { if EnableHttpListen { go func() { server := grace.NewServer(addr, app.Handlers) - server.Server.ReadTimeout = time.Duration(HttpServerTimeOut) * time.Second - server.Server.WriteTimeout = time.Duration(HttpServerTimeOut) * time.Second + server.Server = app.Server if ListenTCP4 && HttpAddr == "" { server.Network = "tcp4" } diff --git a/grace/grace.go b/grace/grace.go index e77112d0..33053c4b 100644 --- a/grace/grace.go +++ b/grace/grace.go @@ -99,7 +99,7 @@ func init() { } type graceServer struct { - http.Server + *http.Server GraceListener net.Listener SignalHooks map[int]map[os.Signal][]func() tlsInnerListener *graceListener @@ -151,7 +151,7 @@ func NewServer(addr string, handler http.Handler) (srv *graceServer) { state: STATE_INIT, Network: "tcp", } - + srv.Server = &http.Server{} srv.Server.Addr = addr srv.Server.ReadTimeout = DefaultReadTimeOut srv.Server.WriteTimeout = DefaultWriteTimeOut From 92f3de40275ed9ce9a35da44c146db31fa74faa2 Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 20 May 2015 11:09:30 +0800 Subject: [PATCH 057/436] update the string --- admin.go | 2 +- app.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin.go b/admin.go index 52388c76..64d7fe34 100644 --- a/admin.go +++ b/admin.go @@ -468,6 +468,6 @@ func (admin *adminApp) Run() { err = http.ListenAndServe(addr, nil) } if err != nil { - BeeLogger.Critical("Admin ListenAndServe: ", err, fmt.Sprint(os.Getpid())) + BeeLogger.Critical("Admin ListenAndServe: ", err, fmt.Sprintf("%d", os.Getpid())) } } diff --git a/app.go b/app.go index 6c1eeab6..8fc320ad 100644 --- a/app.go +++ b/app.go @@ -93,7 +93,7 @@ func (app *App) Run() { server.Server = app.Server err := server.ListenAndServeTLS(HttpCertFile, HttpKeyFile) if err != nil { - BeeLogger.Critical("ListenAndServeTLS: ", err) + BeeLogger.Critical("ListenAndServeTLS: ", err, fmt.Sprintf("%d", os.Getpid())) time.Sleep(100 * time.Microsecond) endRunning <- true } @@ -108,7 +108,7 @@ func (app *App) Run() { } err := server.ListenAndServe() if err != nil { - BeeLogger.Critical("ListenAndServe: ", err, fmt.Sprint(os.Getpid())) + BeeLogger.Critical("ListenAndServe: ", err, fmt.Sprintf("%d", os.Getpid())) time.Sleep(100 * time.Microsecond) endRunning <- true } From b1efae6ff8682d1ed4c98cbab4241729375e1a92 Mon Sep 17 00:00:00 2001 From: Liu Peng Date: Sun, 24 May 2015 23:59:39 +0800 Subject: [PATCH 058/436] add missed LICENSE of captcha --- utils/captcha/LICENSE | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 utils/captcha/LICENSE diff --git a/utils/captcha/LICENSE b/utils/captcha/LICENSE new file mode 100644 index 00000000..0ad73ae0 --- /dev/null +++ b/utils/captcha/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2011-2014 Dmitry Chestnykh + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. From bf6b0d3e1ff4275d7ec325ffb27ecd855315886f Mon Sep 17 00:00:00 2001 From: Hubery Date: Fri, 6 Mar 2015 14:12:24 +0800 Subject: [PATCH 059/436] add JsonBody --- httplib/httplib.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/httplib/httplib.go b/httplib/httplib.go index 7ff2f1d2..bd8bc776 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -253,6 +253,22 @@ func (b *BeegoHttpRequest) Body(data interface{}) *BeegoHttpRequest { return b } + +// JsonBody adds request raw body encoding by JSON. +func (b *BeegoHttpRequest) JsonBody(obj interface{}) (*BeegoHttpRequest, error) { + if b.req.Body == nil && obj != nil { + buf := bytes.NewBuffer(nil) + enc := json.NewEncoder(buf) + if err := enc.Encode(obj); err != nil { + return b, err + } + b.req.Body = ioutil.NopCloser(buf) + b.req.ContentLength = int64(buf.Len()) + b.req.Header.Set("Content-Type", "application/json") + } + return b, nil +} + func (b *BeegoHttpRequest) buildUrl(paramBody string) { // build GET url with query string if b.req.Method == "GET" && len(paramBody) > 0 { From 1592e9c04dd73e26fb35cab9e9370f89b414c8c8 Mon Sep 17 00:00:00 2001 From: supiyun Date: Mon, 16 Mar 2015 17:40:55 +0800 Subject: [PATCH 060/436] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81reload?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当页面放置一段时间，验证码将从缓存中失效。当用户再来刷新验证码将出现验证码404。对于reload操作应该直接生成验证码。 --- utils/captcha/captcha.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/utils/captcha/captcha.go b/utils/captcha/captcha.go index 62adc81d..14c6c3b3 100644 --- a/utils/captcha/captcha.go +++ b/utils/captcha/captcha.go @@ -132,15 +132,6 @@ func (c *Captcha) Handler(ctx *context.Context) { key := c.key(id) - if v, ok := c.store.Get(key).([]byte); ok { - chars = v - } else { - ctx.Output.SetStatus(404) - ctx.WriteString("captcha not found") - return - } - - // reload captcha if len(ctx.Input.Query("reload")) > 0 { chars = c.genRandChars() if err := c.store.Put(key, chars, c.Expiration); err != nil { @@ -149,6 +140,14 @@ func (c *Captcha) Handler(ctx *context.Context) { beego.Error("Reload Create Captcha Error:", err) return } + } else { + if v, ok := c.store.Get(key).([]byte); ok { + chars = v + } else { + ctx.Output.SetStatus(404) + ctx.WriteString("captcha not found") + return + } } img := NewImage(chars, c.StdWidth, c.StdHeight) From 1d8afdc9c9677615f241dda3ebe1d2604e44f5de Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 19 Mar 2015 22:29:01 -0700 Subject: [PATCH 061/436] gofmt -s & go_vet --- cache/memory.go | 2 +- orm/db.go | 12 +- orm/models_test.go | 8 +- orm/orm_raw.go | 4 +- orm/orm_test.go | 32 +-- orm/utils.go | 4 +- router.go | 6 +- session/memcache/sess_memcache.go | 1 - session/sess_mem.go | 398 +++++++++++++++--------------- utils/mail.go | 2 +- utils/pagination/paginator.go | 6 +- utils/slice.go | 2 +- validation/util.go | 2 +- 13 files changed, 239 insertions(+), 240 deletions(-) diff --git a/cache/memory.go b/cache/memory.go index b90d227c..0233be7d 100644 --- a/cache/memory.go +++ b/cache/memory.go @@ -202,7 +202,7 @@ func (bc *MemoryCache) vaccuum() { if bc.items == nil { return } - for name, _ := range bc.items { + for name := range bc.items { bc.item_expired(name) } } diff --git a/orm/db.go b/orm/db.go index 10f65fee..060d83bc 100644 --- a/orm/db.go +++ b/orm/db.go @@ -324,7 +324,7 @@ func (d *dbBase) Read(q dbQuerier, mi *modelInfo, ind reflect.Value, tz *time.Lo query := fmt.Sprintf("SELECT %s%s%s FROM %s%s%s WHERE %s%s%s = ?", Q, sels, Q, Q, mi.table, Q, Q, wheres, Q) refs := make([]interface{}, colsNum) - for i, _ := range refs { + for i := range refs { var ref interface{} refs[i] = &ref } @@ -423,7 +423,7 @@ func (d *dbBase) InsertValue(q dbQuerier, mi *modelInfo, isMulti bool, names []s Q := d.ins.TableQuote() marks := make([]string, len(names)) - for i, _ := range marks { + for i := range marks { marks[i] = "?" } @@ -693,7 +693,7 @@ func (d *dbBase) DeleteBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Con } marks := make([]string, len(args)) - for i, _ := range marks { + for i := range marks { marks[i] = "?" } sql := fmt.Sprintf("IN (%s)", strings.Join(marks, ", ")) @@ -824,7 +824,7 @@ func (d *dbBase) ReadBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condi } refs := make([]interface{}, colsNum) - for i, _ := range refs { + for i := range refs { var ref interface{} refs[i] = &ref } @@ -964,7 +964,7 @@ func (d *dbBase) GenerateOperatorSql(mi *modelInfo, fi *fieldInfo, operator stri switch operator { case "in": marks := make([]string, len(params)) - for i, _ := range marks { + for i := range marks { marks[i] = "?" } sql = fmt.Sprintf("IN (%s)", strings.Join(marks, ", ")) @@ -1460,7 +1460,7 @@ func (d *dbBase) ReadValues(q dbQuerier, qs *querySet, mi *modelInfo, cond *Cond } refs := make([]interface{}, len(cols)) - for i, _ := range refs { + for i := range refs { var ref interface{} refs[i] = &ref } diff --git a/orm/models_test.go b/orm/models_test.go index 1a92ef5d..6ca9590c 100644 --- a/orm/models_test.go +++ b/orm/models_test.go @@ -242,14 +242,14 @@ type User struct { func (u *User) TableIndex() [][]string { return [][]string{ - []string{"Id", "UserName"}, - []string{"Id", "Created"}, + {"Id", "UserName"}, + {"Id", "Created"}, } } func (u *User) TableUnique() [][]string { return [][]string{ - []string{"UserName", "Email"}, + {"UserName", "Email"}, } } @@ -287,7 +287,7 @@ type Post struct { func (u *Post) TableIndex() [][]string { return [][]string{ - []string{"Id", "Created"}, + {"Id", "Created"}, } } diff --git a/orm/orm_raw.go b/orm/orm_raw.go index 1393d414..1452d6fc 100644 --- a/orm/orm_raw.go +++ b/orm/orm_raw.go @@ -585,7 +585,7 @@ func (o *rawSet) readValues(container interface{}, needCols []string) (int64, er cols = columns refs = make([]interface{}, len(cols)) - for i, _ := range refs { + for i := range refs { var ref sql.NullString refs[i] = &ref @@ -711,7 +711,7 @@ func (o *rawSet) queryRowsTo(container interface{}, keyCol, valueCol string) (in } else { cols = columns refs = make([]interface{}, len(cols)) - for i, _ := range refs { + for i := range refs { if keyCol == cols[i] { keyIndex = i } diff --git a/orm/orm_test.go b/orm/orm_test.go index e1c8e0f0..14eadabd 100644 --- a/orm/orm_test.go +++ b/orm/orm_test.go @@ -586,29 +586,29 @@ func TestInsertTestData(t *testing.T) { throwFail(t, AssertIs(id, 4)) tags := []*Tag{ - &Tag{Name: "golang", BestPost: &Post{Id: 2}}, - &Tag{Name: "example"}, - &Tag{Name: "format"}, - &Tag{Name: "c++"}, + {Name: "golang", BestPost: &Post{Id: 2}}, + {Name: "example"}, + {Name: "format"}, + {Name: "c++"}, } posts := []*Post{ - &Post{User: users[0], Tags: []*Tag{tags[0]}, Title: "Introduction", Content: `Go is a new language. Although it borrows ideas from existing languages, it has unusual properties that make effective Go programs different in character from programs written in its relatives. A straightforward translation of a C++ or Java program into Go is unlikely to produce a satisfactory result—Java programs are written in Java, not Go. On the other hand, thinking about the problem from a Go perspective could produce a successful but quite different program. In other words, to write Go well, it's important to understand its properties and idioms. It's also important to know the established conventions for programming in Go, such as naming, formatting, program construction, and so on, so that programs you write will be easy for other Go programmers to understand. + {User: users[0], Tags: []*Tag{tags[0]}, Title: "Introduction", Content: `Go is a new language. Although it borrows ideas from existing languages, it has unusual properties that make effective Go programs different in character from programs written in its relatives. A straightforward translation of a C++ or Java program into Go is unlikely to produce a satisfactory result—Java programs are written in Java, not Go. On the other hand, thinking about the problem from a Go perspective could produce a successful but quite different program. In other words, to write Go well, it's important to understand its properties and idioms. It's also important to know the established conventions for programming in Go, such as naming, formatting, program construction, and so on, so that programs you write will be easy for other Go programmers to understand. This document gives tips for writing clear, idiomatic Go code. It augments the language specification, the Tour of Go, and How to Write Go Code, all of which you should read first.`}, - &Post{User: users[1], Tags: []*Tag{tags[0], tags[1]}, Title: "Examples", Content: `The Go package sources are intended to serve not only as the core library but also as examples of how to use the language. Moreover, many of the packages contain working, self-contained executable examples you can run directly from the golang.org web site, such as this one (click on the word "Example" to open it up). If you have a question about how to approach a problem or how something might be implemented, the documentation, code and examples in the library can provide answers, ideas and background.`}, - &Post{User: users[1], Tags: []*Tag{tags[0], tags[2]}, Title: "Formatting", Content: `Formatting issues are the most contentious but the least consequential. People can adapt to different formatting styles but it's better if they don't have to, and less time is devoted to the topic if everyone adheres to the same style. The problem is how to approach this Utopia without a long prescriptive style guide. + {User: users[1], Tags: []*Tag{tags[0], tags[1]}, Title: "Examples", Content: `The Go package sources are intended to serve not only as the core library but also as examples of how to use the language. Moreover, many of the packages contain working, self-contained executable examples you can run directly from the golang.org web site, such as this one (click on the word "Example" to open it up). If you have a question about how to approach a problem or how something might be implemented, the documentation, code and examples in the library can provide answers, ideas and background.`}, + {User: users[1], Tags: []*Tag{tags[0], tags[2]}, Title: "Formatting", Content: `Formatting issues are the most contentious but the least consequential. People can adapt to different formatting styles but it's better if they don't have to, and less time is devoted to the topic if everyone adheres to the same style. The problem is how to approach this Utopia without a long prescriptive style guide. With Go we take an unusual approach and let the machine take care of most formatting issues. The gofmt program (also available as go fmt, which operates at the package level rather than source file level) reads a Go program and emits the source in a standard style of indentation and vertical alignment, retaining and if necessary reformatting comments. If you want to know how to handle some new layout situation, run gofmt; if the answer doesn't seem right, rearrange your program (or file a bug about gofmt), don't work around it.`}, - &Post{User: users[2], Tags: []*Tag{tags[3]}, Title: "Commentary", Content: `Go provides C-style /* */ block comments and C++-style // line comments. Line comments are the norm; block comments appear mostly as package comments, but are useful within an expression or to disable large swaths of code. + {User: users[2], Tags: []*Tag{tags[3]}, Title: "Commentary", Content: `Go provides C-style /* */ block comments and C++-style // line comments. Line comments are the norm; block comments appear mostly as package comments, but are useful within an expression or to disable large swaths of code. The program—and web server—godoc processes Go source files to extract documentation about the contents of the package. Comments that appear before top-level declarations, with no intervening newlines, are extracted along with the declaration to serve as explanatory text for the item. The nature and style of these comments determines the quality of the documentation godoc produces.`}, } comments := []*Comment{ - &Comment{Post: posts[0], Content: "a comment"}, - &Comment{Post: posts[1], Content: "yes"}, - &Comment{Post: posts[1]}, - &Comment{Post: posts[1]}, - &Comment{Post: posts[2]}, - &Comment{Post: posts[2]}, + {Post: posts[0], Content: "a comment"}, + {Post: posts[1], Content: "yes"}, + {Post: posts[1]}, + {Post: posts[1]}, + {Post: posts[2]}, + {Post: posts[2]}, } for _, tag := range tags { @@ -1248,7 +1248,7 @@ func TestQueryM2M(t *testing.T) { post := Post{Id: 4} m2m := dORM.QueryM2M(&post, "Tags") - tag1 := []*Tag{&Tag{Name: "TestTag1"}, &Tag{Name: "TestTag2"}} + tag1 := []*Tag{{Name: "TestTag1"}, {Name: "TestTag2"}} tag2 := &Tag{Name: "TestTag3"} tag3 := []interface{}{&Tag{Name: "TestTag4"}} @@ -1311,7 +1311,7 @@ func TestQueryM2M(t *testing.T) { m2m = dORM.QueryM2M(&tag, "Posts") - post1 := []*Post{&Post{Title: "TestPost1"}, &Post{Title: "TestPost2"}} + post1 := []*Post{{Title: "TestPost1"}, {Title: "TestPost2"}} post2 := &Post{Title: "TestPost3"} post3 := []interface{}{&Post{Title: "TestPost4"}} diff --git a/orm/utils.go b/orm/utils.go index df6147c1..88168763 100644 --- a/orm/utils.go +++ b/orm/utils.go @@ -195,7 +195,7 @@ func snakeString(s string) string { } data = append(data, d) } - return strings.ToLower(string(data[:len(data)])) + return strings.ToLower(string(data[:])) } // camel string, xx_yy to XxYy @@ -220,7 +220,7 @@ func camelString(s string) string { } data = append(data, d) } - return string(data[:len(data)]) + return string(data[:]) } type argString []string diff --git a/router.go b/router.go index b9d649a2..c1bda637 100644 --- a/router.go +++ b/router.go @@ -88,7 +88,7 @@ func (l *logFilter) Filter(ctx *beecontext.Context) bool { if requestPath == "/favicon.ico" || requestPath == "/robots.txt" { return true } - for prefix, _ := range StaticDir { + for prefix := range StaticDir { if strings.HasPrefix(requestPath, prefix) { return true } @@ -171,7 +171,7 @@ func (p *ControllerRegistor) Add(pattern string, c ControllerInterface, mappingM p.addToRouter(m, pattern, route) } } else { - for k, _ := range methods { + for k := range methods { if k == "*" { for _, m := range HTTPMETHOD { p.addToRouter(m, pattern, route) @@ -332,7 +332,7 @@ func (p *ControllerRegistor) AddMethod(method, pattern string, f FilterFunc) { methods[strings.ToUpper(method)] = strings.ToUpper(method) } route.methods = methods - for k, _ := range methods { + for k := range methods { if k == "*" { for _, m := range HTTPMETHOD { p.addToRouter(m, pattern, route) diff --git a/session/memcache/sess_memcache.go b/session/memcache/sess_memcache.go index 5827a0a9..24aecb82 100644 --- a/session/memcache/sess_memcache.go +++ b/session/memcache/sess_memcache.go @@ -179,7 +179,6 @@ func (rp *MemProvider) SessionRegenerate(oldsid, sid string) (session.SessionSto } else { client.Delete(oldsid) item.Key = sid - item.Value = item.Value item.Expiration = int32(rp.maxlifetime) client.Set(item) contain = item.Value diff --git a/session/sess_mem.go b/session/sess_mem.go index 627a3246..dd066703 100644 --- a/session/sess_mem.go +++ b/session/sess_mem.go @@ -1,199 +1,199 @@ -// Copyright 2014 beego Author. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package session - -import ( - "container/list" - "net/http" - "sync" - "time" -) - -var mempder = &MemProvider{list: list.New(), sessions: make(map[string]*list.Element)} - -// memory session store. -// it saved sessions in a map in memory. -type MemSessionStore struct { - sid string //session id - timeAccessed time.Time //last access time - value map[interface{}]interface{} //session store - lock sync.RWMutex -} - -// set value to memory session -func (st *MemSessionStore) Set(key, value interface{}) error { - st.lock.Lock() - defer st.lock.Unlock() - st.value[key] = value - return nil -} - -// get value from memory session by key -func (st *MemSessionStore) Get(key interface{}) interface{} { - st.lock.RLock() - defer st.lock.RUnlock() - if v, ok := st.value[key]; ok { - return v - } else { - return nil - } -} - -// delete in memory session by key -func (st *MemSessionStore) Delete(key interface{}) error { - st.lock.Lock() - defer st.lock.Unlock() - delete(st.value, key) - return nil -} - -// clear all values in memory session -func (st *MemSessionStore) Flush() error { - st.lock.Lock() - defer st.lock.Unlock() - st.value = make(map[interface{}]interface{}) - return nil -} - -// get this id of memory session store -func (st *MemSessionStore) SessionID() string { - return st.sid -} - -// Implement method, no used. -func (st *MemSessionStore) SessionRelease(w http.ResponseWriter) { -} - -type MemProvider struct { - lock sync.RWMutex // locker - sessions map[string]*list.Element // map in memory - list *list.List // for gc - maxlifetime int64 - savePath string -} - -// init memory session -func (pder *MemProvider) SessionInit(maxlifetime int64, savePath string) error { - pder.maxlifetime = maxlifetime - pder.savePath = savePath - return nil -} - -// get memory session store by sid -func (pder *MemProvider) SessionRead(sid string) (SessionStore, error) { - pder.lock.RLock() - if element, ok := pder.sessions[sid]; ok { - go pder.SessionUpdate(sid) - pder.lock.RUnlock() - return element.Value.(*MemSessionStore), nil - } else { - pder.lock.RUnlock() - pder.lock.Lock() - newsess := &MemSessionStore{sid: sid, timeAccessed: time.Now(), value: make(map[interface{}]interface{})} - element := pder.list.PushBack(newsess) - pder.sessions[sid] = element - pder.lock.Unlock() - return newsess, nil - } -} - -// check session store exist in memory session by sid -func (pder *MemProvider) SessionExist(sid string) bool { - pder.lock.RLock() - defer pder.lock.RUnlock() - if _, ok := pder.sessions[sid]; ok { - return true - } else { - return false - } -} - -// generate new sid for session store in memory session -func (pder *MemProvider) SessionRegenerate(oldsid, sid string) (SessionStore, error) { - pder.lock.RLock() - if element, ok := pder.sessions[oldsid]; ok { - go pder.SessionUpdate(oldsid) - pder.lock.RUnlock() - pder.lock.Lock() - element.Value.(*MemSessionStore).sid = sid - pder.sessions[sid] = element - delete(pder.sessions, oldsid) - pder.lock.Unlock() - return element.Value.(*MemSessionStore), nil - } else { - pder.lock.RUnlock() - pder.lock.Lock() - newsess := &MemSessionStore{sid: sid, timeAccessed: time.Now(), value: make(map[interface{}]interface{})} - element := pder.list.PushBack(newsess) - pder.sessions[sid] = element - pder.lock.Unlock() - return newsess, nil - } -} - -// delete session store in memory session by id -func (pder *MemProvider) SessionDestroy(sid string) error { - pder.lock.Lock() - defer pder.lock.Unlock() - if element, ok := pder.sessions[sid]; ok { - delete(pder.sessions, sid) - pder.list.Remove(element) - return nil - } - return nil -} - -// clean expired session stores in memory session -func (pder *MemProvider) SessionGC() { - pder.lock.RLock() - for { - element := pder.list.Back() - if element == nil { - break - } - if (element.Value.(*MemSessionStore).timeAccessed.Unix() + pder.maxlifetime) < time.Now().Unix() { - pder.lock.RUnlock() - pder.lock.Lock() - pder.list.Remove(element) - delete(pder.sessions, element.Value.(*MemSessionStore).sid) - pder.lock.Unlock() - pder.lock.RLock() - } else { - break - } - } - pder.lock.RUnlock() -} - -// get count number of memory session -func (pder *MemProvider) SessionAll() int { - return pder.list.Len() -} - -// expand time of session store by id in memory session -func (pder *MemProvider) SessionUpdate(sid string) error { - pder.lock.Lock() - defer pder.lock.Unlock() - if element, ok := pder.sessions[sid]; ok { - element.Value.(*MemSessionStore).timeAccessed = time.Now() - pder.list.MoveToFront(element) - return nil - } - return nil -} - -func init() { - Register("memory", mempder) -} +// Copyright 2014 beego Author. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package session + +import ( + "container/list" + "net/http" + "sync" + "time" +) + +var mempder = &MemProvider{list: list.New(), sessions: make(map[string]*list.Element)} + +// memory session store. +// it saved sessions in a map in memory. +type MemSessionStore struct { + sid string //session id + timeAccessed time.Time //last access time + value map[interface{}]interface{} //session store + lock sync.RWMutex +} + +// set value to memory session +func (st *MemSessionStore) Set(key, value interface{}) error { + st.lock.Lock() + defer st.lock.Unlock() + st.value[key] = value + return nil +} + +// get value from memory session by key +func (st *MemSessionStore) Get(key interface{}) interface{} { + st.lock.RLock() + defer st.lock.RUnlock() + if v, ok := st.value[key]; ok { + return v + } else { + return nil + } +} + +// delete in memory session by key +func (st *MemSessionStore) Delete(key interface{}) error { + st.lock.Lock() + defer st.lock.Unlock() + delete(st.value, key) + return nil +} + +// clear all values in memory session +func (st *MemSessionStore) Flush() error { + st.lock.Lock() + defer st.lock.Unlock() + st.value = make(map[interface{}]interface{}) + return nil +} + +// get this id of memory session store +func (st *MemSessionStore) SessionID() string { + return st.sid +} + +// Implement method, no used. +func (st *MemSessionStore) SessionRelease(w http.ResponseWriter) { +} + +type MemProvider struct { + lock sync.RWMutex // locker + sessions map[string]*list.Element // map in memory + list *list.List // for gc + maxlifetime int64 + savePath string +} + +// init memory session +func (pder *MemProvider) SessionInit(maxlifetime int64, savePath string) error { + pder.maxlifetime = maxlifetime + pder.savePath = savePath + return nil +} + +// get memory session store by sid +func (pder *MemProvider) SessionRead(sid string) (SessionStore, error) { + pder.lock.RLock() + if element, ok := pder.sessions[sid]; ok { + go pder.SessionUpdate(sid) + pder.lock.RUnlock() + return element.Value.(*MemSessionStore), nil + } else { + pder.lock.RUnlock() + pder.lock.Lock() + newsess := &MemSessionStore{sid: sid, timeAccessed: time.Now(), value: make(map[interface{}]interface{})} + element := pder.list.PushBack(newsess) + pder.sessions[sid] = element + pder.lock.Unlock() + return newsess, nil + } +} + +// check session store exist in memory session by sid +func (pder *MemProvider) SessionExist(sid string) bool { + pder.lock.RLock() + defer pder.lock.RUnlock() + if _, ok := pder.sessions[sid]; ok { + return true + } else { + return false + } +} + +// generate new sid for session store in memory session +func (pder *MemProvider) SessionRegenerate(oldsid, sid string) (SessionStore, error) { + pder.lock.RLock() + if element, ok := pder.sessions[oldsid]; ok { + go pder.SessionUpdate(oldsid) + pder.lock.RUnlock() + pder.lock.Lock() + element.Value.(*MemSessionStore).sid = sid + pder.sessions[sid] = element + delete(pder.sessions, oldsid) + pder.lock.Unlock() + return element.Value.(*MemSessionStore), nil + } else { + pder.lock.RUnlock() + pder.lock.Lock() + newsess := &MemSessionStore{sid: sid, timeAccessed: time.Now(), value: make(map[interface{}]interface{})} + element := pder.list.PushBack(newsess) + pder.sessions[sid] = element + pder.lock.Unlock() + return newsess, nil + } +} + +// delete session store in memory session by id +func (pder *MemProvider) SessionDestroy(sid string) error { + pder.lock.Lock() + defer pder.lock.Unlock() + if element, ok := pder.sessions[sid]; ok { + delete(pder.sessions, sid) + pder.list.Remove(element) + return nil + } + return nil +} + +// clean expired session stores in memory session +func (pder *MemProvider) SessionGC() { + pder.lock.RLock() + for { + element := pder.list.Back() + if element == nil { + break + } + if (element.Value.(*MemSessionStore).timeAccessed.Unix() + pder.maxlifetime) < time.Now().Unix() { + pder.lock.RUnlock() + pder.lock.Lock() + pder.list.Remove(element) + delete(pder.sessions, element.Value.(*MemSessionStore).sid) + pder.lock.Unlock() + pder.lock.RLock() + } else { + break + } + } + pder.lock.RUnlock() +} + +// get count number of memory session +func (pder *MemProvider) SessionAll() int { + return pder.list.Len() +} + +// expand time of session store by id in memory session +func (pder *MemProvider) SessionUpdate(sid string) error { + pder.lock.Lock() + defer pder.lock.Unlock() + if element, ok := pder.sessions[sid]; ok { + element.Value.(*MemSessionStore).timeAccessed = time.Now() + pder.list.MoveToFront(element) + return nil + } + return nil +} + +func init() { + Register("memory", mempder) +} diff --git a/utils/mail.go b/utils/mail.go index aa219626..4959268c 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -292,7 +292,7 @@ func qpEscape(dest []byte, c byte) { const nums = "0123456789ABCDEF" dest[0] = '=' dest[1] = nums[(c&0xf0)>>4] - dest[2] = nums[(c&0xf)] + dest[2] = nums[(c & 0xf)] } // headerToBytes enumerates the key and values in the header, and writes the results to the IO Writer diff --git a/utils/pagination/paginator.go b/utils/pagination/paginator.go index e537f1ad..e813f798 100644 --- a/utils/pagination/paginator.go +++ b/utils/pagination/paginator.go @@ -92,18 +92,18 @@ func (p *Paginator) Pages() []int { case page >= pageNums-4 && pageNums > 9: start := pageNums - 9 + 1 pages = make([]int, 9) - for i, _ := range pages { + for i := range pages { pages[i] = start + i } case page >= 5 && pageNums > 9: start := page - 5 + 1 pages = make([]int, int(math.Min(9, float64(page+4+1)))) - for i, _ := range pages { + for i := range pages { pages[i] = start + i } default: pages = make([]int, int(math.Min(9, float64(pageNums)))) - for i, _ := range pages { + for i := range pages { pages[i] = i + 1 } } diff --git a/utils/slice.go b/utils/slice.go index 25032b7f..e413004d 100644 --- a/utils/slice.go +++ b/utils/slice.go @@ -51,7 +51,7 @@ func SliceRandList(min, max int) []int { t0 := time.Now() rand.Seed(int64(t0.Nanosecond())) list := rand.Perm(length) - for index, _ := range list { + for index := range list { list[index] += min } return list diff --git a/validation/util.go b/validation/util.go index 249462d4..367da5dc 100644 --- a/validation/util.go +++ b/validation/util.go @@ -137,7 +137,7 @@ func getRegFuncs(tag, key string) (vfs []ValidFunc, str string, err error) { if err != nil { return } - vfs = []ValidFunc{ValidFunc{"Match", []interface{}{reg, key + ".Match"}}} + vfs = []ValidFunc{{"Match", []interface{}{reg, key + ".Match"}}} str = strings.TrimSpace(tag[:index]) + strings.TrimSpace(tag[end+len("/)"):]) return } From 2e51c124f153350fca514c323c58fda022fe48b6 Mon Sep 17 00:00:00 2001 From: toalexjin Date: Wed, 25 Mar 2015 15:14:57 +0800 Subject: [PATCH 062/436] For enhancing performance, check log level before fmt.Sprintf() --- logs/log.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/logs/log.go b/logs/log.go index 32e0187c..e9d2673c 100644 --- a/logs/log.go +++ b/logs/log.go @@ -207,48 +207,72 @@ func (bl *BeeLogger) startLogger() { // Log EMERGENCY level message. func (bl *BeeLogger) Emergency(format string, v ...interface{}) { + if LevelEmergency > bl.level { + return + } msg := fmt.Sprintf("[M] "+format, v...) bl.writerMsg(LevelEmergency, msg) } // Log ALERT level message. func (bl *BeeLogger) Alert(format string, v ...interface{}) { + if LevelAlert > bl.level { + return + } msg := fmt.Sprintf("[A] "+format, v...) bl.writerMsg(LevelAlert, msg) } // Log CRITICAL level message. func (bl *BeeLogger) Critical(format string, v ...interface{}) { + if LevelCritical > bl.level { + return + } msg := fmt.Sprintf("[C] "+format, v...) bl.writerMsg(LevelCritical, msg) } // Log ERROR level message. func (bl *BeeLogger) Error(format string, v ...interface{}) { + if LevelError > bl.level { + return + } msg := fmt.Sprintf("[E] "+format, v...) bl.writerMsg(LevelError, msg) } // Log WARNING level message. func (bl *BeeLogger) Warning(format string, v ...interface{}) { + if LevelWarning > bl.level { + return + } msg := fmt.Sprintf("[W] "+format, v...) bl.writerMsg(LevelWarning, msg) } // Log NOTICE level message. func (bl *BeeLogger) Notice(format string, v ...interface{}) { + if LevelNotice > bl.level { + return + } msg := fmt.Sprintf("[N] "+format, v...) bl.writerMsg(LevelNotice, msg) } // Log INFORMATIONAL level message. func (bl *BeeLogger) Informational(format string, v ...interface{}) { + if LevelInformational > bl.level { + return + } msg := fmt.Sprintf("[I] "+format, v...) bl.writerMsg(LevelInformational, msg) } // Log DEBUG level message. func (bl *BeeLogger) Debug(format string, v ...interface{}) { + if LevelDebug > bl.level { + return + } msg := fmt.Sprintf("[D] "+format, v...) bl.writerMsg(LevelDebug, msg) } From 1a6ea693b5273111bb896bc3131e03aaaa84573e Mon Sep 17 00:00:00 2001 From: Donal Byrne Date: Wed, 25 Mar 2015 14:47:20 +0100 Subject: [PATCH 063/436] Added to input.go: AcceptHtml, AcceptsXml and AcceptsJson functions which check the header agains a regex for simpler mult-content-type handling. --- context/input.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/context/input.go b/context/input.go index f535e6a2..95f56c1f 100644 --- a/context/input.go +++ b/context/input.go @@ -21,12 +21,21 @@ import ( "net/http" "net/url" "reflect" + "regexp" "strconv" "strings" "github.com/astaxie/beego/session" ) +// Regexes for checking the accept headers +// TODO make sure these are correct +var ( + acceptsHtmlRegex = regexp.MustCompile(`(text/html|application/xhtml\+xml)(?:,|$)`) + acceptsXmlRegex = regexp.MustCompile(`(application/xml|text/xml)(?:,|$)`) + acceptsJsonRegex = regexp.MustCompile(`(application/json)(?:,|$)?`) +) + // BeegoInput operates the http request header, data, cookie and body. // it also contains router params and current session. type BeegoInput struct { @@ -163,6 +172,21 @@ func (input *BeegoInput) IsUpload() bool { return strings.Contains(input.Header("Content-Type"), "multipart/form-data") } +// Checks if request accepts html response +func (input *BeegoInput) AcceptsHtml() bool { + return acceptsHtmlRegex.MatchString(input.Header("Accept")) +} + +// Checks if request accepts xml response +func (input *BeegoInput) AcceptsXml() bool { + return acceptsXmlRegex.MatchString(input.Header("Accept")) +} + +// Checks if request accepts json response +func (input *BeegoInput) AcceptsJson() bool { + return acceptsJsonRegex.MatchString(input.Header("Accept")) +} + // IP returns request client ip. // if in proxy, return first proxy id. // if error, return 127.0.0.1. From 34940d00c0e30453ffce2af0173b694ec649de5a Mon Sep 17 00:00:00 2001 From: Donal Byrne Date: Wed, 25 Mar 2015 14:54:39 +0100 Subject: [PATCH 064/436] Remove unnecessary optional group flag '?' since has to match one of comma or end of string --- context/input.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/context/input.go b/context/input.go index 95f56c1f..24d43bbb 100644 --- a/context/input.go +++ b/context/input.go @@ -33,7 +33,7 @@ import ( var ( acceptsHtmlRegex = regexp.MustCompile(`(text/html|application/xhtml\+xml)(?:,|$)`) acceptsXmlRegex = regexp.MustCompile(`(application/xml|text/xml)(?:,|$)`) - acceptsJsonRegex = regexp.MustCompile(`(application/json)(?:,|$)?`) + acceptsJsonRegex = regexp.MustCompile(`(application/json)(?:,|$)`) ) // BeegoInput operates the http request header, data, cookie and body. From 5b1705b2d6aed081393b3fe2d51dd9dcdb28633c Mon Sep 17 00:00:00 2001 From: toalexjin Date: Thu, 26 Mar 2015 14:40:12 +0800 Subject: [PATCH 065/436] Do not check log level in writerMsg() because the check is already done outside. --- logs/log.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/logs/log.go b/logs/log.go index e9d2673c..3103ac15 100644 --- a/logs/log.go +++ b/logs/log.go @@ -148,9 +148,6 @@ func (bl *BeeLogger) DelLogger(adaptername string) error { } func (bl *BeeLogger) writerMsg(loglevel int, msg string) error { - if loglevel > bl.level { - return nil - } lm := new(logMsg) lm.level = loglevel if bl.enableFuncCallDepth { From a7e60c93dc8d785ca11cb9e12f07ef3c152b38f4 Mon Sep 17 00:00:00 2001 From: Donal Byrne Date: Thu, 26 Mar 2015 20:23:00 +0100 Subject: [PATCH 066/436] Set ErrorsMap to nil in Validation.Clear function --- validation/validation.go | 1 + 1 file changed, 1 insertion(+) diff --git a/validation/validation.go b/validation/validation.go index addf6b7e..90a757a9 100644 --- a/validation/validation.go +++ b/validation/validation.go @@ -107,6 +107,7 @@ type Validation struct { // Clean all ValidationError. func (v *Validation) Clear() { v.Errors = []*ValidationError{} + v.ErrorsMap = nil } // Has ValidationError nor not. From 91886a45477f2297750309448d527257721e9b69 Mon Sep 17 00:00:00 2001 From: pylemon Date: Fri, 27 Mar 2015 13:30:59 +0800 Subject: [PATCH 067/436] bugfix: if a form field type is bool, valid Required should always return true instead of return its value. --- validation/validators.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/validation/validators.go b/validation/validators.go index 25415bdd..725b1f7a 100644 --- a/validation/validators.go +++ b/validation/validators.go @@ -64,8 +64,8 @@ func (r Required) IsSatisfied(obj interface{}) bool { if str, ok := obj.(string); ok { return len(str) > 0 } - if b, ok := obj.(bool); ok { - return b + if _, ok := obj.(bool); ok { + return true } if i, ok := obj.(int); ok { return i != 0 From 2c9363d29b0e7d075719ad5fedeaa7d0f986bae5 Mon Sep 17 00:00:00 2001 From: pylemon Date: Fri, 27 Mar 2015 13:43:20 +0800 Subject: [PATCH 068/436] add tests to ensure bool value require test always return true. --- validation/validation_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/validation/validation_test.go b/validation/validation_test.go index be63ac93..0727fda4 100644 --- a/validation/validation_test.go +++ b/validation/validation_test.go @@ -26,6 +26,12 @@ func TestRequired(t *testing.T) { if valid.Required(nil, "nil").Ok { t.Error("nil object should be false") } + if !valid.Required(true, "bool").Ok { + t.Error("Bool value should always return true") + } + if !valid.Required(false, "bool").Ok { + t.Error("Bool value should always return true") + } if valid.Required("", "string").Ok { t.Error("\"'\" string should be false") } From 26130a5df6756673bcbb52c8b8783d77070405e8 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 30 Mar 2015 20:35:57 +0800 Subject: [PATCH 069/436] fix #1073 --- error.go | 18 +++++++++--------- router.go | 14 +++----------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/error.go b/error.go index 71be6916..6db4a5a8 100644 --- a/error.go +++ b/error.go @@ -439,24 +439,26 @@ func exception(errcode string, ctx *context.Context) { if err != nil { code = 503 } - ctx.ResponseWriter.WriteHeader(code) if h, ok := ErrorMaps[errcode]; ok { - executeError(h, ctx) + executeError(h, ctx, code) return } else if h, ok := ErrorMaps["503"]; ok { - executeError(h, ctx) + executeError(h, ctx, code) return } else { + ctx.ResponseWriter.WriteHeader(code) ctx.WriteString(errcode) } } -func executeError(err *errorInfo, ctx *context.Context) { +func executeError(err *errorInfo, ctx *context.Context, code int) { if err.errorType == errorTypeHandler { + ctx.ResponseWriter.WriteHeader(code) err.handler(ctx.ResponseWriter, ctx.Request) return } if err.errorType == errorTypeController { + ctx.Output.SetStatus(code) //Invoke the request handler vc := reflect.New(err.controllerType) execController, ok := vc.Interface().(ControllerInterface) @@ -476,11 +478,9 @@ func executeError(err *errorInfo, ctx *context.Context) { method.Call(in) //render template - if ctx.Output.Status == 0 { - if AutoRender { - if err := execController.Render(); err != nil { - panic(err) - } + if AutoRender { + if err := execController.Render(); err != nil { + panic(err) } } diff --git a/router.go b/router.go index c1bda637..e9f45615 100644 --- a/router.go +++ b/router.go @@ -862,8 +862,8 @@ func (p *ControllerRegistor) recoverPanic(context *beecontext.Context) { panic(err) } else { if ErrorsShow { - if handler, ok := ErrorMaps[fmt.Sprint(err)]; ok { - executeError(handler, context) + if _, ok := ErrorMaps[fmt.Sprint(err)]; ok { + exception(fmt.Sprint(err), context) return } } @@ -886,15 +886,7 @@ func (p *ControllerRegistor) recoverPanic(context *beecontext.Context) { } else { // in production model show all infomation if ErrorsShow { - if handler, ok := ErrorMaps[fmt.Sprint(err)]; ok { - executeError(handler, context) - return - } else if handler, ok := ErrorMaps["503"]; ok { - executeError(handler, context) - return - } else { - context.WriteString(fmt.Sprint(err)) - } + exception(fmt.Sprint(err), context) } else { Critical("the request url is ", context.Input.Url()) Critical("Handler crashed with error", err) From bb5351bb9f1bad898fd1ba1e6bbd378690a7dbbe Mon Sep 17 00:00:00 2001 From: Yongzheng Lai Date: Tue, 31 Mar 2015 12:30:47 +0800 Subject: [PATCH 070/436] Update output.go fix cookie not work in IE --- context/output.go | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/context/output.go b/context/output.go index 2141513d..f981df50 100644 --- a/context/output.go +++ b/context/output.go @@ -98,28 +98,30 @@ func (output *BeegoOutput) Body(content []byte) { func (output *BeegoOutput) Cookie(name string, value string, others ...interface{}) { var b bytes.Buffer fmt.Fprintf(&b, "%s=%s", sanitizeName(name), sanitizeValue(value)) - if len(others) > 0 { - switch v := others[0].(type) { - case int: - if v > 0 { - fmt.Fprintf(&b, "; Max-Age=%d", v) - } else if v < 0 { - fmt.Fprintf(&b, "; Max-Age=0") - } - case int64: - if v > 0 { - fmt.Fprintf(&b, "; Max-Age=%d", v) - } else if v < 0 { - fmt.Fprintf(&b, "; Max-Age=0") - } - case int32: - if v > 0 { - fmt.Fprintf(&b, "; Max-Age=%d", v) - } else if v < 0 { - fmt.Fprintf(&b, "; Max-Age=0") - } - } - } + + //fix cookie not work in IE + if len(others) > 0 { + switch v := others[0].(type) { + case int: + if v > 0 { + fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v) * time.Second).UTC().Format(time.RFC1123), v) + } else if v < 0 { + fmt.Fprintf(&b, "; Max-Age=0") + } + case int64: + if v > 0 { + fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v) * time.Second).UTC().Format(time.RFC1123), v) + } else if v < 0 { + fmt.Fprintf(&b, "; Max-Age=0") + } + case int32: + if v > 0 { + fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v) * time.Second).UTC().Format(time.RFC1123), v) + } else if v < 0 { + fmt.Fprintf(&b, "; Max-Age=0") + } + } + } // the settings below // Path, Domain, Secure, HttpOnly From a311d712a51b1568bcba5c741dbaff295cbba6da Mon Sep 17 00:00:00 2001 From: Yongzheng Lai Date: Tue, 31 Mar 2015 12:36:39 +0800 Subject: [PATCH 071/436] Update output.go --- context/output.go | 1 + 1 file changed, 1 insertion(+) diff --git a/context/output.go b/context/output.go index f981df50..7edde552 100644 --- a/context/output.go +++ b/context/output.go @@ -29,6 +29,7 @@ import ( "path/filepath" "strconv" "strings" + "time" ) // BeegoOutput does work for sending response header. From c4c9a50c42432e688b789626ec3e07de07d4afe1 Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 1 Apr 2015 23:31:40 +0800 Subject: [PATCH 072/436] fix #1081 --- controller.go | 72 ++++++++++++++++++++------------------------------- 1 file changed, 28 insertions(+), 44 deletions(-) diff --git a/controller.go b/controller.go index e056f52d..81ee1230 100644 --- a/controller.go +++ b/controller.go @@ -406,106 +406,90 @@ func (c *Controller) GetStrings(key string, def ...[]string) []string { // GetInt returns input as an int or the default value while it's present and input is blank func (c *Controller) GetInt(key string, def ...int) (int, error) { - var defv int - if len(def) > 0 { - defv = def[0] - } - if strv := c.Ctx.Input.Query(key); strv != "" { return strconv.Atoi(strv) + } else if len(def) > 0 { + return def[0], nil } else { - return defv, nil + return strconv.Atoi(strv) } } // GetInt8 return input as an int8 or the default value while it's present and input is blank func (c *Controller) GetInt8(key string, def ...int8) (int8, error) { - var defv int8 - if len(def) > 0 { - defv = def[0] - } - if strv := c.Ctx.Input.Query(key); strv != "" { i64, err := strconv.ParseInt(strv, 10, 8) i8 := int8(i64) return i8, err + } else if len(def) > 0 { + return def[0], nil } else { - return defv, nil + i64, err := strconv.ParseInt(strv, 10, 8) + i8 := int8(i64) + return i8, err } } // GetInt16 returns input as an int16 or the default value while it's present and input is blank func (c *Controller) GetInt16(key string, def ...int16) (int16, error) { - var defv int16 - if len(def) > 0 { - defv = def[0] - } - if strv := c.Ctx.Input.Query(key); strv != "" { i64, err := strconv.ParseInt(strv, 10, 16) i16 := int16(i64) - return i16, err + } else if len(def) > 0 { + return def[0], nil } else { - return defv, nil + i64, err := strconv.ParseInt(strv, 10, 16) + i16 := int16(i64) + return i16, err } } // GetInt32 returns input as an int32 or the default value while it's present and input is blank func (c *Controller) GetInt32(key string, def ...int32) (int32, error) { - var defv int32 - if len(def) > 0 { - defv = def[0] - } - if strv := c.Ctx.Input.Query(key); strv != "" { i64, err := strconv.ParseInt(c.Ctx.Input.Query(key), 10, 32) i32 := int32(i64) return i32, err + } else if len(def) > 0 { + return def[0], nil } else { - return defv, nil + i64, err := strconv.ParseInt(c.Ctx.Input.Query(key), 10, 32) + i32 := int32(i64) + return i32, err } } // GetInt64 returns input value as int64 or the default value while it's present and input is blank. func (c *Controller) GetInt64(key string, def ...int64) (int64, error) { - var defv int64 - if len(def) > 0 { - defv = def[0] - } - if strv := c.Ctx.Input.Query(key); strv != "" { return strconv.ParseInt(strv, 10, 64) + } else if len(def) > 0 { + return def[0], nil } else { - return defv, nil + return strconv.ParseInt(strv, 10, 64) } } // GetBool returns input value as bool or the default value while it's present and input is blank. func (c *Controller) GetBool(key string, def ...bool) (bool, error) { - var defv bool - if len(def) > 0 { - defv = def[0] - } - if strv := c.Ctx.Input.Query(key); strv != "" { return strconv.ParseBool(strv) + } else if len(def) > 0 { + return def[0], nil } else { - return defv, nil + return strconv.ParseBool(strv) } } // GetFloat returns input value as float64 or the default value while it's present and input is blank. func (c *Controller) GetFloat(key string, def ...float64) (float64, error) { - var defv float64 - if len(def) > 0 { - defv = def[0] - } - if strv := c.Ctx.Input.Query(key); strv != "" { - return strconv.ParseFloat(c.Ctx.Input.Query(key), 64) + return strconv.ParseFloat(strv, 64) + } else if len(def) > 0 { + return def[0], nil } else { - return defv, nil + return strconv.ParseFloat(strv, 64) } } From 55b1d6a897a5da2299af7c75340bb0a4887bab39 Mon Sep 17 00:00:00 2001 From: peeped Date: Thu, 2 Apr 2015 12:07:12 +0800 Subject: [PATCH 073/436] Update validators.go edit mobile regular expression ; add 184 Section No. --- validation/validators.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validation/validators.go b/validation/validators.go index 725b1f7a..645f4ec3 100644 --- a/validation/validators.go +++ b/validation/validators.go @@ -457,7 +457,7 @@ func (b Base64) GetLimitValue() interface{} { } // just for chinese mobile phone number -var mobilePattern = regexp.MustCompile("^((\\+86)|(86))?(1(([35][0-9])|(47)|[8][012356789]))\\d{8}$") +var mobilePattern = regexp.MustCompile("^((\\+86)|(86))?(1(([35][0-9])|(47)|[8][0-9]))\\d{8}$") type Mobile struct { Match From 11483595704e452a74eddc4a400ce475983cee2f Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 2 Apr 2015 14:02:39 +0800 Subject: [PATCH 074/436] session cookie support IE --- session/session.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/session/session.go b/session/session.go index 3cbd2b05..01aae1a5 100644 --- a/session/session.go +++ b/session/session.go @@ -151,6 +151,7 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se Domain: manager.config.Domain} if manager.config.CookieLifeTime >= 0 { cookie.MaxAge = manager.config.CookieLifeTime + cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) } if manager.config.EnableSetCookie { http.SetCookie(w, cookie) @@ -177,6 +178,7 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se Domain: manager.config.Domain} if manager.config.CookieLifeTime >= 0 { cookie.MaxAge = manager.config.CookieLifeTime + cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) } if manager.config.EnableSetCookie { http.SetCookie(w, cookie) From fd610d67778141210bfdcc299f6b4cfaf6751901 Mon Sep 17 00:00:00 2001 From: Yongzheng Lai Date: Fri, 3 Apr 2015 17:41:09 +0800 Subject: [PATCH 075/436] Update session.go move expire in line 154 to 247, because it will cause session_cookie not writen to explorer --- session/session.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/session/session.go b/session/session.go index 01aae1a5..35561242 100644 --- a/session/session.go +++ b/session/session.go @@ -151,7 +151,6 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se Domain: manager.config.Domain} if manager.config.CookieLifeTime >= 0 { cookie.MaxAge = manager.config.CookieLifeTime - cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) } if manager.config.EnableSetCookie { http.SetCookie(w, cookie) @@ -245,6 +244,7 @@ func (manager *Manager) SessionRegenerateId(w http.ResponseWriter, r *http.Reque } if manager.config.CookieLifeTime >= 0 { cookie.MaxAge = manager.config.CookieLifeTime + cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) } http.SetCookie(w, cookie) r.AddCookie(cookie) From 322b208566b1387df454a4fbe2ab5ba367bfa007 Mon Sep 17 00:00:00 2001 From: Yongzheng Lai Date: Sat, 4 Apr 2015 00:44:22 +0800 Subject: [PATCH 076/436] Update session.go remove = in if statement --- session/session.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/session/session.go b/session/session.go index 35561242..4214320c 100644 --- a/session/session.go +++ b/session/session.go @@ -149,8 +149,9 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se HttpOnly: true, Secure: manager.config.Secure, Domain: manager.config.Domain} - if manager.config.CookieLifeTime >= 0 { + if manager.config.CookieLifeTime > 0 { cookie.MaxAge = manager.config.CookieLifeTime + cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) } if manager.config.EnableSetCookie { http.SetCookie(w, cookie) @@ -175,7 +176,7 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se HttpOnly: true, Secure: manager.config.Secure, Domain: manager.config.Domain} - if manager.config.CookieLifeTime >= 0 { + if manager.config.CookieLifeTime > 0 { cookie.MaxAge = manager.config.CookieLifeTime cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) } @@ -242,7 +243,7 @@ func (manager *Manager) SessionRegenerateId(w http.ResponseWriter, r *http.Reque cookie.HttpOnly = true cookie.Path = "/" } - if manager.config.CookieLifeTime >= 0 { + if manager.config.CookieLifeTime > 0 { cookie.MaxAge = manager.config.CookieLifeTime cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) } From 8cc57e2fc8928c52b154b063bf70fb452c5b1eb2 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 5 Apr 2015 23:11:50 +0800 Subject: [PATCH 077/436] fix #1112 --- tree.go | 42 +++++++++++++++++++++++------------------- tree_test.go | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 19 deletions(-) diff --git a/tree.go b/tree.go index 93e87470..e0d9c1c2 100644 --- a/tree.go +++ b/tree.go @@ -70,18 +70,23 @@ func (t *Tree) addtree(segments []string, tree *Tree, wildcards []string, reg st } else { regexpStr = "/" + regexpStr } - } else { - for _, w := range wildcards { - if w == "." || w == ":" { - continue + } else if reg != "" { + if seg == "*.*" { + regexpStr = "([^.]+).(.+)" + } else { + for _, w := range params { + if w == "." || w == ":" { + continue + } + regexpStr = "([^/]+)/" + regexpStr } - regexpStr = "([^/]+)/" + regexpStr } } - reg = strings.Trim(reg+regexpStr, "/") + reg = strings.Trim(reg+"/"+regexpStr, "/") filterTreeWithPrefix(tree, append(wildcards, params...), reg) t.wildcard = tree } else { + reg = strings.Trim(reg+"/"+regexpStr, "/") filterTreeWithPrefix(tree, append(wildcards, params...), reg) t.fixrouters[seg] = tree } @@ -104,23 +109,23 @@ func (t *Tree) addtree(segments []string, tree *Tree, wildcards []string, reg st rr = rr + "([^/]+)/" } } - regexpStr = rr + regexpStr + "/" + regexpStr = rr + regexpStr } else { - regexpStr = "/" + regexpStr + "/" + regexpStr = "/" + regexpStr } - } else { - for _, w := range wildcards { - if w == "." || w == ":" { - continue - } - if w == ":splat" { - regexpStr = "(.+)/" + regexpStr - } else { + } else if reg != "" { + if seg == "*.*" { + regexpStr = "([^.]+).(.+)" + } else { + for _, w := range params { + if w == "." || w == ":" { + continue + } regexpStr = "([^/]+)/" + regexpStr } } } - reg = reg + regexpStr + reg = strings.TrimRight(strings.TrimRight(reg, "/")+"/"+regexpStr, "/") t.wildcard.addtree(segments[1:], tree, append(wildcards, params...), reg) } else { subTree := NewTree() @@ -140,7 +145,7 @@ func filterTreeWithPrefix(t *Tree, wildcards []string, reg string) { if reg != "" { if l.regexps != nil { l.wildcards = append(wildcards, l.wildcards...) - l.regexps = regexp.MustCompile("^" + reg + strings.Trim(l.regexps.String(), "^$") + "$") + l.regexps = regexp.MustCompile("^" + reg + "/" + strings.Trim(l.regexps.String(), "^$") + "$") } else { for _, v := range l.wildcards { if v == ":" || v == "." { @@ -248,7 +253,6 @@ func (t *Tree) addseg(segments []string, route interface{}, wildcards []string, regexpStr = "/([^/]+)" + regexpStr } } - } t.wildcard.addseg(segments[1:], route, append(wildcards, params...), reg+regexpStr) } else { diff --git a/tree_test.go b/tree_test.go index fa289716..1d2890e1 100644 --- a/tree_test.go +++ b/tree_test.go @@ -148,6 +148,50 @@ func TestAddTree2(t *testing.T) { } } +func TestAddTree3(t *testing.T) { + tr := NewTree() + tr.AddRouter("/create", "astaxie") + tr.AddRouter("/shop/:sd/account", "astaxie") + t3 := NewTree() + t3.AddTree("/table/:num", tr) + obj, param := t3.Match("/table/123/shop/123/account") + if obj == nil || obj.(string) != "astaxie" { + t.Fatal("/table/:num/shop/:sd/account can't get obj ") + } + if param == nil { + t.Fatal("get param error") + } + if param[":num"] != "123" || param[":sd"] != "123" { + t.Fatal("get :num :sd param error") + } + obj, param = t3.Match("/table/123/create") + if obj == nil || obj.(string) != "astaxie" { + t.Fatal("/table/:num/create can't get obj ") + } +} + +func TestAddTree4(t *testing.T) { + tr := NewTree() + tr.AddRouter("/create", "astaxie") + tr.AddRouter("/shop/:sd/:account", "astaxie") + t4 := NewTree() + t4.AddTree("/:info:int/:num/:id", tr) + obj, param := t4.Match("/12/123/456/shop/123/account") + if obj == nil || obj.(string) != "astaxie" { + t.Fatal("/:info:int/:num/:id/shop/:sd/:account can't get obj ") + } + if param == nil { + t.Fatal("get param error") + } + if param[":info"] != "12" || param[":num"] != "123" || param[":id"] != "456" || param[":sd"] != "123" || param[":account"] != "account" { + t.Fatal("get :info :num :id :sd :account param error") + } + obj, param = t4.Match("/12/123/456/create") + if obj == nil || obj.(string) != "astaxie" { + t.Fatal("/:info:int/:num/:id/create can't get obj ") + } +} + func TestSplitPath(t *testing.T) { a := splitPath("") if len(a) != 0 { From 2ba12ad1e155b108853bcc10fbf8be3fa052a02a Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 5 Apr 2015 23:21:13 +0800 Subject: [PATCH 078/436] config read and set support Runmode --- config.go | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/config.go b/config.go index f326ad22..a649eaa8 100644 --- a/config.go +++ b/config.go @@ -98,6 +98,10 @@ func newAppConfig(AppConfigProvider, AppConfigPath string) (*beegoAppConfig, err } func (b *beegoAppConfig) Set(key, val string) error { + err := b.innerConfig.Set(RunMode+"::"+key, val) + if err == nil { + return err + } return b.innerConfig.Set(key, val) } @@ -150,26 +154,50 @@ func (b *beegoAppConfig) Float(key string) (float64, error) { } func (b *beegoAppConfig) DefaultString(key string, defaultval string) string { + v := b.String(key) + if v != "" { + return v + } return b.innerConfig.DefaultString(key, defaultval) } func (b *beegoAppConfig) DefaultStrings(key string, defaultval []string) []string { + v := b.Strings(key) + if len(v) != 0 { + return v + } return b.innerConfig.DefaultStrings(key, defaultval) } func (b *beegoAppConfig) DefaultInt(key string, defaultval int) int { + v, err := b.Int(key) + if err == nil { + return v + } return b.innerConfig.DefaultInt(key, defaultval) } func (b *beegoAppConfig) DefaultInt64(key string, defaultval int64) int64 { + v, err := b.Int64(key) + if err == nil { + return v + } return b.innerConfig.DefaultInt64(key, defaultval) } func (b *beegoAppConfig) DefaultBool(key string, defaultval bool) bool { + v, err := b.Bool(key) + if err == nil { + return v + } return b.innerConfig.DefaultBool(key, defaultval) } func (b *beegoAppConfig) DefaultFloat(key string, defaultval float64) float64 { + v, err := b.Float(key) + if err == nil { + return v + } return b.innerConfig.DefaultFloat(key, defaultval) } From d446b5b011f4f53e8a3793f2f39c593108187c12 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 5 Apr 2015 23:23:35 +0800 Subject: [PATCH 079/436] improve the defaultval --- config.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config.go b/config.go index a649eaa8..b22db163 100644 --- a/config.go +++ b/config.go @@ -158,7 +158,7 @@ func (b *beegoAppConfig) DefaultString(key string, defaultval string) string { if v != "" { return v } - return b.innerConfig.DefaultString(key, defaultval) + return defaultval } func (b *beegoAppConfig) DefaultStrings(key string, defaultval []string) []string { @@ -166,7 +166,7 @@ func (b *beegoAppConfig) DefaultStrings(key string, defaultval []string) []strin if len(v) != 0 { return v } - return b.innerConfig.DefaultStrings(key, defaultval) + return defaultval } func (b *beegoAppConfig) DefaultInt(key string, defaultval int) int { @@ -174,7 +174,7 @@ func (b *beegoAppConfig) DefaultInt(key string, defaultval int) int { if err == nil { return v } - return b.innerConfig.DefaultInt(key, defaultval) + return defaultval } func (b *beegoAppConfig) DefaultInt64(key string, defaultval int64) int64 { @@ -182,7 +182,7 @@ func (b *beegoAppConfig) DefaultInt64(key string, defaultval int64) int64 { if err == nil { return v } - return b.innerConfig.DefaultInt64(key, defaultval) + return defaultval } func (b *beegoAppConfig) DefaultBool(key string, defaultval bool) bool { @@ -190,7 +190,7 @@ func (b *beegoAppConfig) DefaultBool(key string, defaultval bool) bool { if err == nil { return v } - return b.innerConfig.DefaultBool(key, defaultval) + return defaultval } func (b *beegoAppConfig) DefaultFloat(key string, defaultval float64) float64 { @@ -198,7 +198,7 @@ func (b *beegoAppConfig) DefaultFloat(key string, defaultval float64) float64 { if err == nil { return v } - return b.innerConfig.DefaultFloat(key, defaultval) + return defaultval } func (b *beegoAppConfig) DIY(key string) (interface{}, error) { From 676595213ffc94d6bac1cc295a4818d40ea2a565 Mon Sep 17 00:00:00 2001 From: Lionel Lee Date: Tue, 7 Apr 2015 10:35:18 +0800 Subject: [PATCH 080/436] fix a comment error. --- context/input.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/context/input.go b/context/input.go index 24d43bbb..1985df21 100644 --- a/context/input.go +++ b/context/input.go @@ -330,7 +330,7 @@ func (input *BeegoInput) ParseFormOrMulitForm(maxMemory int64) error { // Bind data from request.Form[key] to dest // like /?id=123&isok=true&ft=1.2&ol[0]=1&ol[1]=2&ul[]=str&ul[]=array&user.Name=astaxie // var id int beegoInput.Bind(&id, "id") id ==123 -// var isok bool beegoInput.Bind(&isok, "isok") id ==true +// var isok bool beegoInput.Bind(&isok, "isok") isok ==true // var ft float64 beegoInput.Bind(&ft, "ft") ft ==1.2 // ol := make([]int, 0, 2) beegoInput.Bind(&ol, "ol") ol ==[1 2] // ul := make([]string, 0, 2) beegoInput.Bind(&ul, "ul") ul ==[str array] From d7791ba837971e9527f5be99b88d84bebdef579f Mon Sep 17 00:00:00 2001 From: peeped Date: Tue, 7 Apr 2015 17:48:51 +0800 Subject: [PATCH 081/436] Update validators.go MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit //176 中国联通 //177 中国电信 //145 中国联通 //147 中国移动 //149 中国电信 --- validation/validators.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validation/validators.go b/validation/validators.go index 645f4ec3..61b0414a 100644 --- a/validation/validators.go +++ b/validation/validators.go @@ -457,7 +457,7 @@ func (b Base64) GetLimitValue() interface{} { } // just for chinese mobile phone number -var mobilePattern = regexp.MustCompile("^((\\+86)|(86))?(1(([35][0-9])|(47)|[8][0-9]))\\d{8}$") +var mobilePattern = regexp.MustCompile("^((\\+86)|(86))?(1(([35][0-9])|[8][0-9]|[7][67]|[4][579]))\\d{8}$") type Mobile struct { Match From 23457ed2a03a27b4be642dfc828fa6972ff5a98c Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 8 Apr 2015 20:12:10 +0800 Subject: [PATCH 082/436] add sethost --- httplib/httplib.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index bd8bc776..bdd2d65a 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -184,6 +184,12 @@ func (b *BeegoHttpRequest) Header(key, value string) *BeegoHttpRequest { return b } +// Set HOST +func (b *BeegoHttpRequest) SetHost(host string) *BeegoHttpRequest { + b.req.Host = host + return b +} + // Set the protocol version for incoming requests. // Client requests always use HTTP/1.1. func (b *BeegoHttpRequest) SetProtocolVersion(vers string) *BeegoHttpRequest { @@ -253,7 +259,6 @@ func (b *BeegoHttpRequest) Body(data interface{}) *BeegoHttpRequest { return b } - // JsonBody adds request raw body encoding by JSON. func (b *BeegoHttpRequest) JsonBody(obj interface{}) (*BeegoHttpRequest, error) { if b.req.Body == nil && obj != nil { From d90ce1570717f574f2714e0a56d5291fc42a91c3 Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 8 Apr 2015 21:45:00 +0800 Subject: [PATCH 083/436] httplib support gzip --- httplib/httplib.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index bdd2d65a..284aef7b 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -32,6 +32,7 @@ package httplib import ( "bytes" + "compress/gzip" "crypto/tls" "encoding/json" "encoding/xml" @@ -50,7 +51,7 @@ import ( "time" ) -var defaultSetting = BeegoHttpSettings{false, "beegoServer", 60 * time.Second, 60 * time.Second, nil, nil, nil, false} +var defaultSetting = BeegoHttpSettings{false, "beegoServer", 60 * time.Second, 60 * time.Second, nil, nil, nil, false, true} var defaultCookieJar http.CookieJar var settingMutex sync.Mutex @@ -122,6 +123,7 @@ type BeegoHttpSettings struct { Proxy func(*http.Request) (*url.URL, error) Transport http.RoundTripper EnableCookie bool + Gzip bool } // BeegoHttpRequest provides more useful methods for requesting one url than http.Request. @@ -434,7 +436,15 @@ func (b *BeegoHttpRequest) Bytes() ([]byte, error) { return nil, nil } defer resp.Body.Close() - b.body, err = ioutil.ReadAll(resp.Body) + if b.setting.Gzip && resp.Header.Get("Content-Encoding") == "gzip" { + reader, err := gzip.NewReader(resp.Body) + if err != nil { + return nil, err + } + b.body, err = ioutil.ReadAll(reader) + } else { + b.body, err = ioutil.ReadAll(resp.Body) + } if err != nil { return nil, err } From 743628a946f0ddf410e668c1d166260a32d30151 Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 8 Apr 2015 22:58:37 +0800 Subject: [PATCH 084/436] add DumpRequest --- httplib/httplib.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/httplib/httplib.go b/httplib/httplib.go index 284aef7b..aba7f534 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -167,6 +167,11 @@ func (b *BeegoHttpRequest) Debug(isdebug bool) *BeegoHttpRequest { return b } +// return the DumpRequest +func (b *BeegoHttpRequest) DumpRequest() { + return httputil.DumpRequest(b.req, true) +} + // SetTimeout sets connect time out and read-write time out for BeegoRequest. func (b *BeegoHttpRequest) SetTimeout(connectTimeout, readWriteTimeout time.Duration) *BeegoHttpRequest { b.setting.ConnectTimeout = connectTimeout From 6f802b0a05bef883e5d8398b44ec8aea3968a473 Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 8 Apr 2015 23:00:08 +0800 Subject: [PATCH 085/436] fix the params --- httplib/httplib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index aba7f534..57d3de61 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -168,7 +168,7 @@ func (b *BeegoHttpRequest) Debug(isdebug bool) *BeegoHttpRequest { } // return the DumpRequest -func (b *BeegoHttpRequest) DumpRequest() { +func (b *BeegoHttpRequest) DumpRequest() (dump []byte, err error) { return httputil.DumpRequest(b.req, true) } From 68ccd8e5a4ea96cb3852c75d69120a61b613eda6 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 9 Apr 2015 00:11:25 +0800 Subject: [PATCH 086/436] fix the dump has no body --- httplib/httplib.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 57d3de61..f09c8509 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -135,6 +135,7 @@ type BeegoHttpRequest struct { setting BeegoHttpSettings resp *http.Response body []byte + dump []byte } // Change request settings @@ -168,8 +169,8 @@ func (b *BeegoHttpRequest) Debug(isdebug bool) *BeegoHttpRequest { } // return the DumpRequest -func (b *BeegoHttpRequest) DumpRequest() (dump []byte, err error) { - return httputil.DumpRequest(b.req, true) +func (b *BeegoHttpRequest) DumpRequest() []byte { + return b.dump } // SetTimeout sets connect time out and read-write time out for BeegoRequest. @@ -405,6 +406,7 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { if err != nil { println(err.Error()) } + b.dump = dump println(string(dump)) } From 4414659df4d6cca191154030683a3558efa4c0ed Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 9 Apr 2015 00:12:41 +0800 Subject: [PATCH 087/436] fix the init struct --- httplib/httplib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index f09c8509..8ee56bcd 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -85,7 +85,7 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest { ProtoMajor: 1, ProtoMinor: 1, } - return &BeegoHttpRequest{url, &req, map[string]string{}, map[string]string{}, defaultSetting, &resp, nil} + return &BeegoHttpRequest{url, &req, map[string]string{}, map[string]string{}, defaultSetting, &resp, nil, nil} } // Get returns *BeegoHttpRequest with GET method. From ee4fd60e4d6601db1946b22adac7f31b910df2f5 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 9 Apr 2015 00:18:02 +0800 Subject: [PATCH 088/436] no output the dump --- httplib/httplib.go | 1 - 1 file changed, 1 deletion(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 8ee56bcd..935b7a71 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -407,7 +407,6 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { println(err.Error()) } b.dump = dump - println(string(dump)) } resp, err := client.Do(b.req) From 23268b788aee1171832bbc60ea29b600111424f7 Mon Sep 17 00:00:00 2001 From: wuranbo Date: Mon, 13 Apr 2015 10:33:57 +0800 Subject: [PATCH 089/436] =?UTF-8?q?*feature)=20=E5=A2=9E=E5=8A=A0logcallde?= =?UTF-8?q?pth=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BD=BF=E5=BE=97=E8=83=BD?= =?UTF-8?q?=E7=AE=80=E5=8D=95=E5=86=8D=E6=AC=A1=E5=B0=81=E8=A3=85log?= =?UTF-8?q?=E7=B3=BB=E5=88=97=E5=87=BD=E6=95=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logs/log.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/logs/log.go b/logs/log.go index 3103ac15..5f5f1cea 100644 --- a/logs/log.go +++ b/logs/log.go @@ -181,6 +181,11 @@ func (bl *BeeLogger) SetLogFuncCallDepth(d int) { bl.loggerFuncCallDepth = d } +// get log funcCallDepth for wrapper +func (bl *BeeLogger) GetLogFuncCallDepth() int { + return bl.loggerFuncCallDepth +} + // enable log funcCallDepth func (bl *BeeLogger) EnableFuncCallDepth(b bool) { bl.enableFuncCallDepth = b From 0222b8d69336cf9903f0cdb946eb36ba3cbb80cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20V=C4=83n=20Thanh?= Date: Wed, 15 Apr 2015 17:41:41 +0700 Subject: [PATCH 090/436] fixed: when RelatedSel have multi string/relation, it only get last string --- orm/orm_queryset.go | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/orm/orm_queryset.go b/orm/orm_queryset.go index 4f5d5485..5cc47617 100644 --- a/orm/orm_queryset.go +++ b/orm/orm_queryset.go @@ -115,23 +115,21 @@ func (o querySet) OrderBy(exprs ...string) QuerySeter { // set relation model to query together. // it will query relation models and assign to parent model. func (o querySet) RelatedSel(params ...interface{}) QuerySeter { - var related []string - if len(params) == 0 { - o.relDepth = DefaultRelsDepth - } else { - for _, p := range params { - switch val := p.(type) { - case string: - related = append(o.related, val) - case int: - o.relDepth = val - default: - panic(fmt.Errorf(" wrong param kind: %v", val)) - } - } - } - o.related = related - return &o + if len(params) == 0 { + o.relDepth = DefaultRelsDepth + } else { + for _, p := range params { + switch val := p.(type) { + case string: + o.related = append(o.related, val) + case int: + o.relDepth = val + default: + panic(fmt.Errorf(" wrong param kind: %v", val)) + } + } + } + return &o } // set condition to QuerySeter. From 7e3b5e5307262978c38bf0c815beda6ad87971ac Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 19 Apr 2015 15:40:23 +0800 Subject: [PATCH 091/436] remove unreached code --- admin.go | 1 - 1 file changed, 1 deletion(-) diff --git a/admin.go b/admin.go index 90142c55..7eb07cc0 100644 --- a/admin.go +++ b/admin.go @@ -333,7 +333,6 @@ func profIndex(rw http.ResponseWriter, r *http.Request) { tmpl = template.Must(tmpl.Parse(defaultScriptsTpl)) } tmpl.Execute(rw, data) - } else { } } From 4255630564ec9041d03511c717ab09ba3142482e Mon Sep 17 00:00:00 2001 From: Wyatt Fang Date: Fri, 24 Apr 2015 10:58:46 +0800 Subject: [PATCH 092/436] add Recursively validation --- validation/validation.go | 39 +++++++++++++++++++++++++++++++++++ validation/validation_test.go | 30 +++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/validation/validation.go b/validation/validation.go index 90a757a9..864a3ab5 100644 --- a/validation/validation.go +++ b/validation/validation.go @@ -334,3 +334,42 @@ func (v *Validation) Valid(obj interface{}) (b bool, err error) { return !v.HasErrors(), nil } + +// Recursively validate a struct. +// Step1: Validate by v.Valid +// Step2: If pass on step1, then reflect obj's fields +// Step3: Do the Recursively validation to all struct or struct pointer fields +// Anonymous fields will be ignored +func (v *Validation) RecursiveValid(objc interface{}) (bool, error) { + //Step 1: validate obj itself firstly + pass, err := v.Valid(objc) + if err != nil || false == pass { + return pass, err // Stop recursive validation + } else { //pass + // Step 2: Validate struct's struct fields + objT := reflect.TypeOf(objc) + objV := reflect.ValueOf(objc) + if isStruct(objT) || isStructPtr(objT) { + + if isStructPtr(objT) { + objT = objT.Elem() + objV = objV.Elem() + } + + for i := 0; i < objT.NumField(); i++ { + + t := objT.Field(i).Type + + if isStruct(t) || isStructPtr(t) { + // Step 3: do the recursive validation + // Only valid the Public field recursively + if objV.Field(i).CanInterface() { + pass, err = v.RecursiveValid(objV.Field(i).Interface()) + } + } + } + } + + return pass, err + } +} diff --git a/validation/validation_test.go b/validation/validation_test.go index 0727fda4..d07b1435 100644 --- a/validation/validation_test.go +++ b/validation/validation_test.go @@ -349,3 +349,33 @@ func TestValid(t *testing.T) { t.Errorf("Message key should be `Name.Match` but got %s", valid.Errors[0].Key) } } + +func TestRecursiveValid(t *testing.T) { + type User struct { + Id int + Name string `valid:"Required;Match(/^(test)?\\w*@(/test/);com$/)"` + Age int `valid:"Required;Range(1, 140)"` + } + + type AnonymouseUser struct { + Id2 int + Name2 string `valid:"Required;Match(/^(test)?\\w*@(/test/);com$/)"` + Age2 int `valid:"Required;Range(1, 140)"` + } + + type Account struct { + Password string `valid:"Required"` + U User + AnonymouseUser + } + valid := Validation{} + + u := Account{Password: "abc123_", U: User{}} + b, err := valid.RecursiveValid(u) + if err != nil { + t.Fatal(err) + } + if b { + t.Error("validation should not be passed") + } +} From 74b22649c8a6c71015b56b0130cd2714678922d0 Mon Sep 17 00:00:00 2001 From: Wyatt Fang Date: Fri, 24 Apr 2015 11:14:49 +0800 Subject: [PATCH 093/436] remove the double isStruct/isStructPtr check --- validation/validation.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/validation/validation.go b/validation/validation.go index 864a3ab5..b9f001e8 100644 --- a/validation/validation.go +++ b/validation/validation.go @@ -342,6 +342,7 @@ func (v *Validation) Valid(obj interface{}) (b bool, err error) { // Anonymous fields will be ignored func (v *Validation) RecursiveValid(objc interface{}) (bool, error) { //Step 1: validate obj itself firstly + // fails if objc is not struct pass, err := v.Valid(objc) if err != nil || false == pass { return pass, err // Stop recursive validation @@ -349,23 +350,22 @@ func (v *Validation) RecursiveValid(objc interface{}) (bool, error) { // Step 2: Validate struct's struct fields objT := reflect.TypeOf(objc) objV := reflect.ValueOf(objc) - if isStruct(objT) || isStructPtr(objT) { - if isStructPtr(objT) { - objT = objT.Elem() - objV = objV.Elem() - } + if isStructPtr(objT) { + objT = objT.Elem() + objV = objV.Elem() + } - for i := 0; i < objT.NumField(); i++ { + for i := 0; i < objT.NumField(); i++ { - t := objT.Field(i).Type + t := objT.Field(i).Type - if isStruct(t) || isStructPtr(t) { - // Step 3: do the recursive validation - // Only valid the Public field recursively - if objV.Field(i).CanInterface() { - pass, err = v.RecursiveValid(objV.Field(i).Interface()) - } + // Recursive applies to struct or pointer to structs fields + if isStruct(t) || isStructPtr(t) { + // Step 3: do the recursive validation + // Only valid the Public field recursively + if objV.Field(i).CanInterface() { + pass, err = v.RecursiveValid(objV.Field(i).Interface()) } } } From dfe055c47c41ff3ac9fcbefec398aa89d7bad976 Mon Sep 17 00:00:00 2001 From: Wyatt Fang Date: Fri, 24 Apr 2015 11:17:12 +0800 Subject: [PATCH 094/436] remove useless comments --- validation/validation.go | 1 - 1 file changed, 1 deletion(-) diff --git a/validation/validation.go b/validation/validation.go index b9f001e8..d98ff190 100644 --- a/validation/validation.go +++ b/validation/validation.go @@ -339,7 +339,6 @@ func (v *Validation) Valid(obj interface{}) (b bool, err error) { // Step1: Validate by v.Valid // Step2: If pass on step1, then reflect obj's fields // Step3: Do the Recursively validation to all struct or struct pointer fields -// Anonymous fields will be ignored func (v *Validation) RecursiveValid(objc interface{}) (bool, error) { //Step 1: validate obj itself firstly // fails if objc is not struct From 3415a5b0919dfa59c8352915e38cd7566cd4c06a Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 01:23:18 +0800 Subject: [PATCH 095/436] better go style --- httplib/httplib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 935b7a71..ab734b3c 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -51,7 +51,7 @@ import ( "time" ) -var defaultSetting = BeegoHttpSettings{false, "beegoServer", 60 * time.Second, 60 * time.Second, nil, nil, nil, false, true} +var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectionTimeout: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Giz: true} var defaultCookieJar http.CookieJar var settingMutex sync.Mutex From 8e618192c226f575df7e67db99f5c4256d382498 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 02:04:34 +0800 Subject: [PATCH 096/436] better code and fixed --- httplib/httplib.go | 53 +++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index ab734b3c..ca893163 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -85,7 +85,14 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest { ProtoMajor: 1, ProtoMinor: 1, } - return &BeegoHttpRequest{url, &req, map[string]string{}, map[string]string{}, defaultSetting, &resp, nil, nil} + return &BeegoHttpRequest{ + url: url, + req: &req, + paras: map[string]string{}, + files: map[string]string{}, + setting: defaultSetting, + resp: &resp, + } } // Get returns *BeegoHttpRequest with GET method. @@ -157,14 +164,14 @@ func (b *BeegoHttpRequest) SetEnableCookie(enable bool) *BeegoHttpRequest { } // SetUserAgent sets User-Agent header field -func (b *BeegoHttpRequest) SetUserAgent(useragent string) *BeegoHttpRequest { - b.setting.UserAgent = useragent +func (b *BeegoHttpRequest) SetUserAgent(userAgent string) *BeegoHttpRequest { + b.setting.UserAgent = userAgent return b } // Debug sets show debug or not when executing request. -func (b *BeegoHttpRequest) Debug(isdebug bool) *BeegoHttpRequest { - b.setting.ShowDebug = isdebug +func (b *BeegoHttpRequest) Debug(isDebug bool) *BeegoHttpRequest { + b.setting.ShowDebug = isDebug return b } @@ -409,12 +416,8 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { b.dump = dump } - resp, err := client.Do(b.req) - if err != nil { - return nil, err - } - b.resp = resp - return resp, nil + b.resp, err = client.Do(b.req) + return b.resp, err } // String returns the body string in response. @@ -435,12 +438,9 @@ func (b *BeegoHttpRequest) Bytes() ([]byte, error) { return b.body, nil } resp, err := b.getResponse() - if err != nil { + if resp == nil || resp.Body == nil { return nil, err } - if resp.Body == nil { - return nil, nil - } defer resp.Body.Close() if b.setting.Gzip && resp.Header.Get("Content-Encoding") == "gzip" { reader, err := gzip.NewReader(resp.Body) @@ -451,29 +451,24 @@ func (b *BeegoHttpRequest) Bytes() ([]byte, error) { } else { b.body, err = ioutil.ReadAll(resp.Body) } - if err != nil { - return nil, err - } - return b.body, nil + return b.body, err } // ToFile saves the body data in response to one file. // it calls Response inner. func (b *BeegoHttpRequest) ToFile(filename string) error { + resp, err := b.getResponse() + if resp == nil || resp.Body == nil { + return err + } + defer resp.Body.Close() + f, err := os.Create(filename) if err != nil { return err } defer f.Close() - resp, err := b.getResponse() - if err != nil { - return err - } - if resp.Body == nil { - return nil - } - defer resp.Body.Close() _, err = io.Copy(f, resp.Body) return err } @@ -510,7 +505,7 @@ func TimeoutDialer(cTimeout time.Duration, rwTimeout time.Duration) func(net, ad if err != nil { return nil, err } - conn.SetDeadline(time.Now().Add(rwTimeout)) - return conn, nil + err = conn.SetDeadline(time.Now().Add(rwTimeout)) + return conn, err } } From 4cd7177ece32d0b13c1c2089bbf259b35ff947b7 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 02:05:50 +0800 Subject: [PATCH 097/436] typo fixed --- httplib/httplib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index ca893163..502ef276 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -51,7 +51,7 @@ import ( "time" ) -var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectionTimeout: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Giz: true} +var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectTimeoutt: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Gzip: true} var defaultCookieJar http.CookieJar var settingMutex sync.Mutex From 69fc22f0df1f4936a10c1f129efe6d1a9a65a094 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 02:06:19 +0800 Subject: [PATCH 098/436] typo fixed --- httplib/httplib.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 502ef276..6e0acdab 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -51,7 +51,7 @@ import ( "time" ) -var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectTimeoutt: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Gzip: true} +var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectTimeout: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Gzip: true} var defaultCookieJar http.CookieJar var settingMutex sync.Mutex @@ -88,7 +88,7 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest { return &BeegoHttpRequest{ url: url, req: &req, - paras: map[string]string{}, + params: map[string]string{}, files: map[string]string{}, setting: defaultSetting, resp: &resp, From 738e22e3899730c4bd19f684c9fd59725e93eb7a Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 02:17:46 +0800 Subject: [PATCH 099/436] zero timeout means wait until resp --- httplib/httplib.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 6e0acdab..140d541b 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -65,14 +65,8 @@ func createDefaultCookie() { // Overwrite default settings func SetDefaultSetting(setting BeegoHttpSettings) { settingMutex.Lock() - defer settingMutex.Unlock() defaultSetting = setting - if defaultSetting.ConnectTimeout == 0 { - defaultSetting.ConnectTimeout = 60 * time.Second - } - if defaultSetting.ReadWriteTimeout == 0 { - defaultSetting.ReadWriteTimeout = 60 * time.Second - } + settingMutex.Unlock() } // return *BeegoHttpRequest with specific method @@ -262,11 +256,11 @@ func (b *BeegoHttpRequest) PostFile(formname, filename string) *BeegoHttpRequest // it supports string and []byte. func (b *BeegoHttpRequest) Body(data interface{}) *BeegoHttpRequest { switch t := data.(type) { - case string: + case string: bf := bytes.NewBufferString(t) b.req.Body = ioutil.NopCloser(bf) b.req.ContentLength = int64(len(t)) - case []byte: + case []byte: bf := bytes.NewBuffer(t) b.req.Body = ioutil.NopCloser(bf) b.req.ContentLength = int64(len(t)) From 9f070c622b49ea2c6cb6f12d5751d5745e104f3e Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 02:19:38 +0800 Subject: [PATCH 100/436] no need defer here --- httplib/httplib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 140d541b..f84586a5 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -58,8 +58,8 @@ var settingMutex sync.Mutex // createDefaultCookie creates a global cookiejar to store cookies. func createDefaultCookie() { settingMutex.Lock() - defer settingMutex.Unlock() defaultCookieJar, _ = cookiejar.New(nil) + settingMutex.Unlock() } // Overwrite default settings From 6da0cdb9e20aaf21f119dabb02c96d42201c82b0 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 15:24:04 +0800 Subject: [PATCH 101/436] no need lock here --- httplib/httplib.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index f84586a5..54c70283 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -47,26 +47,20 @@ import ( "net/url" "os" "strings" - "sync" "time" ) var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectTimeout: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Gzip: true} var defaultCookieJar http.CookieJar -var settingMutex sync.Mutex // createDefaultCookie creates a global cookiejar to store cookies. func createDefaultCookie() { - settingMutex.Lock() defaultCookieJar, _ = cookiejar.New(nil) - settingMutex.Unlock() } // Overwrite default settings func SetDefaultSetting(setting BeegoHttpSettings) { - settingMutex.Lock() defaultSetting = setting - settingMutex.Unlock() } // return *BeegoHttpRequest with specific method @@ -82,7 +76,7 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest { return &BeegoHttpRequest{ url: url, req: &req, - params: map[string]string{}, + params: map[string]string{}, files: map[string]string{}, setting: defaultSetting, resp: &resp, @@ -256,11 +250,11 @@ func (b *BeegoHttpRequest) PostFile(formname, filename string) *BeegoHttpRequest // it supports string and []byte. func (b *BeegoHttpRequest) Body(data interface{}) *BeegoHttpRequest { switch t := data.(type) { - case string: + case string: bf := bytes.NewBufferString(t) b.req.Body = ioutil.NopCloser(bf) b.req.ContentLength = int64(len(t)) - case []byte: + case []byte: bf := bytes.NewBuffer(t) b.req.Body = ioutil.NopCloser(bf) b.req.ContentLength = int64(len(t)) From 51161361dbe9283797f9faeccb83981e16356432 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 15:42:10 +0800 Subject: [PATCH 102/436] more fixed --- httplib/httplib.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 54c70283..ae50791c 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -36,6 +36,7 @@ import ( "crypto/tls" "encoding/json" "encoding/xml" + "fmt" "io" "io/ioutil" "log" @@ -278,12 +279,15 @@ func (b *BeegoHttpRequest) JsonBody(obj interface{}) (*BeegoHttpRequest, error) } func (b *BeegoHttpRequest) buildUrl(paramBody string) { + if paramBody == "" { + return + } // build GET url with query string - if b.req.Method == "GET" && len(paramBody) > 0 { - if strings.Index(b.url, "?") != -1 { - b.url += "&" + paramBody - } else { + if b.req.Method == "GET" { + if strings.Index(b.url, "?") == -1 { b.url = b.url + "?" + paramBody + } else { + b.url += "&" + paramBody } return } @@ -336,18 +340,14 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { } var paramBody string if len(b.params) > 0 { - var buf bytes.Buffer for k, v := range b.params { - buf.WriteString(url.QueryEscape(k)) - buf.WriteByte('=') - buf.WriteString(url.QueryEscape(v)) - buf.WriteByte('&') + paramBody += fmt.Sprintf("&%s=%v", url.QueryEscape(k), url.QueryEscape(v)) } - paramBody = buf.String() - paramBody = paramBody[0 : len(paramBody)-1] + paramBody = paramBody[1:] } b.buildUrl(paramBody) + url, err := url.Parse(b.url) if err != nil { return nil, err @@ -399,7 +399,7 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { if b.setting.ShowDebug { dump, err := httputil.DumpRequest(b.req, true) if err != nil { - println(err.Error()) + log.Println(err.Error()) } b.dump = dump } From d8734cf58d8d7b201f4d87c6b1797701cdd15b51 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 16:08:25 +0800 Subject: [PATCH 103/436] set default timeout --- httplib/httplib.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/httplib/httplib.go b/httplib/httplib.go index ae50791c..7464c16f 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -357,6 +357,13 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { trans := b.setting.Transport + if b.setting.ConnectTimeout == 0 { + b.setting.ConnectTimeout = 30 * time.Second + } + if b.setting.ReadWriteTimeout == 0 { + b.setting.ReadWriteTimeout = 30 * time.Second + } + if trans == nil { // create default transport trans = &http.Transport{ From 3bd6caae0aa962b6a2dbf655a61f6695913f39ac Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 26 Apr 2015 16:10:18 +0800 Subject: [PATCH 104/436] set default timeout --- httplib/httplib.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 7464c16f..2389a7cb 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -358,10 +358,10 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { trans := b.setting.Transport if b.setting.ConnectTimeout == 0 { - b.setting.ConnectTimeout = 30 * time.Second + b.setting.ConnectTimeout = 60 * time.Second } if b.setting.ReadWriteTimeout == 0 { - b.setting.ReadWriteTimeout = 30 * time.Second + b.setting.ReadWriteTimeout = 60 * time.Second } if trans == nil { From 1053b63bbce1a97f494360d61020d23703132f2e Mon Sep 17 00:00:00 2001 From: cr7pt0gr4ph7 Date: Sun, 3 May 2015 23:21:32 +0200 Subject: [PATCH 105/436] Improve documentation of filter.go. --- filter.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/filter.go b/filter.go index ddd61094..f673ab66 100644 --- a/filter.go +++ b/filter.go @@ -16,11 +16,12 @@ package beego import "github.com/astaxie/beego/context" -// FilterFunc defines filter function type. +// FilterFunc defines a filter function which is invoked before the controller handler is executed. type FilterFunc func(*context.Context) -// FilterRouter defines filter operation before controller handler execution. -// it can match patterned url and do filter function when action arrives. +// FilterRouter defines a filter operation which is invoked before the controller handler is executed. +// It can match the URL against a pattern, and execute a filter function +// when a request with a matching URL arrives. type FilterRouter struct { filterFunc FilterFunc tree *Tree @@ -28,10 +29,11 @@ type FilterRouter struct { returnOnOutput bool } -// ValidRouter check current request is valid for this filter. -// if matched, returns parsed params in this request by defined filter router pattern. -func (f *FilterRouter) ValidRouter(router string) (bool, map[string]string) { - isok, params := f.tree.Match(router) +// ValidRouter checks if the current request is matched by this filter. +// If the request is matched, the values of the URL parameters defined +// by the filter pattern are also returned. +func (f *FilterRouter) ValidRouter(url string) (bool, map[string]string) { + isok, params := f.tree.Match(url) if isok == nil { return false, nil } From 9252301fa007ff126ea76da6403c9faae74e02f1 Mon Sep 17 00:00:00 2001 From: mlgd Date: Mon, 4 May 2015 15:54:03 +0200 Subject: [PATCH 106/436] Fix save config ini file --- config/ini.go | 54 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/config/ini.go b/config/ini.go index 837c9ffe..31fe9b5f 100644 --- a/config/ini.go +++ b/config/ini.go @@ -300,21 +300,8 @@ func (c *IniConfigContainer) SaveConfigFile(filename string) (err error) { defer f.Close() buf := bytes.NewBuffer(nil) - for section, dt := range c.data { - // Write section comments. - if v, ok := c.sectionComment[section]; ok { - if _, err = buf.WriteString(string(bNumComment) + v + lineBreak); err != nil { - return err - } - } - - if section != DEFAULT_SECTION { - // Write section name. - if _, err = buf.WriteString(string(sectionStart) + section + string(sectionEnd) + lineBreak); err != nil { - return err - } - } - + // Save default section at first place + if dt, ok := c.data[DEFAULT_SECTION]; ok { for key, val := range dt { if key != " " { // Write key comments. @@ -336,6 +323,43 @@ func (c *IniConfigContainer) SaveConfigFile(filename string) (err error) { return err } } + // Save named sections + for section, dt := range c.data { + if section != DEFAULT_SECTION { + // Write section comments. + if v, ok := c.sectionComment[section]; ok { + if _, err = buf.WriteString(string(bNumComment) + v + lineBreak); err != nil { + return err + } + } + + // Write section name. + if _, err = buf.WriteString(string(sectionStart) + section + string(sectionEnd) + lineBreak); err != nil { + return err + } + + for key, val := range dt { + if key != " " { + // Write key comments. + if v, ok := c.keyComment[key]; ok { + if _, err = buf.WriteString(string(bNumComment) + v + lineBreak); err != nil { + return err + } + } + + // Write key and value. + if _, err = buf.WriteString(key + string(bEqual) + val + lineBreak); err != nil { + return err + } + } + } + + // Put a line between sections. + if _, err = buf.WriteString(lineBreak); err != nil { + return err + } + } + } if _, err = buf.WriteTo(f); err != nil { return err From 18bdec951d3b735c0aefee4b8e1eafb3fecf2b4e Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 5 May 2015 21:36:31 +0800 Subject: [PATCH 107/436] fix #1143 --- error.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/error.go b/error.go index 6db4a5a8..99a1fcf3 100644 --- a/error.go +++ b/error.go @@ -92,7 +92,7 @@ func showErr(err interface{}, ctx *context.Context, Stack string) { data["Stack"] = Stack data["BeegoVersion"] = VERSION data["GoVersion"] = runtime.Version() - ctx.Output.SetStatus(500) + ctx.ResponseWriter.WriteHeader(500) t.Execute(ctx.ResponseWriter, data) } From 245762f7d968e2969dc920f63db756d74f022e76 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sat, 9 May 2015 14:54:30 +0800 Subject: [PATCH 108/436] add apk mime --- mime.go | 1 + 1 file changed, 1 insertion(+) diff --git a/mime.go b/mime.go index 155e5e12..20246c21 100644 --- a/mime.go +++ b/mime.go @@ -40,6 +40,7 @@ var mimemaps map[string]string = map[string]string{ ".ani": "application/x-navi-animation", ".aos": "application/x-nokia-9000-communicator-add-on-software", ".aps": "application/mime", + ".apk": "application/vnd.android.package-archive", ".arc": "application/x-arc-compressed", ".arj": "application/arj", ".art": "image/x-jg", From 4138fe021736d8be0d29f224acc54ab6dd1d93a4 Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 13 May 2015 21:17:47 +0800 Subject: [PATCH 109/436] beego suppot graceful restart application --- admin.go | 12 +- app.go | 133 ++++++++----- config.go | 4 + grace/grace.go | 522 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 621 insertions(+), 50 deletions(-) create mode 100644 grace/grace.go diff --git a/admin.go b/admin.go index 7eb07cc0..52388c76 100644 --- a/admin.go +++ b/admin.go @@ -19,9 +19,11 @@ import ( "encoding/json" "fmt" "net/http" + "os" "text/template" "time" + "github.com/astaxie/beego/grace" "github.com/astaxie/beego/toolbox" "github.com/astaxie/beego/utils" ) @@ -458,8 +460,14 @@ func (admin *adminApp) Run() { http.Handle(p, f) } BeeLogger.Info("Admin server Running on %s", addr) - err := http.ListenAndServe(addr, nil) + + var err error + if Graceful { + err = grace.ListenAndServe(addr, nil) + } else { + err = http.ListenAndServe(addr, nil) + } if err != nil { - BeeLogger.Critical("Admin ListenAndServe: ", err) + BeeLogger.Critical("Admin ListenAndServe: ", err, fmt.Sprint(os.Getpid())) } } diff --git a/app.go b/app.go index 35040f33..4740e7e5 100644 --- a/app.go +++ b/app.go @@ -22,6 +22,7 @@ import ( "os" "time" + "github.com/astaxie/beego/grace" "github.com/astaxie/beego/utils" ) @@ -76,57 +77,93 @@ func (app *App) Run() { err = fcgi.Serve(l, app.Handlers) } } else { - app.Server.Addr = addr - app.Server.Handler = app.Handlers - app.Server.ReadTimeout = time.Duration(HttpServerTimeOut) * time.Second - app.Server.WriteTimeout = time.Duration(HttpServerTimeOut) * time.Second + if Graceful { + if EnableHttpTLS { + go func() { + time.Sleep(20 * time.Microsecond) + if HttpsPort != 0 { + addr = fmt.Sprintf("%s:%d", HttpAddr, HttpsPort) + } + server := grace.NewServer(addr, app.Handlers) + server.Server.ReadTimeout = time.Duration(HttpServerTimeOut) * time.Second + server.Server.WriteTimeout = time.Duration(HttpServerTimeOut) * time.Second + err := server.ListenAndServeTLS(HttpCertFile, HttpKeyFile) + if err != nil { + BeeLogger.Critical("ListenAndServeTLS: ", err) + time.Sleep(100 * time.Microsecond) + endRunning <- true + } + }() + } + if EnableHttpListen { + go func() { + server := grace.NewServer(addr, app.Handlers) + server.Server.ReadTimeout = time.Duration(HttpServerTimeOut) * time.Second + server.Server.WriteTimeout = time.Duration(HttpServerTimeOut) * time.Second + if ListenTCP4 && HttpAddr == "" { + server.Network = "tcp4" + } + err := server.ListenAndServe() + if err != nil { + BeeLogger.Critical("ListenAndServe: ", err, fmt.Sprint(os.Getpid())) + time.Sleep(100 * time.Microsecond) + endRunning <- true + } + }() + } + } else { + app.Server.Addr = addr + app.Server.Handler = app.Handlers + app.Server.ReadTimeout = time.Duration(HttpServerTimeOut) * time.Second + app.Server.WriteTimeout = time.Duration(HttpServerTimeOut) * time.Second - if EnableHttpTLS { - go func() { - time.Sleep(20 * time.Microsecond) - if HttpsPort != 0 { - app.Server.Addr = fmt.Sprintf("%s:%d", HttpAddr, HttpsPort) - } - BeeLogger.Info("https server Running on %s", app.Server.Addr) - err := app.Server.ListenAndServeTLS(HttpCertFile, HttpKeyFile) - if err != nil { - BeeLogger.Critical("ListenAndServeTLS: ", err) - time.Sleep(100 * time.Microsecond) - endRunning <- true - } - }() + if EnableHttpTLS { + go func() { + time.Sleep(20 * time.Microsecond) + if HttpsPort != 0 { + app.Server.Addr = fmt.Sprintf("%s:%d", HttpAddr, HttpsPort) + } + BeeLogger.Info("https server Running on %s", app.Server.Addr) + err := app.Server.ListenAndServeTLS(HttpCertFile, HttpKeyFile) + if err != nil { + BeeLogger.Critical("ListenAndServeTLS: ", err) + time.Sleep(100 * time.Microsecond) + endRunning <- true + } + }() + } + + if EnableHttpListen { + go func() { + app.Server.Addr = addr + BeeLogger.Info("http server Running on %s", app.Server.Addr) + if ListenTCP4 && HttpAddr == "" { + ln, err := net.Listen("tcp4", app.Server.Addr) + if err != nil { + BeeLogger.Critical("ListenAndServe: ", err) + time.Sleep(100 * time.Microsecond) + endRunning <- true + return + } + err = app.Server.Serve(ln) + if err != nil { + BeeLogger.Critical("ListenAndServe: ", err) + time.Sleep(100 * time.Microsecond) + endRunning <- true + return + } + } else { + err := app.Server.ListenAndServe() + if err != nil { + BeeLogger.Critical("ListenAndServe: ", err) + time.Sleep(100 * time.Microsecond) + endRunning <- true + } + } + }() + } } - if EnableHttpListen { - go func() { - app.Server.Addr = addr - BeeLogger.Info("http server Running on %s", app.Server.Addr) - if ListenTCP4 && HttpAddr == "" { - ln, err := net.Listen("tcp4", app.Server.Addr) - if err != nil { - BeeLogger.Critical("ListenAndServe: ", err) - time.Sleep(100 * time.Microsecond) - endRunning <- true - return - } - err = app.Server.Serve(ln) - if err != nil { - BeeLogger.Critical("ListenAndServe: ", err) - time.Sleep(100 * time.Microsecond) - endRunning <- true - return - } - } else { - err := app.Server.ListenAndServe() - if err != nil { - BeeLogger.Critical("ListenAndServe: ", err) - time.Sleep(100 * time.Microsecond) - endRunning <- true - } - } - }() - } } - <-endRunning } diff --git a/config.go b/config.go index b22db163..09d0df24 100644 --- a/config.go +++ b/config.go @@ -82,6 +82,7 @@ var ( EnableDocs bool // enable generate docs & server docs API Swagger RouterCaseSensitive bool // router case sensitive default is true AccessLogs bool // print access logs, default is false + Graceful bool // use graceful start the server ) type beegoAppConfig struct { @@ -509,5 +510,8 @@ func ParseConfig() (err error) { if casesensitive, err := AppConfig.Bool("RouterCaseSensitive"); err == nil { RouterCaseSensitive = casesensitive } + if graceful, err := AppConfig.Bool("Graceful"); err == nil { + Graceful = graceful + } return nil } diff --git a/grace/grace.go b/grace/grace.go new file mode 100644 index 00000000..e77112d0 --- /dev/null +++ b/grace/grace.go @@ -0,0 +1,522 @@ +// Copyright 2014 beego Author. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// Description: http://grisha.org/blog/2014/06/03/graceful-restart-in-golang/ +// +// Usage: +// +// import( +// "log" +// "net/http" +// "os" +// +// "github.com/astaxie/beego/grace" +// ) +// +// func handler(w http.ResponseWriter, r *http.Request) { +// w.Write([]byte("WORLD!")) +// } +// +// func main() { +// mux := http.NewServeMux() +// mux.HandleFunc("/hello", handler) +// +// err := grace.ListenAndServe("localhost:8080", mux1) +// if err != nil { +// log.Println(err) +// } +// log.Println("Server on 8080 stopped") +// os.Exit(0) +// } +package grace + +import ( + "crypto/tls" + "flag" + "fmt" + "log" + "net" + "net/http" + "os" + "os/exec" + "os/signal" + "strings" + "sync" + "syscall" + "time" +) + +const ( + PRE_SIGNAL = iota + POST_SIGNAL + + STATE_INIT + STATE_RUNNING + STATE_SHUTTING_DOWN + STATE_TERMINATE +) + +var ( + regLock *sync.Mutex + runningServers map[string]*graceServer + runningServersOrder []string + socketPtrOffsetMap map[string]uint + runningServersForked bool + + DefaultReadTimeOut time.Duration + DefaultWriteTimeOut time.Duration + DefaultMaxHeaderBytes int + DefaultTimeout time.Duration + + isChild bool + socketOrder string +) + +func init() { + regLock = &sync.Mutex{} + flag.BoolVar(&isChild, "graceful", false, "listen on open fd (after forking)") + flag.StringVar(&socketOrder, "socketorder", "", "previous initialization order - used when more than one listener was started") + runningServers = make(map[string]*graceServer) + runningServersOrder = []string{} + socketPtrOffsetMap = make(map[string]uint) + + DefaultMaxHeaderBytes = 0 + + // after a restart the parent will finish ongoing requests before + // shutting down. set to a negative value to disable + DefaultTimeout = 60 * time.Second +} + +type graceServer struct { + http.Server + GraceListener net.Listener + SignalHooks map[int]map[os.Signal][]func() + tlsInnerListener *graceListener + wg sync.WaitGroup + sigChan chan os.Signal + isChild bool + state uint8 + Network string +} + +// NewServer returns an intialized graceServer. Calling Serve on it will +// actually "start" the server. +func NewServer(addr string, handler http.Handler) (srv *graceServer) { + regLock.Lock() + defer regLock.Unlock() + if !flag.Parsed() { + flag.Parse() + } + if len(socketOrder) > 0 { + for i, addr := range strings.Split(socketOrder, ",") { + socketPtrOffsetMap[addr] = uint(i) + } + } else { + socketPtrOffsetMap[addr] = uint(len(runningServersOrder)) + } + + srv = &graceServer{ + wg: sync.WaitGroup{}, + sigChan: make(chan os.Signal), + isChild: isChild, + SignalHooks: map[int]map[os.Signal][]func(){ + PRE_SIGNAL: map[os.Signal][]func(){ + syscall.SIGHUP: []func(){}, + syscall.SIGUSR1: []func(){}, + syscall.SIGUSR2: []func(){}, + syscall.SIGINT: []func(){}, + syscall.SIGTERM: []func(){}, + syscall.SIGTSTP: []func(){}, + }, + POST_SIGNAL: map[os.Signal][]func(){ + syscall.SIGHUP: []func(){}, + syscall.SIGUSR1: []func(){}, + syscall.SIGUSR2: []func(){}, + syscall.SIGINT: []func(){}, + syscall.SIGTERM: []func(){}, + syscall.SIGTSTP: []func(){}, + }, + }, + state: STATE_INIT, + Network: "tcp", + } + + srv.Server.Addr = addr + srv.Server.ReadTimeout = DefaultReadTimeOut + srv.Server.WriteTimeout = DefaultWriteTimeOut + srv.Server.MaxHeaderBytes = DefaultMaxHeaderBytes + srv.Server.Handler = handler + + runningServersOrder = append(runningServersOrder, addr) + runningServers[addr] = srv + + return +} + +// ListenAndServe listens on the TCP network address addr +// and then calls Serve to handle requests on incoming connections. +func ListenAndServe(addr string, handler http.Handler) error { + server := NewServer(addr, handler) + return server.ListenAndServe() +} + +// ListenAndServeTLS listens on the TCP network address addr and then calls +// Serve to handle requests on incoming TLS connections. +// +// Filenames containing a certificate and matching private key for the server must be provided. +// If the certificate is signed by a certificate authority, +// the certFile should be the concatenation of the server's certificate followed by the CA's certificate. +func ListenAndServeTLS(addr string, certFile string, keyFile string, handler http.Handler) error { + server := NewServer(addr, handler) + return server.ListenAndServeTLS(certFile, keyFile) +} + +// Serve accepts incoming connections on the Listener l, +// creating a new service goroutine for each. +// The service goroutines read requests and then call srv.Handler to reply to them. +func (srv *graceServer) Serve() (err error) { + srv.state = STATE_RUNNING + err = srv.Server.Serve(srv.GraceListener) + log.Println(syscall.Getpid(), "Waiting for connections to finish...") + srv.wg.Wait() + srv.state = STATE_TERMINATE + return +} + +// ListenAndServe listens on the TCP network address srv.Addr and then calls Serve +// to handle requests on incoming connections. If srv.Addr is blank, ":http" is +// used. +func (srv *graceServer) ListenAndServe() (err error) { + addr := srv.Addr + if addr == "" { + addr = ":http" + } + + go srv.handleSignals() + + l, err := srv.getListener(addr) + if err != nil { + log.Println(err) + return + } + + srv.GraceListener = newGraceListener(l, srv) + + if srv.isChild { + syscall.Kill(syscall.Getppid(), syscall.SIGTERM) + } + + log.Println(syscall.Getpid(), srv.Addr) + return srv.Serve() +} + +// ListenAndServeTLS listens on the TCP network address srv.Addr and then calls +// Serve to handle requests on incoming TLS connections. +// +// Filenames containing a certificate and matching private key for the server must +// be provided. If the certificate is signed by a certificate authority, the +// certFile should be the concatenation of the server's certificate followed by the +// CA's certificate. +// +// If srv.Addr is blank, ":https" is used. +func (srv *graceServer) ListenAndServeTLS(certFile, keyFile string) (err error) { + addr := srv.Addr + if addr == "" { + addr = ":https" + } + + config := &tls.Config{} + if srv.TLSConfig != nil { + *config = *srv.TLSConfig + } + if config.NextProtos == nil { + config.NextProtos = []string{"http/1.1"} + } + + config.Certificates = make([]tls.Certificate, 1) + config.Certificates[0], err = tls.LoadX509KeyPair(certFile, keyFile) + if err != nil { + return + } + + go srv.handleSignals() + + l, err := srv.getListener(addr) + if err != nil { + log.Println(err) + return + } + + srv.tlsInnerListener = newGraceListener(l, srv) + srv.GraceListener = tls.NewListener(srv.tlsInnerListener, config) + + if srv.isChild { + syscall.Kill(syscall.Getppid(), syscall.SIGTERM) + } + + log.Println(syscall.Getpid(), srv.Addr) + return srv.Serve() +} + +// getListener either opens a new socket to listen on, or takes the acceptor socket +// it got passed when restarted. +func (srv *graceServer) getListener(laddr string) (l net.Listener, err error) { + if srv.isChild { + var ptrOffset uint = 0 + if len(socketPtrOffsetMap) > 0 { + ptrOffset = socketPtrOffsetMap[laddr] + log.Println("laddr", laddr, "ptr offset", socketPtrOffsetMap[laddr]) + } + + f := os.NewFile(uintptr(3+ptrOffset), "") + l, err = net.FileListener(f) + if err != nil { + err = fmt.Errorf("net.FileListener error: %v", err) + return + } + } else { + l, err = net.Listen(srv.Network, laddr) + if err != nil { + err = fmt.Errorf("net.Listen error: %v", err) + return + } + } + return +} + +// handleSignals listens for os Signals and calls any hooked in function that the +// user had registered with the signal. +func (srv *graceServer) handleSignals() { + var sig os.Signal + + signal.Notify( + srv.sigChan, + syscall.SIGHUP, + syscall.SIGUSR1, + syscall.SIGUSR2, + syscall.SIGINT, + syscall.SIGTERM, + syscall.SIGTSTP, + ) + + pid := syscall.Getpid() + for { + sig = <-srv.sigChan + srv.signalHooks(PRE_SIGNAL, sig) + switch sig { + case syscall.SIGHUP: + log.Println(pid, "Received SIGHUP. forking.") + err := srv.fork() + if err != nil { + log.Println("Fork err:", err) + } + case syscall.SIGUSR1: + log.Println(pid, "Received SIGUSR1.") + case syscall.SIGUSR2: + log.Println(pid, "Received SIGUSR2.") + srv.serverTimeout(0 * time.Second) + case syscall.SIGINT: + log.Println(pid, "Received SIGINT.") + srv.shutdown() + case syscall.SIGTERM: + log.Println(pid, "Received SIGTERM.") + srv.shutdown() + case syscall.SIGTSTP: + log.Println(pid, "Received SIGTSTP.") + default: + log.Printf("Received %v: nothing i care about...\n", sig) + } + srv.signalHooks(POST_SIGNAL, sig) + } +} + +func (srv *graceServer) signalHooks(ppFlag int, sig os.Signal) { + if _, notSet := srv.SignalHooks[ppFlag][sig]; !notSet { + return + } + for _, f := range srv.SignalHooks[ppFlag][sig] { + f() + } + return +} + +// shutdown closes the listener so that no new connections are accepted. it also +// starts a goroutine that will hammer (stop all running requests) the server +// after DefaultTimeout. +func (srv *graceServer) shutdown() { + if srv.state != STATE_RUNNING { + return + } + + srv.state = STATE_SHUTTING_DOWN + if DefaultTimeout >= 0 { + go srv.serverTimeout(DefaultTimeout) + } + err := srv.GraceListener.Close() + if err != nil { + log.Println(syscall.Getpid(), "Listener.Close() error:", err) + } else { + log.Println(syscall.Getpid(), srv.GraceListener.Addr(), "Listener closed.") + } +} + +// hammerTime forces the server to shutdown in a given timeout - whether it +// finished outstanding requests or not. if Read/WriteTimeout are not set or the +// max header size is very big a connection could hang... +// +// srv.Serve() will not return until all connections are served. this will +// unblock the srv.wg.Wait() in Serve() thus causing ListenAndServe(TLS) to +// return. +func (srv *graceServer) serverTimeout(d time.Duration) { + defer func() { + // we are calling srv.wg.Done() until it panics which means we called + // Done() when the counter was already at 0 and we're done. + // (and thus Serve() will return and the parent will exit) + if r := recover(); r != nil { + log.Println("WaitGroup at 0", r) + } + }() + if srv.state != STATE_SHUTTING_DOWN { + return + } + time.Sleep(d) + log.Println("[STOP - Hammer Time] Forcefully shutting down parent") + for { + if srv.state == STATE_TERMINATE { + break + } + srv.wg.Done() + } +} + +func (srv *graceServer) fork() (err error) { + // only one server isntance should fork! + regLock.Lock() + defer regLock.Unlock() + if runningServersForked { + return + } + runningServersForked = true + + var files = make([]*os.File, len(runningServers)) + var orderArgs = make([]string, len(runningServers)) + // get the accessor socket fds for _all_ server instances + for _, srvPtr := range runningServers { + // introspect.PrintTypeDump(srvPtr.EndlessListener) + switch srvPtr.GraceListener.(type) { + case *graceListener: + // normal listener + files[socketPtrOffsetMap[srvPtr.Server.Addr]] = srvPtr.GraceListener.(*graceListener).File() + default: + // tls listener + files[socketPtrOffsetMap[srvPtr.Server.Addr]] = srvPtr.tlsInnerListener.File() + } + orderArgs[socketPtrOffsetMap[srvPtr.Server.Addr]] = srvPtr.Server.Addr + } + + log.Println(files) + path := os.Args[0] + var args []string + if len(os.Args) > 1 { + for _, arg := range os.Args[1:] { + if arg == "-graceful" { + break + } + args = append(args, arg) + } + } + args = append(args, "-graceful") + if len(runningServers) > 1 { + args = append(args, fmt.Sprintf(`-socketorder=%s`, strings.Join(orderArgs, ","))) + log.Println(args) + } + cmd := exec.Command(path, args...) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + cmd.ExtraFiles = files + err = cmd.Start() + if err != nil { + log.Fatalf("Restart: Failed to launch, error: %v", err) + } + + return +} + +type graceListener struct { + net.Listener + stop chan error + stopped bool + server *graceServer +} + +func (gl *graceListener) Accept() (c net.Conn, err error) { + tc, err := gl.Listener.(*net.TCPListener).AcceptTCP() + if err != nil { + return + } + + tc.SetKeepAlive(true) // see http.tcpKeepAliveListener + tc.SetKeepAlivePeriod(3 * time.Minute) // see http.tcpKeepAliveListener + + c = graceConn{ + Conn: tc, + server: gl.server, + } + + gl.server.wg.Add(1) + return +} + +func newGraceListener(l net.Listener, srv *graceServer) (el *graceListener) { + el = &graceListener{ + Listener: l, + stop: make(chan error), + server: srv, + } + + // Starting the listener for the stop signal here because Accept blocks on + // el.Listener.(*net.TCPListener).AcceptTCP() + // The goroutine will unblock it by closing the listeners fd + go func() { + _ = <-el.stop + el.stopped = true + el.stop <- el.Listener.Close() + }() + return +} + +func (el *graceListener) Close() error { + if el.stopped { + return syscall.EINVAL + } + el.stop <- nil + return <-el.stop +} + +func (el *graceListener) File() *os.File { + // returns a dup(2) - FD_CLOEXEC flag *not* set + tl := el.Listener.(*net.TCPListener) + fl, _ := tl.File() + return fl +} + +type graceConn struct { + net.Conn + server *graceServer +} + +func (c graceConn) Close() error { + c.server.wg.Done() + return c.Conn.Close() +} From 2dca48f26edb74ba46dce569d0fd21d1023300d2 Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 13 May 2015 21:20:50 +0800 Subject: [PATCH 110/436] fix sesseion redis db error --- session/redis/sess_redis.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/session/redis/sess_redis.go b/session/redis/sess_redis.go index 887fb520..d31feb2c 100644 --- a/session/redis/sess_redis.go +++ b/session/redis/sess_redis.go @@ -145,7 +145,7 @@ func (rp *RedisProvider) SessionInit(maxlifetime int64, savePath string) error { rp.password = configs[2] } if len(configs) > 3 { - dbnum, err := strconv.Atoi(configs[1]) + dbnum, err := strconv.Atoi(configs[3]) if err != nil || dbnum < 0 { rp.dbNum = 0 } else { From 9fd7acf663d2f038b98717079f54a0281ae438e1 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 15 May 2015 15:04:08 +0800 Subject: [PATCH 111/436] fix #1152 --- session/session.go | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/session/session.go b/session/session.go index 4214320c..ffc08edc 100644 --- a/session/session.go +++ b/session/session.go @@ -147,7 +147,7 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se Value: url.QueryEscape(sid), Path: "/", HttpOnly: true, - Secure: manager.config.Secure, + Secure: manager.isSecure(r), Domain: manager.config.Domain} if manager.config.CookieLifeTime > 0 { cookie.MaxAge = manager.config.CookieLifeTime @@ -174,7 +174,7 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se Value: url.QueryEscape(sid), Path: "/", HttpOnly: true, - Secure: manager.config.Secure, + Secure: manager.isSecure(r), Domain: manager.config.Domain} if manager.config.CookieLifeTime > 0 { cookie.MaxAge = manager.config.CookieLifeTime @@ -233,7 +233,7 @@ func (manager *Manager) SessionRegenerateId(w http.ResponseWriter, r *http.Reque Value: url.QueryEscape(sid), Path: "/", HttpOnly: true, - Secure: manager.config.Secure, + Secure: manager.isSecure(r), Domain: manager.config.Domain, } } else { @@ -270,3 +270,17 @@ func (manager *Manager) sessionId(r *http.Request) (string, error) { } return hex.EncodeToString(b), nil } + +// Set cookie with https. +func (manager *Manager) isSecure(req *http.Request) bool { + if !manager.config.Secure { + return false + } + if req.URL.Scheme != "" { + return req.URL.Scheme == "https" + } + if req.TLS == nil { + return false + } + return true +} From d56491ab3ac7369c2770d1b2c08cd30a0c2021ec Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 20 May 2015 11:07:23 +0800 Subject: [PATCH 112/436] sync beeApp.Server to graceful --- app.go | 11 +++++++---- grace/grace.go | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app.go b/app.go index 4740e7e5..6c1eeab6 100644 --- a/app.go +++ b/app.go @@ -78,15 +78,19 @@ func (app *App) Run() { } } else { if Graceful { + app.Server.Addr = addr + app.Server.Handler = app.Handlers + app.Server.ReadTimeout = time.Duration(HttpServerTimeOut) * time.Second + app.Server.WriteTimeout = time.Duration(HttpServerTimeOut) * time.Second if EnableHttpTLS { go func() { time.Sleep(20 * time.Microsecond) if HttpsPort != 0 { addr = fmt.Sprintf("%s:%d", HttpAddr, HttpsPort) + app.Server.Addr = addr } server := grace.NewServer(addr, app.Handlers) - server.Server.ReadTimeout = time.Duration(HttpServerTimeOut) * time.Second - server.Server.WriteTimeout = time.Duration(HttpServerTimeOut) * time.Second + server.Server = app.Server err := server.ListenAndServeTLS(HttpCertFile, HttpKeyFile) if err != nil { BeeLogger.Critical("ListenAndServeTLS: ", err) @@ -98,8 +102,7 @@ func (app *App) Run() { if EnableHttpListen { go func() { server := grace.NewServer(addr, app.Handlers) - server.Server.ReadTimeout = time.Duration(HttpServerTimeOut) * time.Second - server.Server.WriteTimeout = time.Duration(HttpServerTimeOut) * time.Second + server.Server = app.Server if ListenTCP4 && HttpAddr == "" { server.Network = "tcp4" } diff --git a/grace/grace.go b/grace/grace.go index e77112d0..33053c4b 100644 --- a/grace/grace.go +++ b/grace/grace.go @@ -99,7 +99,7 @@ func init() { } type graceServer struct { - http.Server + *http.Server GraceListener net.Listener SignalHooks map[int]map[os.Signal][]func() tlsInnerListener *graceListener @@ -151,7 +151,7 @@ func NewServer(addr string, handler http.Handler) (srv *graceServer) { state: STATE_INIT, Network: "tcp", } - + srv.Server = &http.Server{} srv.Server.Addr = addr srv.Server.ReadTimeout = DefaultReadTimeOut srv.Server.WriteTimeout = DefaultWriteTimeOut From edbaa080f1d9dbd72541b05b7a8d26f1681b8b9b Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 20 May 2015 11:09:30 +0800 Subject: [PATCH 113/436] update the string --- admin.go | 2 +- app.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin.go b/admin.go index 52388c76..64d7fe34 100644 --- a/admin.go +++ b/admin.go @@ -468,6 +468,6 @@ func (admin *adminApp) Run() { err = http.ListenAndServe(addr, nil) } if err != nil { - BeeLogger.Critical("Admin ListenAndServe: ", err, fmt.Sprint(os.Getpid())) + BeeLogger.Critical("Admin ListenAndServe: ", err, fmt.Sprintf("%d", os.Getpid())) } } diff --git a/app.go b/app.go index 6c1eeab6..8fc320ad 100644 --- a/app.go +++ b/app.go @@ -93,7 +93,7 @@ func (app *App) Run() { server.Server = app.Server err := server.ListenAndServeTLS(HttpCertFile, HttpKeyFile) if err != nil { - BeeLogger.Critical("ListenAndServeTLS: ", err) + BeeLogger.Critical("ListenAndServeTLS: ", err, fmt.Sprintf("%d", os.Getpid())) time.Sleep(100 * time.Microsecond) endRunning <- true } @@ -108,7 +108,7 @@ func (app *App) Run() { } err := server.ListenAndServe() if err != nil { - BeeLogger.Critical("ListenAndServe: ", err, fmt.Sprint(os.Getpid())) + BeeLogger.Critical("ListenAndServe: ", err, fmt.Sprintf("%d", os.Getpid())) time.Sleep(100 * time.Microsecond) endRunning <- true } From ae3768931480d48b768bd30d74d495f6ffc033a4 Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 27 May 2015 23:22:05 +0800 Subject: [PATCH 114/436] fix #1176 grace support windows --- grace/grace.go | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/grace/grace.go b/grace/grace.go index 33053c4b..eb57d38e 100644 --- a/grace/grace.go +++ b/grace/grace.go @@ -133,19 +133,13 @@ func NewServer(addr string, handler http.Handler) (srv *graceServer) { SignalHooks: map[int]map[os.Signal][]func(){ PRE_SIGNAL: map[os.Signal][]func(){ syscall.SIGHUP: []func(){}, - syscall.SIGUSR1: []func(){}, - syscall.SIGUSR2: []func(){}, syscall.SIGINT: []func(){}, syscall.SIGTERM: []func(){}, - syscall.SIGTSTP: []func(){}, }, POST_SIGNAL: map[os.Signal][]func(){ syscall.SIGHUP: []func(){}, - syscall.SIGUSR1: []func(){}, - syscall.SIGUSR2: []func(){}, syscall.SIGINT: []func(){}, syscall.SIGTERM: []func(){}, - syscall.SIGTSTP: []func(){}, }, }, state: STATE_INIT, @@ -208,16 +202,24 @@ func (srv *graceServer) ListenAndServe() (err error) { l, err := srv.getListener(addr) if err != nil { log.Println(err) - return + return err } srv.GraceListener = newGraceListener(l, srv) if srv.isChild { - syscall.Kill(syscall.Getppid(), syscall.SIGTERM) + process, err := os.FindProcess(os.Getppid()) + if err != nil { + log.Println(err) + return err + } + err = process.Kill() + if err != nil { + return err + } } - log.Println(syscall.Getpid(), srv.Addr) + log.Println(os.Getpid(), srv.Addr) return srv.Serve() } @@ -255,17 +257,24 @@ func (srv *graceServer) ListenAndServeTLS(certFile, keyFile string) (err error) l, err := srv.getListener(addr) if err != nil { log.Println(err) - return + return err } srv.tlsInnerListener = newGraceListener(l, srv) srv.GraceListener = tls.NewListener(srv.tlsInnerListener, config) if srv.isChild { - syscall.Kill(syscall.Getppid(), syscall.SIGTERM) + process, err := os.FindProcess(os.Getppid()) + if err != nil { + log.Println(err) + return err + } + err = process.Kill() + if err != nil { + return err + } } - - log.Println(syscall.Getpid(), srv.Addr) + log.Println(os.Getpid(), srv.Addr) return srv.Serve() } @@ -303,11 +312,8 @@ func (srv *graceServer) handleSignals() { signal.Notify( srv.sigChan, syscall.SIGHUP, - syscall.SIGUSR1, - syscall.SIGUSR2, syscall.SIGINT, syscall.SIGTERM, - syscall.SIGTSTP, ) pid := syscall.Getpid() @@ -321,19 +327,12 @@ func (srv *graceServer) handleSignals() { if err != nil { log.Println("Fork err:", err) } - case syscall.SIGUSR1: - log.Println(pid, "Received SIGUSR1.") - case syscall.SIGUSR2: - log.Println(pid, "Received SIGUSR2.") - srv.serverTimeout(0 * time.Second) case syscall.SIGINT: log.Println(pid, "Received SIGINT.") srv.shutdown() case syscall.SIGTERM: log.Println(pid, "Received SIGTERM.") srv.shutdown() - case syscall.SIGTSTP: - log.Println(pid, "Received SIGTSTP.") default: log.Printf("Received %v: nothing i care about...\n", sig) } From 3abd01799d11d653f615c43d7a8e005a070cddac Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 27 May 2015 23:46:45 +0800 Subject: [PATCH 115/436] split into small files --- grace/conn.go | 13 ++ grace/grace.go | 377 +--------------------------------------------- grace/listener.go | 62 ++++++++ grace/server.go | 292 +++++++++++++++++++++++++++++++++++ 4 files changed, 370 insertions(+), 374 deletions(-) create mode 100644 grace/conn.go create mode 100644 grace/listener.go create mode 100644 grace/server.go diff --git a/grace/conn.go b/grace/conn.go new file mode 100644 index 00000000..2cf3a93d --- /dev/null +++ b/grace/conn.go @@ -0,0 +1,13 @@ +package grace + +import "net" + +type graceConn struct { + net.Conn + server *graceServer +} + +func (c graceConn) Close() error { + c.server.wg.Done() + return c.Conn.Close() +} diff --git a/grace/grace.go b/grace/grace.go index eb57d38e..e5577267 100644 --- a/grace/grace.go +++ b/grace/grace.go @@ -42,15 +42,9 @@ package grace import ( - "crypto/tls" "flag" - "fmt" - "log" - "net" "net/http" "os" - "os/exec" - "os/signal" "strings" "sync" "syscall" @@ -93,25 +87,10 @@ func init() { DefaultMaxHeaderBytes = 0 - // after a restart the parent will finish ongoing requests before - // shutting down. set to a negative value to disable DefaultTimeout = 60 * time.Second } -type graceServer struct { - *http.Server - GraceListener net.Listener - SignalHooks map[int]map[os.Signal][]func() - tlsInnerListener *graceListener - wg sync.WaitGroup - sigChan chan os.Signal - isChild bool - state uint8 - Network string -} - -// NewServer returns an intialized graceServer. Calling Serve on it will -// actually "start" the server. +// NewServer returns a new graceServer. func NewServer(addr string, handler http.Handler) (srv *graceServer) { regLock.Lock() defer regLock.Unlock() @@ -158,364 +137,14 @@ func NewServer(addr string, handler http.Handler) (srv *graceServer) { return } -// ListenAndServe listens on the TCP network address addr -// and then calls Serve to handle requests on incoming connections. +// refer http.ListenAndServe func ListenAndServe(addr string, handler http.Handler) error { server := NewServer(addr, handler) return server.ListenAndServe() } -// ListenAndServeTLS listens on the TCP network address addr and then calls -// Serve to handle requests on incoming TLS connections. -// -// Filenames containing a certificate and matching private key for the server must be provided. -// If the certificate is signed by a certificate authority, -// the certFile should be the concatenation of the server's certificate followed by the CA's certificate. +// refer http.ListenAndServeTLS func ListenAndServeTLS(addr string, certFile string, keyFile string, handler http.Handler) error { server := NewServer(addr, handler) return server.ListenAndServeTLS(certFile, keyFile) } - -// Serve accepts incoming connections on the Listener l, -// creating a new service goroutine for each. -// The service goroutines read requests and then call srv.Handler to reply to them. -func (srv *graceServer) Serve() (err error) { - srv.state = STATE_RUNNING - err = srv.Server.Serve(srv.GraceListener) - log.Println(syscall.Getpid(), "Waiting for connections to finish...") - srv.wg.Wait() - srv.state = STATE_TERMINATE - return -} - -// ListenAndServe listens on the TCP network address srv.Addr and then calls Serve -// to handle requests on incoming connections. If srv.Addr is blank, ":http" is -// used. -func (srv *graceServer) ListenAndServe() (err error) { - addr := srv.Addr - if addr == "" { - addr = ":http" - } - - go srv.handleSignals() - - l, err := srv.getListener(addr) - if err != nil { - log.Println(err) - return err - } - - srv.GraceListener = newGraceListener(l, srv) - - if srv.isChild { - process, err := os.FindProcess(os.Getppid()) - if err != nil { - log.Println(err) - return err - } - err = process.Kill() - if err != nil { - return err - } - } - - log.Println(os.Getpid(), srv.Addr) - return srv.Serve() -} - -// ListenAndServeTLS listens on the TCP network address srv.Addr and then calls -// Serve to handle requests on incoming TLS connections. -// -// Filenames containing a certificate and matching private key for the server must -// be provided. If the certificate is signed by a certificate authority, the -// certFile should be the concatenation of the server's certificate followed by the -// CA's certificate. -// -// If srv.Addr is blank, ":https" is used. -func (srv *graceServer) ListenAndServeTLS(certFile, keyFile string) (err error) { - addr := srv.Addr - if addr == "" { - addr = ":https" - } - - config := &tls.Config{} - if srv.TLSConfig != nil { - *config = *srv.TLSConfig - } - if config.NextProtos == nil { - config.NextProtos = []string{"http/1.1"} - } - - config.Certificates = make([]tls.Certificate, 1) - config.Certificates[0], err = tls.LoadX509KeyPair(certFile, keyFile) - if err != nil { - return - } - - go srv.handleSignals() - - l, err := srv.getListener(addr) - if err != nil { - log.Println(err) - return err - } - - srv.tlsInnerListener = newGraceListener(l, srv) - srv.GraceListener = tls.NewListener(srv.tlsInnerListener, config) - - if srv.isChild { - process, err := os.FindProcess(os.Getppid()) - if err != nil { - log.Println(err) - return err - } - err = process.Kill() - if err != nil { - return err - } - } - log.Println(os.Getpid(), srv.Addr) - return srv.Serve() -} - -// getListener either opens a new socket to listen on, or takes the acceptor socket -// it got passed when restarted. -func (srv *graceServer) getListener(laddr string) (l net.Listener, err error) { - if srv.isChild { - var ptrOffset uint = 0 - if len(socketPtrOffsetMap) > 0 { - ptrOffset = socketPtrOffsetMap[laddr] - log.Println("laddr", laddr, "ptr offset", socketPtrOffsetMap[laddr]) - } - - f := os.NewFile(uintptr(3+ptrOffset), "") - l, err = net.FileListener(f) - if err != nil { - err = fmt.Errorf("net.FileListener error: %v", err) - return - } - } else { - l, err = net.Listen(srv.Network, laddr) - if err != nil { - err = fmt.Errorf("net.Listen error: %v", err) - return - } - } - return -} - -// handleSignals listens for os Signals and calls any hooked in function that the -// user had registered with the signal. -func (srv *graceServer) handleSignals() { - var sig os.Signal - - signal.Notify( - srv.sigChan, - syscall.SIGHUP, - syscall.SIGINT, - syscall.SIGTERM, - ) - - pid := syscall.Getpid() - for { - sig = <-srv.sigChan - srv.signalHooks(PRE_SIGNAL, sig) - switch sig { - case syscall.SIGHUP: - log.Println(pid, "Received SIGHUP. forking.") - err := srv.fork() - if err != nil { - log.Println("Fork err:", err) - } - case syscall.SIGINT: - log.Println(pid, "Received SIGINT.") - srv.shutdown() - case syscall.SIGTERM: - log.Println(pid, "Received SIGTERM.") - srv.shutdown() - default: - log.Printf("Received %v: nothing i care about...\n", sig) - } - srv.signalHooks(POST_SIGNAL, sig) - } -} - -func (srv *graceServer) signalHooks(ppFlag int, sig os.Signal) { - if _, notSet := srv.SignalHooks[ppFlag][sig]; !notSet { - return - } - for _, f := range srv.SignalHooks[ppFlag][sig] { - f() - } - return -} - -// shutdown closes the listener so that no new connections are accepted. it also -// starts a goroutine that will hammer (stop all running requests) the server -// after DefaultTimeout. -func (srv *graceServer) shutdown() { - if srv.state != STATE_RUNNING { - return - } - - srv.state = STATE_SHUTTING_DOWN - if DefaultTimeout >= 0 { - go srv.serverTimeout(DefaultTimeout) - } - err := srv.GraceListener.Close() - if err != nil { - log.Println(syscall.Getpid(), "Listener.Close() error:", err) - } else { - log.Println(syscall.Getpid(), srv.GraceListener.Addr(), "Listener closed.") - } -} - -// hammerTime forces the server to shutdown in a given timeout - whether it -// finished outstanding requests or not. if Read/WriteTimeout are not set or the -// max header size is very big a connection could hang... -// -// srv.Serve() will not return until all connections are served. this will -// unblock the srv.wg.Wait() in Serve() thus causing ListenAndServe(TLS) to -// return. -func (srv *graceServer) serverTimeout(d time.Duration) { - defer func() { - // we are calling srv.wg.Done() until it panics which means we called - // Done() when the counter was already at 0 and we're done. - // (and thus Serve() will return and the parent will exit) - if r := recover(); r != nil { - log.Println("WaitGroup at 0", r) - } - }() - if srv.state != STATE_SHUTTING_DOWN { - return - } - time.Sleep(d) - log.Println("[STOP - Hammer Time] Forcefully shutting down parent") - for { - if srv.state == STATE_TERMINATE { - break - } - srv.wg.Done() - } -} - -func (srv *graceServer) fork() (err error) { - // only one server isntance should fork! - regLock.Lock() - defer regLock.Unlock() - if runningServersForked { - return - } - runningServersForked = true - - var files = make([]*os.File, len(runningServers)) - var orderArgs = make([]string, len(runningServers)) - // get the accessor socket fds for _all_ server instances - for _, srvPtr := range runningServers { - // introspect.PrintTypeDump(srvPtr.EndlessListener) - switch srvPtr.GraceListener.(type) { - case *graceListener: - // normal listener - files[socketPtrOffsetMap[srvPtr.Server.Addr]] = srvPtr.GraceListener.(*graceListener).File() - default: - // tls listener - files[socketPtrOffsetMap[srvPtr.Server.Addr]] = srvPtr.tlsInnerListener.File() - } - orderArgs[socketPtrOffsetMap[srvPtr.Server.Addr]] = srvPtr.Server.Addr - } - - log.Println(files) - path := os.Args[0] - var args []string - if len(os.Args) > 1 { - for _, arg := range os.Args[1:] { - if arg == "-graceful" { - break - } - args = append(args, arg) - } - } - args = append(args, "-graceful") - if len(runningServers) > 1 { - args = append(args, fmt.Sprintf(`-socketorder=%s`, strings.Join(orderArgs, ","))) - log.Println(args) - } - cmd := exec.Command(path, args...) - cmd.Stdout = os.Stdout - cmd.Stderr = os.Stderr - cmd.ExtraFiles = files - err = cmd.Start() - if err != nil { - log.Fatalf("Restart: Failed to launch, error: %v", err) - } - - return -} - -type graceListener struct { - net.Listener - stop chan error - stopped bool - server *graceServer -} - -func (gl *graceListener) Accept() (c net.Conn, err error) { - tc, err := gl.Listener.(*net.TCPListener).AcceptTCP() - if err != nil { - return - } - - tc.SetKeepAlive(true) // see http.tcpKeepAliveListener - tc.SetKeepAlivePeriod(3 * time.Minute) // see http.tcpKeepAliveListener - - c = graceConn{ - Conn: tc, - server: gl.server, - } - - gl.server.wg.Add(1) - return -} - -func newGraceListener(l net.Listener, srv *graceServer) (el *graceListener) { - el = &graceListener{ - Listener: l, - stop: make(chan error), - server: srv, - } - - // Starting the listener for the stop signal here because Accept blocks on - // el.Listener.(*net.TCPListener).AcceptTCP() - // The goroutine will unblock it by closing the listeners fd - go func() { - _ = <-el.stop - el.stopped = true - el.stop <- el.Listener.Close() - }() - return -} - -func (el *graceListener) Close() error { - if el.stopped { - return syscall.EINVAL - } - el.stop <- nil - return <-el.stop -} - -func (el *graceListener) File() *os.File { - // returns a dup(2) - FD_CLOEXEC flag *not* set - tl := el.Listener.(*net.TCPListener) - fl, _ := tl.File() - return fl -} - -type graceConn struct { - net.Conn - server *graceServer -} - -func (c graceConn) Close() error { - c.server.wg.Done() - return c.Conn.Close() -} diff --git a/grace/listener.go b/grace/listener.go new file mode 100644 index 00000000..8c5d4f9b --- /dev/null +++ b/grace/listener.go @@ -0,0 +1,62 @@ +package grace + +import ( + "net" + "os" + "syscall" + "time" +) + +type graceListener struct { + net.Listener + stop chan error + stopped bool + server *graceServer +} + +func newGraceListener(l net.Listener, srv *graceServer) (el *graceListener) { + el = &graceListener{ + Listener: l, + stop: make(chan error), + server: srv, + } + go func() { + _ = <-el.stop + el.stopped = true + el.stop <- el.Listener.Close() + }() + return +} + +func (gl *graceListener) Accept() (c net.Conn, err error) { + tc, err := gl.Listener.(*net.TCPListener).AcceptTCP() + if err != nil { + return + } + + tc.SetKeepAlive(true) + tc.SetKeepAlivePeriod(3 * time.Minute) + + c = graceConn{ + Conn: tc, + server: gl.server, + } + + gl.server.wg.Add(1) + return +} + +func (el *graceListener) Close() error { + if el.stopped { + return syscall.EINVAL + } + el.stop <- nil + return <-el.stop +} + +func (el *graceListener) File() *os.File { + // returns a dup(2) - FD_CLOEXEC flag *not* set + tl := el.Listener.(*net.TCPListener) + fl, _ := tl.File() + return fl +} diff --git a/grace/server.go b/grace/server.go new file mode 100644 index 00000000..aea8d7d3 --- /dev/null +++ b/grace/server.go @@ -0,0 +1,292 @@ +package grace + +import ( + "crypto/tls" + "fmt" + "log" + "net" + "net/http" + "os" + "os/exec" + "os/signal" + "strings" + "sync" + "syscall" + "time" +) + +type graceServer struct { + *http.Server + GraceListener net.Listener + SignalHooks map[int]map[os.Signal][]func() + tlsInnerListener *graceListener + wg sync.WaitGroup + sigChan chan os.Signal + isChild bool + state uint8 + Network string +} + +// Serve accepts incoming connections on the Listener l, +// creating a new service goroutine for each. +// The service goroutines read requests and then call srv.Handler to reply to them. +func (srv *graceServer) Serve() (err error) { + srv.state = STATE_RUNNING + err = srv.Server.Serve(srv.GraceListener) + log.Println(syscall.Getpid(), "Waiting for connections to finish...") + srv.wg.Wait() + srv.state = STATE_TERMINATE + return +} + +// ListenAndServe listens on the TCP network address srv.Addr and then calls Serve +// to handle requests on incoming connections. If srv.Addr is blank, ":http" is +// used. +func (srv *graceServer) ListenAndServe() (err error) { + addr := srv.Addr + if addr == "" { + addr = ":http" + } + + go srv.handleSignals() + + l, err := srv.getListener(addr) + if err != nil { + log.Println(err) + return err + } + + srv.GraceListener = newGraceListener(l, srv) + + if srv.isChild { + process, err := os.FindProcess(os.Getppid()) + if err != nil { + log.Println(err) + return err + } + err = process.Kill() + if err != nil { + return err + } + } + + log.Println(os.Getpid(), srv.Addr) + return srv.Serve() +} + +// ListenAndServeTLS listens on the TCP network address srv.Addr and then calls +// Serve to handle requests on incoming TLS connections. +// +// Filenames containing a certificate and matching private key for the server must +// be provided. If the certificate is signed by a certificate authority, the +// certFile should be the concatenation of the server's certificate followed by the +// CA's certificate. +// +// If srv.Addr is blank, ":https" is used. +func (srv *graceServer) ListenAndServeTLS(certFile, keyFile string) (err error) { + addr := srv.Addr + if addr == "" { + addr = ":https" + } + + config := &tls.Config{} + if srv.TLSConfig != nil { + *config = *srv.TLSConfig + } + if config.NextProtos == nil { + config.NextProtos = []string{"http/1.1"} + } + + config.Certificates = make([]tls.Certificate, 1) + config.Certificates[0], err = tls.LoadX509KeyPair(certFile, keyFile) + if err != nil { + return + } + + go srv.handleSignals() + + l, err := srv.getListener(addr) + if err != nil { + log.Println(err) + return err + } + + srv.tlsInnerListener = newGraceListener(l, srv) + srv.GraceListener = tls.NewListener(srv.tlsInnerListener, config) + + if srv.isChild { + process, err := os.FindProcess(os.Getppid()) + if err != nil { + log.Println(err) + return err + } + err = process.Kill() + if err != nil { + return err + } + } + log.Println(os.Getpid(), srv.Addr) + return srv.Serve() +} + +// getListener either opens a new socket to listen on, or takes the acceptor socket +// it got passed when restarted. +func (srv *graceServer) getListener(laddr string) (l net.Listener, err error) { + if srv.isChild { + var ptrOffset uint = 0 + if len(socketPtrOffsetMap) > 0 { + ptrOffset = socketPtrOffsetMap[laddr] + log.Println("laddr", laddr, "ptr offset", socketPtrOffsetMap[laddr]) + } + + f := os.NewFile(uintptr(3+ptrOffset), "") + l, err = net.FileListener(f) + if err != nil { + err = fmt.Errorf("net.FileListener error: %v", err) + return + } + } else { + l, err = net.Listen(srv.Network, laddr) + if err != nil { + err = fmt.Errorf("net.Listen error: %v", err) + return + } + } + return +} + +// handleSignals listens for os Signals and calls any hooked in function that the +// user had registered with the signal. +func (srv *graceServer) handleSignals() { + var sig os.Signal + + signal.Notify( + srv.sigChan, + syscall.SIGHUP, + syscall.SIGINT, + syscall.SIGTERM, + ) + + pid := syscall.Getpid() + for { + sig = <-srv.sigChan + srv.signalHooks(PRE_SIGNAL, sig) + switch sig { + case syscall.SIGHUP: + log.Println(pid, "Received SIGHUP. forking.") + err := srv.fork() + if err != nil { + log.Println("Fork err:", err) + } + case syscall.SIGINT: + log.Println(pid, "Received SIGINT.") + srv.shutdown() + case syscall.SIGTERM: + log.Println(pid, "Received SIGTERM.") + srv.shutdown() + default: + log.Printf("Received %v: nothing i care about...\n", sig) + } + srv.signalHooks(POST_SIGNAL, sig) + } +} + +func (srv *graceServer) signalHooks(ppFlag int, sig os.Signal) { + if _, notSet := srv.SignalHooks[ppFlag][sig]; !notSet { + return + } + for _, f := range srv.SignalHooks[ppFlag][sig] { + f() + } + return +} + +// shutdown closes the listener so that no new connections are accepted. it also +// starts a goroutine that will serverTimeout (stop all running requests) the server +// after DefaultTimeout. +func (srv *graceServer) shutdown() { + if srv.state != STATE_RUNNING { + return + } + + srv.state = STATE_SHUTTING_DOWN + if DefaultTimeout >= 0 { + go srv.serverTimeout(DefaultTimeout) + } + err := srv.GraceListener.Close() + if err != nil { + log.Println(syscall.Getpid(), "Listener.Close() error:", err) + } else { + log.Println(syscall.Getpid(), srv.GraceListener.Addr(), "Listener closed.") + } +} + +// serverTimeout forces the server to shutdown in a given timeout - whether it +// finished outstanding requests or not. if Read/WriteTimeout are not set or the +// max header size is very big a connection could hang +func (srv *graceServer) serverTimeout(d time.Duration) { + defer func() { + if r := recover(); r != nil { + log.Println("WaitGroup at 0", r) + } + }() + if srv.state != STATE_SHUTTING_DOWN { + return + } + time.Sleep(d) + log.Println("[STOP - Hammer Time] Forcefully shutting down parent") + for { + if srv.state == STATE_TERMINATE { + break + } + srv.wg.Done() + } +} + +func (srv *graceServer) fork() (err error) { + regLock.Lock() + defer regLock.Unlock() + if runningServersForked { + return + } + runningServersForked = true + + var files = make([]*os.File, len(runningServers)) + var orderArgs = make([]string, len(runningServers)) + for _, srvPtr := range runningServers { + switch srvPtr.GraceListener.(type) { + case *graceListener: + files[socketPtrOffsetMap[srvPtr.Server.Addr]] = srvPtr.GraceListener.(*graceListener).File() + default: + files[socketPtrOffsetMap[srvPtr.Server.Addr]] = srvPtr.tlsInnerListener.File() + } + orderArgs[socketPtrOffsetMap[srvPtr.Server.Addr]] = srvPtr.Server.Addr + } + + log.Println(files) + path := os.Args[0] + var args []string + if len(os.Args) > 1 { + for _, arg := range os.Args[1:] { + if arg == "-graceful" { + break + } + args = append(args, arg) + } + } + args = append(args, "-graceful") + if len(runningServers) > 1 { + args = append(args, fmt.Sprintf(`-socketorder=%s`, strings.Join(orderArgs, ","))) + log.Println(args) + } + cmd := exec.Command(path, args...) + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + cmd.ExtraFiles = files + err = cmd.Start() + if err != nil { + log.Fatalf("Restart: Failed to launch, error: %v", err) + } + + return +} From db06e954b5d1cb9bdcb05b3c809fbcb1e4a3cecc Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 28 May 2015 12:04:19 +0800 Subject: [PATCH 116/436] fix the session memcache bug --- session/memcache/sess_memcache.go | 6 +++--- session/session.go | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/session/memcache/sess_memcache.go b/session/memcache/sess_memcache.go index 24aecb82..bb33075a 100644 --- a/session/memcache/sess_memcache.go +++ b/session/memcache/sess_memcache.go @@ -129,8 +129,9 @@ func (rp *MemProvider) SessionRead(sid string) (session.SessionStore, error) { } } item, err := client.Get(sid) - if err != nil { - return nil, err + if err != nil && err == memcache.ErrCacheMiss { + rs := &MemcacheSessionStore{sid: sid, values: make(map[interface{}]interface{}), maxlifetime: rp.maxlifetime} + return rs, nil } var kv map[interface{}]interface{} if len(item.Value) == 0 { @@ -141,7 +142,6 @@ func (rp *MemProvider) SessionRead(sid string) (session.SessionStore, error) { return nil, err } } - rs := &MemcacheSessionStore{sid: sid, values: kv, maxlifetime: rp.maxlifetime} return rs, nil } diff --git a/session/session.go b/session/session.go index ffc08edc..f0895de1 100644 --- a/session/session.go +++ b/session/session.go @@ -143,12 +143,14 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se return nil, errs } session, err = manager.provider.SessionRead(sid) - cookie = &http.Cookie{Name: manager.config.CookieName, + cookie = &http.Cookie{ + Name: manager.config.CookieName, Value: url.QueryEscape(sid), Path: "/", HttpOnly: true, Secure: manager.isSecure(r), - Domain: manager.config.Domain} + Domain: manager.config.Domain, + } if manager.config.CookieLifeTime > 0 { cookie.MaxAge = manager.config.CookieLifeTime cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) @@ -170,12 +172,14 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se return nil, err } session, err = manager.provider.SessionRead(sid) - cookie = &http.Cookie{Name: manager.config.CookieName, + cookie = &http.Cookie{ + Name: manager.config.CookieName, Value: url.QueryEscape(sid), Path: "/", HttpOnly: true, Secure: manager.isSecure(r), - Domain: manager.config.Domain} + Domain: manager.config.Domain, + } if manager.config.CookieLifeTime > 0 { cookie.MaxAge = manager.config.CookieLifeTime cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) From 8e71d31dbee03d1b65a36bd5f3c1b1972829cd63 Mon Sep 17 00:00:00 2001 From: Nikolay Kirsh Date: Thu, 4 Jun 2015 18:40:10 +0500 Subject: [PATCH 117/436] fix session table --- session/mysql/sess_mysql.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/session/mysql/sess_mysql.go b/session/mysql/sess_mysql.go index 0f6d3e4f..76a13932 100644 --- a/session/mysql/sess_mysql.go +++ b/session/mysql/sess_mysql.go @@ -21,7 +21,7 @@ // mysql session support need create table as sql: // CREATE TABLE `session` ( // `session_key` char(64) NOT NULL, -// session_data` blob, +// `session_data` blob, // `session_expiry` int(11) unsigned NOT NULL, // PRIMARY KEY (`session_key`) // ) ENGINE=MyISAM DEFAULT CHARSET=utf8; From a58c8180e87591e67e45717df65f842e7c99e0d0 Mon Sep 17 00:00:00 2001 From: "weizili.laptop" Date: Sun, 7 Jun 2015 16:26:23 +0800 Subject: [PATCH 118/436] Execute AUTH command when the "password" is configured --- cache/redis/redis.go | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/cache/redis/redis.go b/cache/redis/redis.go index 0e07eaed..ba543f61 100644 --- a/cache/redis/redis.go +++ b/cache/redis/redis.go @@ -51,6 +51,7 @@ type RedisCache struct { conninfo string dbNum int key string + password string } // create new redis cache with default collection name. @@ -149,16 +150,20 @@ func (rc *RedisCache) StartAndGC(config string) error { if _, ok := cf["key"]; !ok { cf["key"] = DefaultKey } - if _, ok := cf["conn"]; !ok { return errors.New("config has no conn key") } if _, ok := cf["dbNum"]; !ok { cf["dbNum"] = "0" } + if _, ok := cf["password"]; !ok { + cf["password"] = "" + } rc.key = cf["key"] rc.conninfo = cf["conn"] rc.dbNum, _ = strconv.Atoi(cf["dbNum"]) + rc.password = cf["password"] + rc.connectInit() c := rc.p.Get() @@ -171,6 +176,17 @@ func (rc *RedisCache) StartAndGC(config string) error { func (rc *RedisCache) connectInit() { dialFunc := func() (c redis.Conn, err error) { c, err = redis.Dial("tcp", rc.conninfo) + if err != nil { + return nil, err + } + + if rc.password != "" { + if _, err := c.Do("AUTH", rc.password); err != nil { + c.Close() + return nil, err + } + } + _, selecterr := c.Do("SELECT", rc.dbNum) if selecterr != nil { c.Close() From 970f0b460c63b483def912ca605e3269ae650e59 Mon Sep 17 00:00:00 2001 From: "weizili.build17" Date: Sun, 7 Jun 2015 21:33:01 +0800 Subject: [PATCH 119/436] Add GetMulti method for Cache interface --- cache/cache.go | 2 + cache/cache_test.go | 51 ++++++++++++++- cache/file.go | 10 +++ cache/memcache/memcache.go | 26 ++++++++ cache/memcache/memcache_test.go | 106 ++++++++++++++++++++++++++++++++ cache/memory.go | 10 +++ cache/redis/redis.go | 33 ++++++++++ cache/redis/redis_test.go | 21 +++++++ 8 files changed, 258 insertions(+), 1 deletion(-) create mode 100644 cache/memcache/memcache_test.go diff --git a/cache/cache.go b/cache/cache.go index ddb2f857..7ca87802 100644 --- a/cache/cache.go +++ b/cache/cache.go @@ -47,6 +47,8 @@ import ( type Cache interface { // get cached value by key. Get(key string) interface{} + // GetMulti is a batch version of Get. + GetMulti(keys []string) []interface{} // set cached value with key and expire time. Put(key string, val interface{}, timeout int64) error // delete cached value by key. diff --git a/cache/cache_test.go b/cache/cache_test.go index 7c43e539..481309fd 100644 --- a/cache/cache_test.go +++ b/cache/cache_test.go @@ -65,6 +65,35 @@ func TestCache(t *testing.T) { if bm.IsExist("astaxie") { t.Error("delete err") } + + //test GetMulti + if err = bm.Put("astaxie", "author", 10); err != nil { + t.Error("set Error", err) + } + if !bm.IsExist("astaxie") { + t.Error("check err") + } + if v := bm.Get("astaxie"); v.(string) != "author" { + t.Error("get err") + } + + if err = bm.Put("astaxie1", "author1", 10); err != nil { + t.Error("set Error", err) + } + if !bm.IsExist("astaxie1") { + t.Error("check err") + } + + vv := bm.GetMulti([]string{"astaxie", "astaxie1"}) + if len(vv) != 2 { + t.Error("GetMulti ERROR") + } + if vv[0].(string) != "author" { + t.Error("GetMulti ERROR") + } + if vv[1].(string) != "author1" { + t.Error("GetMulti ERROR") + } } func TestFileCache(t *testing.T) { @@ -102,6 +131,7 @@ func TestFileCache(t *testing.T) { if bm.IsExist("astaxie") { t.Error("delete err") } + //test string if err = bm.Put("astaxie", "author", 10); err != nil { t.Error("set Error", err) @@ -109,9 +139,28 @@ func TestFileCache(t *testing.T) { if !bm.IsExist("astaxie") { t.Error("check err") } - if v := bm.Get("astaxie"); v.(string) != "author" { t.Error("get err") } + + //test GetMulti + if err = bm.Put("astaxie1", "author1", 10); err != nil { + t.Error("set Error", err) + } + if !bm.IsExist("astaxie1") { + t.Error("check err") + } + + vv := bm.GetMulti([]string{"astaxie", "astaxie1"}) + if len(vv) != 2 { + t.Error("GetMulti ERROR") + } + if vv[0].(string) != "author" { + t.Error("GetMulti ERROR") + } + if vv[1].(string) != "author1" { + t.Error("GetMulti ERROR") + } + os.RemoveAll("cache") } diff --git a/cache/file.go b/cache/file.go index bbbbbad2..65f114f3 100644 --- a/cache/file.go +++ b/cache/file.go @@ -132,6 +132,16 @@ func (fc *FileCache) Get(key string) interface{} { return to.Data } +// GetMulti gets values from file cache. +// if non-exist or expired, return empty string. +func (fc *FileCache) GetMulti(keys []string) []interface{} { + var rc []interface{} + for _, key := range keys { + rc = append(rc, fc.Get(key)) + } + return rc +} + // Put value into file cache. // timeout means how long to keep this file, unit of ms. // if timeout equals FileCacheEmbedExpiry(default is 0), cache this item forever. diff --git a/cache/memcache/memcache.go b/cache/memcache/memcache.go index f5a5c6ef..c6829054 100644 --- a/cache/memcache/memcache.go +++ b/cache/memcache/memcache.go @@ -63,6 +63,32 @@ func (rc *MemcacheCache) Get(key string) interface{} { return nil } +// get value from memcache. +func (rc *MemcacheCache) GetMulti(keys []string) []interface{} { + size := len(keys) + var rv []interface{} + if rc.conn == nil { + if err := rc.connectInit(); err != nil { + for i := 0; i < size; i++ { + rv = append(rv, err) + } + return rv + } + } + mv, err := rc.conn.GetMulti(keys) + if err == nil { + for _, v := range mv { + rv = append(rv, string(v.Value)) + } + return rv + } else { + for i := 0; i < size; i++ { + rv = append(rv, err) + } + return rv + } +} + // put value to memcache. only support string. func (rc *MemcacheCache) Put(key string, val interface{}, timeout int64) error { if rc.conn == nil { diff --git a/cache/memcache/memcache_test.go b/cache/memcache/memcache_test.go new file mode 100644 index 00000000..0523ae85 --- /dev/null +++ b/cache/memcache/memcache_test.go @@ -0,0 +1,106 @@ +// Copyright 2014 beego Author. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package memcache + +import ( + _ "github.com/bradfitz/gomemcache/memcache" + + "github.com/astaxie/beego/cache" + "strconv" + "testing" + "time" +) + +func TestRedisCache(t *testing.T) { + bm, err := cache.NewCache("memcache", `{"conn": "127.0.0.1:11211"}`) + if err != nil { + t.Error("init err") + } + if err = bm.Put("astaxie", "1", 10); err != nil { + t.Error("set Error", err) + } + if !bm.IsExist("astaxie") { + t.Error("check err") + } + + time.Sleep(10 * time.Second) + + if bm.IsExist("astaxie") { + t.Error("check err") + } + if err = bm.Put("astaxie", "1", 10); err != nil { + t.Error("set Error", err) + } + + if v, err := strconv.Atoi(bm.Get("astaxie").(string)); err != nil || v != 1 { + t.Error("get err") + } + + if err = bm.Incr("astaxie"); err != nil { + t.Error("Incr Error", err) + } + + if v, err := strconv.Atoi(bm.Get("astaxie").(string)); err != nil || v != 2 { + t.Error("get err") + } + + if err = bm.Decr("astaxie"); err != nil { + t.Error("Decr Error", err) + } + + if v, err := strconv.Atoi(bm.Get("astaxie").(string)); err != nil || v != 1 { + t.Error("get err") + } + bm.Delete("astaxie") + if bm.IsExist("astaxie") { + t.Error("delete err") + } + + //test string + if err = bm.Put("astaxie", "author", 10); err != nil { + t.Error("set Error", err) + } + if !bm.IsExist("astaxie") { + t.Error("check err") + } + + if v := bm.Get("astaxie").(string); v != "author" { + t.Error("get err") + } + + //test GetMulti + if err = bm.Put("astaxie1", "author1", 10); err != nil { + t.Error("set Error", err) + } + if !bm.IsExist("astaxie1") { + t.Error("check err") + } + + vv := bm.GetMulti([]string{"astaxie", "astaxie1"}) + if len(vv) != 2 { + t.Error("GetMulti ERROR") + } + if vv[0].(string) != "author" { + t.Error("GetMulti ERROR") + } + if vv[1].(string) != "author1" { + t.Error("GetMulti ERROR") + } + + // test clear all + if err = bm.ClearAll(); err != nil { + t.Error("clear all err") + } +} diff --git a/cache/memory.go b/cache/memory.go index 0233be7d..b6657048 100644 --- a/cache/memory.go +++ b/cache/memory.go @@ -64,6 +64,16 @@ func (bc *MemoryCache) Get(name string) interface{} { return nil } +// GetMulti gets caches from memory. +// if non-existed or expired, return nil. +func (bc *MemoryCache) GetMulti(names []string) []interface{} { + var rc []interface{} + for _, name := range names { + rc = append(rc, bc.Get(name)) + } + return rc +} + // Put cache to memory. // if expired is 0, it will be cleaned by next gc operation ( default gc clock is 1 minute). func (bc *MemoryCache) Put(name string, value interface{}, expired int64) error { diff --git a/cache/redis/redis.go b/cache/redis/redis.go index 0e07eaed..9f28786c 100644 --- a/cache/redis/redis.go +++ b/cache/redis/redis.go @@ -74,6 +74,39 @@ func (rc *RedisCache) Get(key string) interface{} { return nil } +// GetMulti get cache from redis. +func (rc *RedisCache) GetMulti(keys []string) []interface{} { + size := len(keys) + var rv []interface{} + c := rc.p.Get() + defer c.Close() + var err error + for _, key := range keys { + err = c.Send("GET", key) + if err != nil { + goto ERROR + } + } + if err = c.Flush(); err != nil { + goto ERROR + } + for i := 0; i < size; i++ { + if v, err := c.Receive(); err == nil { + rv = append(rv, v.([]byte)) + } else { + rv = append(rv, err) + } + } + return rv +ERROR: + rv = rv[0:0] + for i := 0; i < size; i++ { + rv = append(rv, nil) + } + + return rv +} + // put cache to redis. func (rc *RedisCache) Put(key string, val interface{}, timeout int64) error { var err error diff --git a/cache/redis/redis_test.go b/cache/redis/redis_test.go index fbe82ac5..1f74fd27 100644 --- a/cache/redis/redis_test.go +++ b/cache/redis/redis_test.go @@ -67,6 +67,7 @@ func TestRedisCache(t *testing.T) { if bm.IsExist("astaxie") { t.Error("delete err") } + //test string if err = bm.Put("astaxie", "author", 10); err != nil { t.Error("set Error", err) @@ -78,6 +79,26 @@ func TestRedisCache(t *testing.T) { if v, _ := redis.String(bm.Get("astaxie"), err); v != "author" { t.Error("get err") } + + //test GetMulti + if err = bm.Put("astaxie1", "author1", 10); err != nil { + t.Error("set Error", err) + } + if !bm.IsExist("astaxie1") { + t.Error("check err") + } + + vv := bm.GetMulti([]string{"astaxie", "astaxie1"}) + if len(vv) != 2 { + t.Error("GetMulti ERROR") + } + if v, _ := redis.String(vv[0], nil); v != "author" { + t.Error("GetMulti ERROR") + } + if v, _ := redis.String(vv[1], nil); v != "author1" { + t.Error("GetMulti ERROR") + } + // test clear all if err = bm.ClearAll(); err != nil { t.Error("clear all err") From e1d7bc88265bfae3b177fb28ccd77f14ad9255d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A9=BA=E8=A7=81?= Date: Mon, 8 Jun 2015 17:25:46 +0800 Subject: [PATCH 120/436] remove space after int()& add sort for commentsRouter file --- parser.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/parser.go b/parser.go index be91b4cb..cf8dee22 100644 --- a/parser.go +++ b/parser.go @@ -24,6 +24,7 @@ import ( "io/ioutil" "os" "path" + "sort" "strings" "github.com/astaxie/beego/utils" @@ -36,7 +37,7 @@ import ( ) func init() { - {{.globalinfo}} +{{.globalinfo}} } ` @@ -129,7 +130,13 @@ func genRouterCode() { os.Mkdir(path.Join(workPath, "routers"), 0755) Info("generate router from comments") var globalinfo string - for k, cList := range genInfoList { + sortKey := make([]string, 0) + for k, _ := range genInfoList { + sortKey = append(sortKey, k) + } + sort.Strings(sortKey) + for _, k := range sortKey { + cList := genInfoList[k] for _, c := range cList { allmethod := "nil" if len(c.AllowHTTPMethods) > 0 { From 364cacf6593887728e2fca7c69eae57509ba8a33 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 8 Jun 2015 22:00:28 +0800 Subject: [PATCH 121/436] record the critical logs in Prod --- router.go | 57 +++++++++++++++++++------------------------------------ 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/router.go b/router.go index e9f45615..2d5ed78d 100644 --- a/router.go +++ b/router.go @@ -857,48 +857,29 @@ func (p *ControllerRegistor) recoverPanic(context *beecontext.Context) { if err == USERSTOPRUN { return } - if RunMode == "dev" { - if !RecoverPanic { - panic(err) - } else { - if ErrorsShow { - if _, ok := ErrorMaps[fmt.Sprint(err)]; ok { - exception(fmt.Sprint(err), context) - return - } - } - var stack string - Critical("the request url is ", context.Input.Url()) - Critical("Handler crashed with error", err) - for i := 1; ; i++ { - _, file, line, ok := runtime.Caller(i) - if !ok { - break - } - Critical(fmt.Sprintf("%s:%d", file, line)) - stack = stack + fmt.Sprintln(fmt.Sprintf("%s:%d", file, line)) - } - showErr(err, context, stack) - } + if !RecoverPanic { + panic(err) } else { - if !RecoverPanic { - panic(err) - } else { - // in production model show all infomation - if ErrorsShow { + if ErrorsShow { + if _, ok := ErrorMaps[fmt.Sprint(err)]; ok { exception(fmt.Sprint(err), context) - } else { - Critical("the request url is ", context.Input.Url()) - Critical("Handler crashed with error", err) - for i := 1; ; i++ { - _, file, line, ok := runtime.Caller(i) - if !ok { - break - } - Critical(fmt.Sprintf("%s:%d", file, line)) - } + return } } + var stack string + Critical("the request url is ", context.Input.Url()) + Critical("Handler crashed with error", err) + for i := 1; ; i++ { + _, file, line, ok := runtime.Caller(i) + if !ok { + break + } + Critical(fmt.Sprintf("%s:%d", file, line)) + stack = stack + fmt.Sprintln(fmt.Sprintf("%s:%d", file, line)) + } + if RunMode == "dev" { + showErr(err, context, stack) + } } } } From bbb6f31f1604abf411abbcef6ce452da6188103f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A9=BA=E8=A7=81?= Date: Tue, 9 Jun 2015 10:18:21 +0800 Subject: [PATCH 122/436] support eq&ne for orm --- orm/db.go | 2 ++ orm/db_mysql.go | 2 ++ orm/db_postgres.go | 2 ++ orm/db_sqlite.go | 2 ++ 4 files changed, 8 insertions(+) diff --git a/orm/db.go b/orm/db.go index 060d83bc..20dc80f2 100644 --- a/orm/db.go +++ b/orm/db.go @@ -44,6 +44,8 @@ var ( "gte": true, "lt": true, "lte": true, + "eq": true, + "nq": true, "startswith": true, "endswith": true, "istartswith": true, diff --git a/orm/db_mysql.go b/orm/db_mysql.go index 3c2ad3a4..182914a2 100644 --- a/orm/db_mysql.go +++ b/orm/db_mysql.go @@ -30,6 +30,8 @@ var mysqlOperators = map[string]string{ "gte": ">= ?", "lt": "< ?", "lte": "<= ?", + "eq": "= ?", + "ne": "!= ?", "startswith": "LIKE BINARY ?", "endswith": "LIKE BINARY ?", "istartswith": "LIKE ?", diff --git a/orm/db_postgres.go b/orm/db_postgres.go index 296ee6a0..6500ef52 100644 --- a/orm/db_postgres.go +++ b/orm/db_postgres.go @@ -29,6 +29,8 @@ var postgresOperators = map[string]string{ "gte": ">= ?", "lt": "< ?", "lte": "<= ?", + "eq": "= ?", + "ne": "!= ?", "startswith": "LIKE ?", "endswith": "LIKE ?", "istartswith": "LIKE UPPER(?)", diff --git a/orm/db_sqlite.go b/orm/db_sqlite.go index 0a2f32c8..c2dcbb46 100644 --- a/orm/db_sqlite.go +++ b/orm/db_sqlite.go @@ -29,6 +29,8 @@ var sqliteOperators = map[string]string{ "gte": ">= ?", "lt": "< ?", "lte": "<= ?", + "eq": "= ?", + "ne": "!= ?", "startswith": "LIKE ? ESCAPE '\\'", "endswith": "LIKE ? ESCAPE '\\'", "istartswith": "LIKE ? ESCAPE '\\'", From d943d16d522cefb97ae2735f1e3dd8b41e6d8641 Mon Sep 17 00:00:00 2001 From: ziyel Date: Wed, 10 Jun 2015 21:26:04 +0800 Subject: [PATCH 123/436] gofmt --- router.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/router.go b/router.go index 232f67d2..35b442ab 100644 --- a/router.go +++ b/router.go @@ -612,9 +612,9 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) if l, ok := p.filters[pos]; ok { for _, filterR := range l { if ok, p := filterR.ValidRouter(urlPath); ok { - for k, v := range context.Input.Params { - p[k] = v - } + for k, v := range context.Input.Params { + p[k] = v + } context.Input.Params = p filterR.filterFunc(context) if filterR.returnOnOutput && w.started { From 9c6775c22ca7c7343d3236a383ab6189ecf7b009 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sat, 13 Jun 2015 00:25:21 +0800 Subject: [PATCH 124/436] log default use synchro, and support async --- logs/log.go | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/logs/log.go b/logs/log.go index 5f5f1cea..5c94a9d8 100644 --- a/logs/log.go +++ b/logs/log.go @@ -92,6 +92,7 @@ type BeeLogger struct { level int enableFuncCallDepth bool loggerFuncCallDepth int + asynchronous bool msg chan *logMsg outputs map[string]LoggerInterface } @@ -110,7 +111,11 @@ func NewLogger(channellen int64) *BeeLogger { bl.loggerFuncCallDepth = 2 bl.msg = make(chan *logMsg, channellen) bl.outputs = make(map[string]LoggerInterface) - //bl.SetLogger("console", "") // default output to console + return bl +} + +func (bl *BeeLogger) Async() *BeeLogger { + bl.asynchronous = true go bl.startLogger() return bl } @@ -164,7 +169,17 @@ func (bl *BeeLogger) writerMsg(loglevel int, msg string) error { } else { lm.msg = msg } - bl.msg <- lm + if bl.asynchronous { + bl.msg <- lm + } else { + for name, l := range bl.outputs { + err := l.WriteMsg(lm.msg, lm.level) + if err != nil { + fmt.Println("unable to WriteMsg to adapter:", name, err) + return err + } + } + } return nil } From d9bb1a359278d87e095d0d5f8745c08d6a5595d3 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sat, 13 Jun 2015 00:25:48 +0800 Subject: [PATCH 125/436] logs support elasticsearch adapter --- logs/es/es.go | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 logs/es/es.go diff --git a/logs/es/es.go b/logs/es/es.go new file mode 100644 index 00000000..3a73d4dd --- /dev/null +++ b/logs/es/es.go @@ -0,0 +1,76 @@ +package es + +import ( + "encoding/json" + "errors" + "fmt" + "net" + "net/url" + "time" + + "github.com/astaxie/beego/logs" + "github.com/belogik/goes" +) + +func NewES() logs.LoggerInterface { + cw := &esLogger{ + Level: logs.LevelDebug, + } + return cw +} + +type esLogger struct { + *goes.Connection + DSN string `json:"dsn"` + Level int `json:"level"` +} + +// {"dsn":"http://localhost:9200/","level":1} +func (el *esLogger) Init(jsonconfig string) error { + err := json.Unmarshal([]byte(jsonconfig), el) + if err != nil { + return err + } + if el.DSN == "" { + return errors.New("empty dsn") + } else if u, err := url.Parse(el.DSN); err != nil { + return err + } else if u.Path == "" { + return errors.New("missing prefix") + } else if host, port, err := net.SplitHostPort(u.Host); err != nil { + return err + } else { + conn := goes.NewConnection(host, port) + el.Connection = conn + } + return nil +} + +func (el *esLogger) WriteMsg(msg string, level int) error { + if level > el.Level { + return nil + } + t := time.Now() + vals := make(map[string]interface{}) + vals["@timestamp"] = t.Format(time.RFC3339) + vals["@msg"] = msg + d := goes.Document{ + Index: fmt.Sprintf("%04d.%02d.%02d", t.Year(), t.Month(), t.Day()), + Type: "logs", + Fields: vals, + } + _, err := el.Index(d, nil) + return err +} + +func (el *esLogger) Destroy() { + +} + +func (el *esLogger) Flush() { + +} + +func init() { + logs.Register("es", NewES) +} From 491238ce7d698f7a0ab65b8d820edb11339bcd3f Mon Sep 17 00:00:00 2001 From: "MrLee.Kun" Date: Sat, 13 Jun 2015 01:04:46 +0800 Subject: [PATCH 126/436] Don't overwrite the params from function ValidRouter just add new params to context.Input.Params --- router.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/router.go b/router.go index 8afb9ee2..4d195bc8 100644 --- a/router.go +++ b/router.go @@ -612,10 +612,9 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) if l, ok := p.filters[pos]; ok { for _, filterR := range l { if ok, p := filterR.ValidRouter(urlPath); ok { - for k, v := range context.Input.Params { - p[k] = v + for k, v := range p { + context.Input.Params[k] = v } - context.Input.Params = p filterR.filterFunc(context) if filterR.returnOnOutput && w.started { return true From b776e43962c4a4761bb232f763b20a8d6372ff33 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sat, 13 Jun 2015 11:15:13 +0800 Subject: [PATCH 127/436] merge bat/httplib to httplib --- httplib/httplib.go | 127 ++++++++++++++++++++++++++++++--------------- 1 file changed, 84 insertions(+), 43 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 2389a7cb..68c22d70 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -36,7 +36,6 @@ import ( "crypto/tls" "encoding/json" "encoding/xml" - "fmt" "io" "io/ioutil" "log" @@ -48,26 +47,50 @@ import ( "net/url" "os" "strings" + "sync" "time" ) -var defaultSetting = BeegoHttpSettings{UserAgent: "beegoServer", ConnectTimeout: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, Gzip: true} +var defaultSetting = BeegoHttpSettings{ + UserAgent: "beegoServer", + ConnectTimeout: 60 * time.Second, + ReadWriteTimeout: 60 * time.Second, + Gzip: true, + DumpBody: true, +} + var defaultCookieJar http.CookieJar +var settingMutex sync.Mutex // createDefaultCookie creates a global cookiejar to store cookies. func createDefaultCookie() { + settingMutex.Lock() + defer settingMutex.Unlock() defaultCookieJar, _ = cookiejar.New(nil) } // Overwrite default settings func SetDefaultSetting(setting BeegoHttpSettings) { + settingMutex.Lock() + defer settingMutex.Unlock() defaultSetting = setting + if defaultSetting.ConnectTimeout == 0 { + defaultSetting.ConnectTimeout = 60 * time.Second + } + if defaultSetting.ReadWriteTimeout == 0 { + defaultSetting.ReadWriteTimeout = 60 * time.Second + } } // return *BeegoHttpRequest with specific method -func newBeegoRequest(url, method string) *BeegoHttpRequest { +func NewBeegoRequest(rawurl, method string) *BeegoHttpRequest { var resp http.Response + u, err := url.Parse(rawurl) + if err != nil { + log.Fatal(err) + } req := http.Request{ + URL: u, Method: method, Header: make(http.Header), Proto: "HTTP/1.1", @@ -75,7 +98,7 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest { ProtoMinor: 1, } return &BeegoHttpRequest{ - url: url, + url: rawurl, req: &req, params: map[string]string{}, files: map[string]string{}, @@ -86,27 +109,27 @@ func newBeegoRequest(url, method string) *BeegoHttpRequest { // Get returns *BeegoHttpRequest with GET method. func Get(url string) *BeegoHttpRequest { - return newBeegoRequest(url, "GET") + return NewBeegoRequest(url, "GET") } // Post returns *BeegoHttpRequest with POST method. func Post(url string) *BeegoHttpRequest { - return newBeegoRequest(url, "POST") + return NewBeegoRequest(url, "POST") } // Put returns *BeegoHttpRequest with PUT method. func Put(url string) *BeegoHttpRequest { - return newBeegoRequest(url, "PUT") + return NewBeegoRequest(url, "PUT") } // Delete returns *BeegoHttpRequest DELETE method. func Delete(url string) *BeegoHttpRequest { - return newBeegoRequest(url, "DELETE") + return NewBeegoRequest(url, "DELETE") } // Head returns *BeegoHttpRequest with HEAD method. func Head(url string) *BeegoHttpRequest { - return newBeegoRequest(url, "HEAD") + return NewBeegoRequest(url, "HEAD") } // BeegoHttpSettings @@ -120,6 +143,7 @@ type BeegoHttpSettings struct { Transport http.RoundTripper EnableCookie bool Gzip bool + DumpBody bool } // BeegoHttpRequest provides more useful methods for requesting one url than http.Request. @@ -134,6 +158,11 @@ type BeegoHttpRequest struct { dump []byte } +// get request +func (b *BeegoHttpRequest) GetRequest() *http.Request { + return b.req +} + // Change request settings func (b *BeegoHttpRequest) Setting(setting BeegoHttpSettings) *BeegoHttpRequest { b.setting = setting @@ -153,14 +182,20 @@ func (b *BeegoHttpRequest) SetEnableCookie(enable bool) *BeegoHttpRequest { } // SetUserAgent sets User-Agent header field -func (b *BeegoHttpRequest) SetUserAgent(userAgent string) *BeegoHttpRequest { - b.setting.UserAgent = userAgent +func (b *BeegoHttpRequest) SetUserAgent(useragent string) *BeegoHttpRequest { + b.setting.UserAgent = useragent return b } // Debug sets show debug or not when executing request. -func (b *BeegoHttpRequest) Debug(isDebug bool) *BeegoHttpRequest { - b.setting.ShowDebug = isDebug +func (b *BeegoHttpRequest) Debug(isdebug bool) *BeegoHttpRequest { + b.setting.ShowDebug = isdebug + return b +} + +// Dump Body. +func (b *BeegoHttpRequest) DumpBody(isdump bool) *BeegoHttpRequest { + b.setting.DumpBody = isdump return b } @@ -279,21 +314,18 @@ func (b *BeegoHttpRequest) JsonBody(obj interface{}) (*BeegoHttpRequest, error) } func (b *BeegoHttpRequest) buildUrl(paramBody string) { - if paramBody == "" { - return - } // build GET url with query string - if b.req.Method == "GET" { - if strings.Index(b.url, "?") == -1 { - b.url = b.url + "?" + paramBody - } else { + if b.req.Method == "GET" && len(paramBody) > 0 { + if strings.Index(b.url, "?") != -1 { b.url += "&" + paramBody + } else { + b.url = b.url + "?" + paramBody } return } - // build POST url and body - if b.req.Method == "POST" && b.req.Body == nil { + // build POST/PUT/PATCH url and body + if (b.req.Method == "POST" || b.req.Method == "PUT" || b.req.Method == "PATCH") && b.req.Body == nil { // with files if len(b.files) > 0 { pr, pw := io.Pipe() @@ -338,16 +370,29 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { if b.resp.StatusCode != 0 { return b.resp, nil } + resp, err := b.SendOut() + if err != nil { + return nil, err + } + b.resp = resp + return resp, nil +} + +func (b *BeegoHttpRequest) SendOut() (*http.Response, error) { var paramBody string if len(b.params) > 0 { + var buf bytes.Buffer for k, v := range b.params { - paramBody += fmt.Sprintf("&%s=%v", url.QueryEscape(k), url.QueryEscape(v)) + buf.WriteString(url.QueryEscape(k)) + buf.WriteByte('=') + buf.WriteString(url.QueryEscape(v)) + buf.WriteByte('&') } - paramBody = paramBody[1:] + paramBody = buf.String() + paramBody = paramBody[0 : len(paramBody)-1] } b.buildUrl(paramBody) - url, err := url.Parse(b.url) if err != nil { return nil, err @@ -357,13 +402,6 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { trans := b.setting.Transport - if b.setting.ConnectTimeout == 0 { - b.setting.ConnectTimeout = 60 * time.Second - } - if b.setting.ReadWriteTimeout == 0 { - b.setting.ReadWriteTimeout = 60 * time.Second - } - if trans == nil { // create default transport trans = &http.Transport{ @@ -404,15 +442,13 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { } if b.setting.ShowDebug { - dump, err := httputil.DumpRequest(b.req, true) + dump, err := httputil.DumpRequest(b.req, b.setting.DumpBody) if err != nil { log.Println(err.Error()) } b.dump = dump } - - b.resp, err = client.Do(b.req) - return b.resp, err + return client.Do(b.req) } // String returns the body string in response. @@ -433,9 +469,12 @@ func (b *BeegoHttpRequest) Bytes() ([]byte, error) { return b.body, nil } resp, err := b.getResponse() - if resp == nil || resp.Body == nil { + if err != nil { return nil, err } + if resp.Body == nil { + return nil, nil + } defer resp.Body.Close() if b.setting.Gzip && resp.Header.Get("Content-Encoding") == "gzip" { reader, err := gzip.NewReader(resp.Body) @@ -452,18 +491,20 @@ func (b *BeegoHttpRequest) Bytes() ([]byte, error) { // ToFile saves the body data in response to one file. // it calls Response inner. func (b *BeegoHttpRequest) ToFile(filename string) error { - resp, err := b.getResponse() - if resp == nil || resp.Body == nil { - return err - } - defer resp.Body.Close() - f, err := os.Create(filename) if err != nil { return err } defer f.Close() + resp, err := b.getResponse() + if err != nil { + return err + } + if resp.Body == nil { + return nil + } + defer resp.Body.Close() _, err = io.Copy(f, resp.Body) return err } From e619d839901efc0120af07e25c47eff8e824fc46 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sat, 13 Jun 2015 12:47:01 +0800 Subject: [PATCH 128/436] fix the filter router issues --- router.go | 14 ++++++++------ router_test.go | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/router.go b/router.go index 4d195bc8..ca6d917a 100644 --- a/router.go +++ b/router.go @@ -611,19 +611,21 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) if p.enableFilter { if l, ok := p.filters[pos]; ok { for _, filterR := range l { - if ok, p := filterR.ValidRouter(urlPath); ok { - for k, v := range p { + if filterR.returnOnOutput && w.started { + return true + } + if ok, params := filterR.ValidRouter(urlPath); ok { + for k, v := range params { context.Input.Params[k] = v } filterR.filterFunc(context) - if filterR.returnOnOutput && w.started { - return true - } + } + if filterR.returnOnOutput && w.started { + return true } } } } - return false } diff --git a/router_test.go b/router_test.go index ee712167..005f32d6 100644 --- a/router_test.go +++ b/router_test.go @@ -444,7 +444,7 @@ func TestFilterAfterExec(t *testing.T) { mux := NewControllerRegister() mux.InsertFilter(url, BeforeRouter, beegoFilterNoOutput) mux.InsertFilter(url, BeforeExec, beegoFilterNoOutput) - mux.InsertFilter(url, AfterExec, beegoAfterExec1) + mux.InsertFilter(url, AfterExec, beegoAfterExec1, false) mux.Get(url, beegoFilterFunc) @@ -506,7 +506,7 @@ func TestFilterFinishRouterMultiFirstOnly(t *testing.T) { url := "/finishRouterMultiFirstOnly" mux := NewControllerRegister() - mux.InsertFilter(url, FinishRouter, beegoFinishRouter1) + mux.InsertFilter(url, FinishRouter, beegoFinishRouter1, false) mux.InsertFilter(url, FinishRouter, beegoFinishRouter2) mux.Get(url, beegoFilterFunc) @@ -534,7 +534,7 @@ func TestFilterFinishRouterMulti(t *testing.T) { mux := NewControllerRegister() mux.InsertFilter(url, FinishRouter, beegoFinishRouter1, false) - mux.InsertFilter(url, FinishRouter, beegoFinishRouter2) + mux.InsertFilter(url, FinishRouter, beegoFinishRouter2, false) mux.Get(url, beegoFilterFunc) From c143a6ec19accb1be464666e197049dddc276275 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sat, 13 Jun 2015 16:20:26 +0800 Subject: [PATCH 129/436] fix #1090 add Getfiles to support mulit file upload --- controller.go | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/controller.go b/controller.go index 81ee1230..9011593a 100644 --- a/controller.go +++ b/controller.go @@ -499,6 +499,41 @@ func (c *Controller) GetFile(key string) (multipart.File, *multipart.FileHeader, return c.Ctx.Request.FormFile(key) } +// GetFiles return multi-upload files +// files, err:=c.Getfiles("myfiles") +// if err != nil { +// http.Error(w, err.Error(), http.StatusNoContent) +// return +// } +// for i, _ := range files { +// //for each fileheader, get a handle to the actual file +// file, err := files[i].Open() +// defer file.Close() +// if err != nil { +// http.Error(w, err.Error(), http.StatusInternalServerError) +// return +// } +// //create destination file making sure the path is writeable. +// dst, err := os.Create("upload/" + files[i].Filename) +// defer dst.Close() +// if err != nil { +// http.Error(w, err.Error(), http.StatusInternalServerError) +// return +// } +// //copy the uploaded file to the destination file +// if _, err := io.Copy(dst, file); err != nil { +// http.Error(w, err.Error(), http.StatusInternalServerError) +// return +// } +// } +func (c *Controller) GetFiles(key string) ([]*multipart.FileHeader, error) { + files, ok := c.Ctx.Request.MultipartForm.File["key"] + if ok { + return files, nil + } + return nil, http.ErrMissingFile +} + // SaveToFile saves uploaded file to new path. // it only operates the first one of mutil-upload form file field. func (c *Controller) SaveToFile(fromfile, tofile string) error { From 2af0c569a578aed91df53c1c3bebd53fd8e5062c Mon Sep 17 00:00:00 2001 From: "MrLee.Kun" Date: Sun, 14 Jun 2015 01:02:41 +0800 Subject: [PATCH 130/436] The last filterFunc with returnOnOutput=ture won't be executed ex: beego.InsertFilter("/*", beego.BeforeExec, FilterLoginCheck1,false) beego.InsertFilter("/*", beego.BeforeExec, FilterLoginCheck2) In function FilterLoginCheck1 , I'll write data via ResponseWriter, and w.started = true FilterLoginCheck2 won't be executed, it should be. --- router.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/router.go b/router.go index ca6d917a..688b227d 100644 --- a/router.go +++ b/router.go @@ -611,9 +611,6 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) if p.enableFilter { if l, ok := p.filters[pos]; ok { for _, filterR := range l { - if filterR.returnOnOutput && w.started { - return true - } if ok, params := filterR.ValidRouter(urlPath); ok { for k, v := range params { context.Input.Params[k] = v From fc11169ee38c7698e84e4e1af2c3e9f1e847215f Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 14 Jun 2015 01:13:34 +0800 Subject: [PATCH 131/436] Revert "fix multiple filters execute issue" --- router.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/router.go b/router.go index 688b227d..ca6d917a 100644 --- a/router.go +++ b/router.go @@ -611,6 +611,9 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) if p.enableFilter { if l, ok := p.filters[pos]; ok { for _, filterR := range l { + if filterR.returnOnOutput && w.started { + return true + } if ok, params := filterR.ValidRouter(urlPath); ok { for k, v := range params { context.Input.Params[k] = v From b275d7c6f5800be132a3f37734bf91e693726759 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 14 Jun 2015 01:14:33 +0800 Subject: [PATCH 132/436] Revert "Revert "fix multiple filters execute issue"" --- router.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/router.go b/router.go index ca6d917a..688b227d 100644 --- a/router.go +++ b/router.go @@ -611,9 +611,6 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) if p.enableFilter { if l, ok := p.filters[pos]; ok { for _, filterR := range l { - if filterR.returnOnOutput && w.started { - return true - } if ok, params := filterR.ValidRouter(urlPath); ok { for k, v := range params { context.Input.Params[k] = v From 64d4f6518b4558cd1c10a591705ba9ea6471dbd6 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 14 Jun 2015 18:10:10 +0800 Subject: [PATCH 133/436] fix #1213 --- beego.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beego.go b/beego.go index 9c34c9f9..1ee4c65f 100644 --- a/beego.go +++ b/beego.go @@ -336,7 +336,7 @@ func initBeforeHttpRun() { // this function is for test package init func TestBeegoInit(apppath string) { AppPath = apppath - RunMode = "test" + os.Setenv("BEEGO_RUNMODE", "test") AppConfigPath = filepath.Join(AppPath, "conf", "app.conf") err := ParseConfig() if err != nil && !os.IsNotExist(err) { From ba1232dfafeffd52cd86cb002b61bd44d8e0fdff Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 14 Jun 2015 18:35:46 +0800 Subject: [PATCH 134/436] filter should be always the same --- router.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/router.go b/router.go index 688b227d..ca6d917a 100644 --- a/router.go +++ b/router.go @@ -611,6 +611,9 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) if p.enableFilter { if l, ok := p.filters[pos]; ok { for _, filterR := range l { + if filterR.returnOnOutput && w.started { + return true + } if ok, params := filterR.ValidRouter(urlPath); ok { for k, v := range params { context.Input.Params[k] = v From 817650aa3341cf9ce21fa9cc416c6c9cf99118e9 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 15 Jun 2015 20:20:37 +0800 Subject: [PATCH 135/436] keep the short name for logs --- logs/log.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/logs/log.go b/logs/log.go index 5c94a9d8..a7f45956 100644 --- a/logs/log.go +++ b/logs/log.go @@ -298,21 +298,33 @@ func (bl *BeeLogger) Debug(format string, v ...interface{}) { // // Deprecated: compatibility alias for Warning(), Will be removed in 1.5.0. func (bl *BeeLogger) Warn(format string, v ...interface{}) { - bl.Warning(format, v...) + if LevelWarning > bl.level { + return + } + msg := fmt.Sprintf("[W] "+format, v...) + bl.writerMsg(LevelWarning, msg) } // Log INFO level message. // // Deprecated: compatibility alias for Informational(), Will be removed in 1.5.0. func (bl *BeeLogger) Info(format string, v ...interface{}) { - bl.Informational(format, v...) + if LevelInformational > bl.level { + return + } + msg := fmt.Sprintf("[I] "+format, v...) + bl.writerMsg(LevelInformational, msg) } // Log TRACE level message. // // Deprecated: compatibility alias for Debug(), Will be removed in 1.5.0. func (bl *BeeLogger) Trace(format string, v ...interface{}) { - bl.Debug(format, v...) + if LevelDebug > bl.level { + return + } + msg := fmt.Sprintf("[D] "+format, v...) + bl.writerMsg(LevelDebug, msg) } // flush all chan data. From d629c1d3d0142661c687137fd0ef5aaa3848ecb5 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 15 Jun 2015 20:22:05 +0800 Subject: [PATCH 136/436] change the comments --- logs/log.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/logs/log.go b/logs/log.go index a7f45956..49899a48 100644 --- a/logs/log.go +++ b/logs/log.go @@ -295,8 +295,7 @@ func (bl *BeeLogger) Debug(format string, v ...interface{}) { } // Log WARN level message. -// -// Deprecated: compatibility alias for Warning(), Will be removed in 1.5.0. +// compatibility alias for Warning() func (bl *BeeLogger) Warn(format string, v ...interface{}) { if LevelWarning > bl.level { return @@ -306,8 +305,7 @@ func (bl *BeeLogger) Warn(format string, v ...interface{}) { } // Log INFO level message. -// -// Deprecated: compatibility alias for Informational(), Will be removed in 1.5.0. +// compatibility alias for Informational() func (bl *BeeLogger) Info(format string, v ...interface{}) { if LevelInformational > bl.level { return @@ -317,8 +315,7 @@ func (bl *BeeLogger) Info(format string, v ...interface{}) { } // Log TRACE level message. -// -// Deprecated: compatibility alias for Debug(), Will be removed in 1.5.0. +// compatibility alias for Debug() func (bl *BeeLogger) Trace(format string, v ...interface{}) { if LevelDebug > bl.level { return From 0207caab6f3af311b8630ab4d0c74096e1ec3053 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 15 Jun 2015 20:44:14 +0800 Subject: [PATCH 137/436] keep the shortname for logs info/warn/debug --- log.go | 10 +++++----- staticfile.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/log.go b/log.go index 5afba8ed..7949ed96 100644 --- a/log.go +++ b/log.go @@ -78,9 +78,9 @@ func Warning(v ...interface{}) { BeeLogger.Warning(generateFmtStr(len(v)), v...) } -// Deprecated: compatibility alias for Warning(), Will be removed in 1.5.0. +// compatibility alias for Warning() func Warn(v ...interface{}) { - Warning(v...) + BeeLogger.Warn(generateFmtStr(len(v)), v...) } func Notice(v ...interface{}) { @@ -92,9 +92,9 @@ func Informational(v ...interface{}) { BeeLogger.Informational(generateFmtStr(len(v)), v...) } -// Deprecated: compatibility alias for Warning(), Will be removed in 1.5.0. +// compatibility alias for Warning() func Info(v ...interface{}) { - Informational(v...) + BeeLogger.Info(generateFmtStr(len(v)), v...) } // Debug logs a message at debug level. @@ -103,7 +103,7 @@ func Debug(v ...interface{}) { } // Trace logs a message at trace level. -// Deprecated: compatibility alias for Warning(), Will be removed in 1.5.0. +// compatibility alias for Warning() func Trace(v ...interface{}) { BeeLogger.Trace(generateFmtStr(len(v)), v...) } diff --git a/staticfile.go b/staticfile.go index 5ab853a3..7c1ed98c 100644 --- a/staticfile.go +++ b/staticfile.go @@ -58,7 +58,7 @@ func serverStaticRouter(ctx *context.Context) { finfo, err := os.Stat(file) if err != nil { if RunMode == "dev" { - Warn(err) + Warn("Can't find the file:", file, err) } http.NotFound(ctx.ResponseWriter, ctx.Request) return From c8f6e0f1560b1ee52d45a5b6b53ad07d2448bf62 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 15 Jun 2015 20:53:49 +0800 Subject: [PATCH 138/436] remove the hardcode in runtime.Caller --- logs/log.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/logs/log.go b/logs/log.go index 49899a48..cebbc737 100644 --- a/logs/log.go +++ b/logs/log.go @@ -157,15 +157,12 @@ func (bl *BeeLogger) writerMsg(loglevel int, msg string) error { lm.level = loglevel if bl.enableFuncCallDepth { _, file, line, ok := runtime.Caller(bl.loggerFuncCallDepth) - if _, filename := path.Split(file); filename == "log.go" && (line == 97 || line == 83) { - _, file, line, ok = runtime.Caller(bl.loggerFuncCallDepth + 1) - } - if ok { - _, filename := path.Split(file) - lm.msg = fmt.Sprintf("[%s:%d] %s", filename, line, msg) - } else { - lm.msg = msg + if !ok { + file = "???" + line = 0 } + _, filename := path.Split(file) + lm.msg = fmt.Sprintf("[%s:%d] %s", filename, line, msg) } else { lm.msg = msg } From 8f7246e17b504c858592a28a87e96fa7537a5aaf Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 15 Jun 2015 23:49:13 +0800 Subject: [PATCH 139/436] change to version 1.5.0 --- beego.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beego.go b/beego.go index 1ee4c65f..cfebfbea 100644 --- a/beego.go +++ b/beego.go @@ -37,7 +37,7 @@ import ( ) // beego web framework version. -const VERSION = "1.4.3" +const VERSION = "1.5.0" type hookfunc func() error //hook function to run var hooks []hookfunc //hook function slice to store the hookfunc From f7f390dfecc5d2c37e5457e9789b8962c78a4403 Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 16 Jun 2015 14:53:38 +0800 Subject: [PATCH 140/436] fix #1221 --- controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controller.go b/controller.go index 9011593a..a8b9e8d3 100644 --- a/controller.go +++ b/controller.go @@ -527,7 +527,7 @@ func (c *Controller) GetFile(key string) (multipart.File, *multipart.FileHeader, // } // } func (c *Controller) GetFiles(key string) ([]*multipart.FileHeader, error) { - files, ok := c.Ctx.Request.MultipartForm.File["key"] + files, ok := c.Ctx.Request.MultipartForm.File[key] if ok { return files, nil } From 87e8bcc9bea41794117b9b34201b3fe261465af3 Mon Sep 17 00:00:00 2001 From: "MrLee.Kun" Date: Fri, 19 Jun 2015 11:19:35 +0800 Subject: [PATCH 141/436] fix FilterHandler crash issue Filter Handler will crash with error assignment to entry in nil map , params from function Tree.Match() maybe nil. --- router.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/router.go b/router.go index ca6d917a..3e1ebab3 100644 --- a/router.go +++ b/router.go @@ -616,6 +616,9 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) } if ok, params := filterR.ValidRouter(urlPath); ok { for k, v := range params { + if context.Input.Params == nil { + context.Input.Params = make(map[string]string) + } context.Input.Params[k] = v } filterR.filterFunc(context) @@ -699,7 +702,9 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) p[strconv.Itoa(k)] = v } } - context.Input.Params = p + if p != nil { + context.Input.Params = p + } } } From 002302818ddf31ff7e562f07758cf82310d4a9e9 Mon Sep 17 00:00:00 2001 From: Mawueli Kofi Adzoe Date: Wed, 1 Jul 2015 04:17:53 +0000 Subject: [PATCH 142/436] Fix #1237 Package description uses same text as the README. --- beego.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beego.go b/beego.go index cfebfbea..c89ceaf8 100644 --- a/beego.go +++ b/beego.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// beego is an open-source, high-performance, modularity, full-stack web framework +// beego is an open-source, high-performance, modular, full-stack web framework // // package main // From 06b25deab2aa76912289c212d63a68ea86b8fc58 Mon Sep 17 00:00:00 2001 From: SimMan Date: Sat, 4 Jul 2015 17:55:01 +0800 Subject: [PATCH 143/436] Update validators.go MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Support virtual operators paragraph 170！ --- validation/validators.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validation/validators.go b/validation/validators.go index 61b0414a..2dcec356 100644 --- a/validation/validators.go +++ b/validation/validators.go @@ -457,7 +457,7 @@ func (b Base64) GetLimitValue() interface{} { } // just for chinese mobile phone number -var mobilePattern = regexp.MustCompile("^((\\+86)|(86))?(1(([35][0-9])|[8][0-9]|[7][67]|[4][579]))\\d{8}$") +var mobilePattern = regexp.MustCompile("^((\\+86)|(86))?(1(([35][0-9])|[8][0-9]|[7][067]|[4][579]))\\d{8}$") type Mobile struct { Match From 079993b9f722f17d0521fe6e2be4850d7b158d22 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 6 Jul 2015 13:54:14 +0800 Subject: [PATCH 144/436] fix #1245 --- context/input.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/context/input.go b/context/input.go index 1985df21..c8a8aaa9 100644 --- a/context/input.go +++ b/context/input.go @@ -353,7 +353,7 @@ func (input *BeegoInput) Bind(dest interface{}, key string) error { } func (input *BeegoInput) bind(key string, typ reflect.Type) reflect.Value { - rv := reflect.Zero(reflect.TypeOf(0)) + rv := reflect.Zero(typ) switch typ.Kind() { case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: val := input.Query(key) @@ -398,7 +398,7 @@ func (input *BeegoInput) bind(key string, typ reflect.Type) reflect.Value { } func (input *BeegoInput) bindValue(val string, typ reflect.Type) reflect.Value { - rv := reflect.Zero(reflect.TypeOf(0)) + rv := reflect.Zero(typ) switch typ.Kind() { case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: rv = input.bindInt(val, typ) From 8c0ad5ef8834c69920a8254403877826d1959c3f Mon Sep 17 00:00:00 2001 From: skycrab Date: Mon, 6 Jul 2015 21:12:03 +0800 Subject: [PATCH 145/436] fix example/chat i/o timeout --- example/chat/controllers/ws.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/example/chat/controllers/ws.go b/example/chat/controllers/ws.go index fc3917b3..9e405513 100644 --- a/example/chat/controllers/ws.go +++ b/example/chat/controllers/ws.go @@ -54,14 +54,13 @@ func (c *connection) readPump() { }() c.ws.SetReadLimit(maxMessageSize) c.ws.SetReadDeadline(time.Now().Add(readWait)) + c.ws.SetPongHandler(func(string) error { c.ws.SetReadDeadline(time.Now().Add(readWait)); return nil }) for { op, r, err := c.ws.NextReader() if err != nil { break } switch op { - case websocket.PongMessage: - c.ws.SetReadDeadline(time.Now().Add(readWait)) case websocket.TextMessage: message, err := ioutil.ReadAll(r) if err != nil { From 5612f61a9384e61279cf289faee2fceb667ccb5d Mon Sep 17 00:00:00 2001 From: Artem Nistratov Date: Wed, 8 Jul 2015 17:42:00 +0300 Subject: [PATCH 146/436] fix #671 --- orm/models_boot.go | 5 ++++- orm/models_info_f.go | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/orm/models_boot.go b/orm/models_boot.go index cb44bc05..5232a48d 100644 --- a/orm/models_boot.go +++ b/orm/models_boot.go @@ -269,7 +269,10 @@ func bootStrap() { if found == false { mForC: for _, ffi := range fi.relModelInfo.fields.fieldsByType[RelManyToMany] { - if ffi.relModelInfo == mi { + conditions := fi.relThrough != "" && fi.relThrough == ffi.relThrough || + fi.relTable != "" && fi.relTable == ffi.relTable || + fi.relThrough == "" && fi.relTable == "" + if ffi.relModelInfo == mi && conditions { found = true fi.reverseField = ffi.reverseFieldInfoTwo.name diff --git a/orm/models_info_f.go b/orm/models_info_f.go index 84a0c024..01863aaa 100644 --- a/orm/models_info_f.go +++ b/orm/models_info_f.go @@ -223,6 +223,11 @@ checkType: break checkType case "many": fieldType = RelReverseMany + if tv := tags["rel_table"]; tv != "" { + fi.relTable = tv + } else if tv := tags["rel_through"]; tv != "" { + fi.relThrough = tv + } break checkType default: err = fmt.Errorf("error") From 59b903d557532abc228860fbf5fb93641fd1f834 Mon Sep 17 00:00:00 2001 From: Hubery Date: Wed, 15 Jul 2015 17:00:48 +0800 Subject: [PATCH 147/436] set DoRotate fname like xx.2013-01-01.2.log fix fname,by extension to identify the file type on mac and windows. --- logs/file.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/logs/file.go b/logs/file.go index 2d3449ce..84a8c4f3 100644 --- a/logs/file.go +++ b/logs/file.go @@ -205,15 +205,20 @@ func (w *FileLogWriter) lines() (int, error) { } // DoRotate means it need to write file in new file. -// new file name like xx.log.2013-01-01.2 +// new file name like xx.2013-01-01.2.log func (w *FileLogWriter) DoRotate() error { _, err := os.Lstat(w.Filename) if err == nil { // file exists // Find the next available number num := 1 fname := "" + suffix := filepath.Ext(w.Filename) + filenameOnly := strings.TrimSuffix(w.Filename, suffix) + if suffix == "" { + suffix = ".log" + } for ; err == nil && num <= 999; num++ { - fname = w.Filename + fmt.Sprintf(".%s.%03d", time.Now().Format("2006-01-02"), num) + fname = filenameOnly + fmt.Sprintf(".%s.%03d%s", time.Now().Format("2006-01-02"), num, suffix) _, err = os.Lstat(fname) } // return error if the last file checked still existed From 0564956fd6462393ed8d023591b687b4d064da95 Mon Sep 17 00:00:00 2001 From: Mawuli Adzoe Date: Wed, 15 Jul 2015 12:04:18 +0000 Subject: [PATCH 148/436] Fix for #1256. Indent the code sample lines properly. --- beego.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/beego.go b/beego.go index cfebfbea..e4e7f3b0 100644 --- a/beego.go +++ b/beego.go @@ -14,13 +14,13 @@ // beego is an open-source, high-performance, modularity, full-stack web framework // -// package main +// package main // -// import "github.com/astaxie/beego" +// import "github.com/astaxie/beego" // -// func main() { -// beego.Run() -// } +// func main() { +// beego.Run() +// } // // more infomation: http://beego.me package beego From 45d693e6d62c7eef3da6640d0195539c485d31c3 Mon Sep 17 00:00:00 2001 From: Mawueli Kofi Adzoe Date: Thu, 16 Jul 2015 04:32:07 +0000 Subject: [PATCH 149/436] Add quick start example from website to README --- README.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b650887..1eb6e3b3 100644 --- a/README.md +++ b/README.md @@ -7,10 +7,31 @@ beego is an open-source, high-performance, modular, full-stack web framework. More info [beego.me](http://beego.me) -## Installation +##Quick Start +######Download and install go get github.com/astaxie/beego +######Create file `hello.go` +```go +package main + +import "github.com/astaxie/beego" + +func main(){ + beego.Run() +} +``` +######Build and run +```bash + go build hello.go + ./hello +``` +######Congratulations! +You just built your first beego app. +Open your browser and visit `http://localhost:8000`. +Please see [Documentation](http://beego.me/docs) for more. + ## Features * RESTful support From 19d82ab62c3e96a5d7839e89fa7ebd29fd7bbb23 Mon Sep 17 00:00:00 2001 From: Pelle Johnsen Date: Wed, 22 Jul 2015 18:12:57 +0200 Subject: [PATCH 150/436] Fix #1274: Add QuerySeter.Distinct() --- orm/db.go | 6 +++++- orm/orm_queryset.go | 37 ++++++++++++++++++++++--------------- orm/types.go | 1 + 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/orm/db.go b/orm/db.go index 20dc80f2..cefd5dfc 100644 --- a/orm/db.go +++ b/orm/db.go @@ -814,7 +814,11 @@ func (d *dbBase) ReadBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condi } } - query := fmt.Sprintf("SELECT %s FROM %s%s%s T0 %s%s%s%s", sels, Q, mi.table, Q, join, where, orderBy, limit) + sqlSelect := "SELECT" + if qs.distinct { + sqlSelect += " DISTINCT" + } + query := fmt.Sprintf("%s %s FROM %s%s%s T0 %s%s%s%s", sqlSelect, sels, Q, mi.table, Q, join, where, orderBy, limit) d.ins.ReplaceMarks(&query) diff --git a/orm/orm_queryset.go b/orm/orm_queryset.go index 5cc47617..106b62e5 100644 --- a/orm/orm_queryset.go +++ b/orm/orm_queryset.go @@ -61,6 +61,7 @@ type querySet struct { limit int64 offset int64 orders []string + distinct bool orm *orm } @@ -112,24 +113,30 @@ func (o querySet) OrderBy(exprs ...string) QuerySeter { return &o } +// add DISTINCT to SELECT +func (o querySet) Distinct() QuerySeter { + o.distinct = true + return &o +} + // set relation model to query together. // it will query relation models and assign to parent model. func (o querySet) RelatedSel(params ...interface{}) QuerySeter { - if len(params) == 0 { - o.relDepth = DefaultRelsDepth - } else { - for _, p := range params { - switch val := p.(type) { - case string: - o.related = append(o.related, val) - case int: - o.relDepth = val - default: - panic(fmt.Errorf(" wrong param kind: %v", val)) - } - } - } - return &o + if len(params) == 0 { + o.relDepth = DefaultRelsDepth + } else { + for _, p := range params { + switch val := p.(type) { + case string: + o.related = append(o.related, val) + case int: + o.relDepth = val + default: + panic(fmt.Errorf(" wrong param kind: %v", val)) + } + } + } + return &o } // set condition to QuerySeter. diff --git a/orm/types.go b/orm/types.go index b46be4fc..4347e46f 100644 --- a/orm/types.go +++ b/orm/types.go @@ -67,6 +67,7 @@ type QuerySeter interface { Limit(interface{}, ...interface{}) QuerySeter Offset(interface{}) QuerySeter OrderBy(...string) QuerySeter + Distinct() QuerySeter RelatedSel(...interface{}) QuerySeter Count() (int64, error) Exist() bool From b622d5d369961af4356e4d01dce78deacb0c335a Mon Sep 17 00:00:00 2001 From: Mawuli Adzoe Date: Sat, 18 Jul 2015 10:09:22 +0000 Subject: [PATCH 151/436] Fix #1269 extract documentation Fix #1271 Add description from docs on beego.me to README and also add same description to godoc --- README.md | 3 ++- beego.go | 11 ----------- doc.go | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 doc.go diff --git a/README.md b/README.md index 1eb6e3b3..b1b48e75 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@ [![Build Status](https://drone.io/github.com/astaxie/beego/status.png)](https://drone.io/github.com/astaxie/beego/latest) [![GoDoc](http://godoc.org/github.com/astaxie/beego?status.svg)](http://godoc.org/github.com/astaxie/beego) -beego is an open-source, high-performance, modular, full-stack web framework. +beego is used for rapid development of RESTful APIs, web apps and backend services in Go. +It is inspired by Tornado, Sinatra and Flask. beego has some Go-specific features such as interfaces and struct embedding. More info [beego.me](http://beego.me) diff --git a/beego.go b/beego.go index 8115a558..60483764 100644 --- a/beego.go +++ b/beego.go @@ -12,17 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// beego is an open-source, high-performance, modular, full-stack web framework -// -// package main -// -// import "github.com/astaxie/beego" -// -// func main() { -// beego.Run() -// } -// -// more infomation: http://beego.me package beego import ( diff --git a/doc.go b/doc.go new file mode 100644 index 00000000..3a5b5cb8 --- /dev/null +++ b/doc.go @@ -0,0 +1,17 @@ +/* +beego: an open-source, high-performance, modular, full-stack web framework + +It is used for rapid development of RESTful APIs, web apps and backend services in Go. +beego is inspired by Tornado, Sinatra and Flask with the added benefit of some Go-specific features such as interfaces and struct embedding. + + package main + import "github.com/astaxie/beego" + + func main() { + beego.Run() + } + +more infomation: http://beego.me +*/ +package beego + From b26ef5b2e549ea3ba00f9bdb9c2e4c8dbcffb31b Mon Sep 17 00:00:00 2001 From: JessonChan Date: Mon, 27 Jul 2015 08:44:58 +0800 Subject: [PATCH 152/436] typo fixed registor==>register innner ==> inner --- app.go | 2 +- namespace.go | 38 +++++++++++++++++----------------- router.go | 58 ++++++++++++++++++++++++++-------------------------- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/app.go b/app.go index 8fc320ad..eddf7e21 100644 --- a/app.go +++ b/app.go @@ -28,7 +28,7 @@ import ( // App defines beego application with a new PatternServeMux. type App struct { - Handlers *ControllerRegistor + Handlers *ControllerRegister Server *http.Server } diff --git a/namespace.go b/namespace.go index ebb7c14f..86dc2ebd 100644 --- a/namespace.go +++ b/namespace.go @@ -23,16 +23,16 @@ import ( type namespaceCond func(*beecontext.Context) bool -type innnerNamespace func(*Namespace) +type innerNamespace func(*Namespace) // Namespace is store all the info type Namespace struct { prefix string - handlers *ControllerRegistor + handlers *ControllerRegister } // get new Namespace -func NewNamespace(prefix string, params ...innnerNamespace) *Namespace { +func NewNamespace(prefix string, params ...innerNamespace) *Namespace { ns := &Namespace{ prefix: prefix, handlers: NewControllerRegister(), @@ -276,112 +276,112 @@ func addPrefix(t *Tree, prefix string) { } // Namespace Condition -func NSCond(cond namespaceCond) innnerNamespace { +func NSCond(cond namespaceCond) innerNamespace { return func(ns *Namespace) { ns.Cond(cond) } } // Namespace BeforeRouter filter -func NSBefore(filiterList ...FilterFunc) innnerNamespace { +func NSBefore(filiterList ...FilterFunc) innerNamespace { return func(ns *Namespace) { ns.Filter("before", filiterList...) } } // Namespace FinishRouter filter -func NSAfter(filiterList ...FilterFunc) innnerNamespace { +func NSAfter(filiterList ...FilterFunc) innerNamespace { return func(ns *Namespace) { ns.Filter("after", filiterList...) } } // Namespace Include ControllerInterface -func NSInclude(cList ...ControllerInterface) innnerNamespace { +func NSInclude(cList ...ControllerInterface) innerNamespace { return func(ns *Namespace) { ns.Include(cList...) } } // Namespace Router -func NSRouter(rootpath string, c ControllerInterface, mappingMethods ...string) innnerNamespace { +func NSRouter(rootpath string, c ControllerInterface, mappingMethods ...string) innerNamespace { return func(ns *Namespace) { ns.Router(rootpath, c, mappingMethods...) } } // Namespace Get -func NSGet(rootpath string, f FilterFunc) innnerNamespace { +func NSGet(rootpath string, f FilterFunc) innerNamespace { return func(ns *Namespace) { ns.Get(rootpath, f) } } // Namespace Post -func NSPost(rootpath string, f FilterFunc) innnerNamespace { +func NSPost(rootpath string, f FilterFunc) innerNamespace { return func(ns *Namespace) { ns.Post(rootpath, f) } } // Namespace Head -func NSHead(rootpath string, f FilterFunc) innnerNamespace { +func NSHead(rootpath string, f FilterFunc) innerNamespace { return func(ns *Namespace) { ns.Head(rootpath, f) } } // Namespace Put -func NSPut(rootpath string, f FilterFunc) innnerNamespace { +func NSPut(rootpath string, f FilterFunc) innerNamespace { return func(ns *Namespace) { ns.Put(rootpath, f) } } // Namespace Delete -func NSDelete(rootpath string, f FilterFunc) innnerNamespace { +func NSDelete(rootpath string, f FilterFunc) innerNamespace { return func(ns *Namespace) { ns.Delete(rootpath, f) } } // Namespace Any -func NSAny(rootpath string, f FilterFunc) innnerNamespace { +func NSAny(rootpath string, f FilterFunc) innerNamespace { return func(ns *Namespace) { ns.Any(rootpath, f) } } // Namespace Options -func NSOptions(rootpath string, f FilterFunc) innnerNamespace { +func NSOptions(rootpath string, f FilterFunc) innerNamespace { return func(ns *Namespace) { ns.Options(rootpath, f) } } // Namespace Patch -func NSPatch(rootpath string, f FilterFunc) innnerNamespace { +func NSPatch(rootpath string, f FilterFunc) innerNamespace { return func(ns *Namespace) { ns.Patch(rootpath, f) } } //Namespace AutoRouter -func NSAutoRouter(c ControllerInterface) innnerNamespace { +func NSAutoRouter(c ControllerInterface) innerNamespace { return func(ns *Namespace) { ns.AutoRouter(c) } } // Namespace AutoPrefix -func NSAutoPrefix(prefix string, c ControllerInterface) innnerNamespace { +func NSAutoPrefix(prefix string, c ControllerInterface) innerNamespace { return func(ns *Namespace) { ns.AutoPrefix(prefix, c) } } // Namespace add sub Namespace -func NSNamespace(prefix string, params ...innnerNamespace) innnerNamespace { +func NSNamespace(prefix string, params ...innerNamespace) innerNamespace { return func(ns *Namespace) { n := NewNamespace(prefix, params...) ns.Namespace(n) diff --git a/router.go b/router.go index 3e1ebab3..217ad65f 100644 --- a/router.go +++ b/router.go @@ -110,22 +110,22 @@ type controllerInfo struct { routerType int } -// ControllerRegistor containers registered router rules, controller handlers and filters. -type ControllerRegistor struct { +// ControllerRegister containers registered router rules, controller handlers and filters. +type ControllerRegister struct { routers map[string]*Tree enableFilter bool filters map[int][]*FilterRouter } -// NewControllerRegister returns a new ControllerRegistor. -func NewControllerRegister() *ControllerRegistor { - return &ControllerRegistor{ +// NewControllerRegister returns a new ControllerRegister. +func NewControllerRegister() *ControllerRegister { + return &ControllerRegister{ routers: make(map[string]*Tree), filters: make(map[int][]*FilterRouter), } } -// Add controller handler and pattern rules to ControllerRegistor. +// Add controller handler and pattern rules to ControllerRegister. // usage: // default methods is the same name as method // Add("/user",&UserController{}) @@ -135,7 +135,7 @@ func NewControllerRegister() *ControllerRegistor { // Add("/api/delete",&RestController{},"delete:DeleteFood") // Add("/api",&RestController{},"get,post:ApiFunc") // Add("/simple",&SimpleController{},"get:GetFunc;post:PostFunc") -func (p *ControllerRegistor) Add(pattern string, c ControllerInterface, mappingMethods ...string) { +func (p *ControllerRegister) Add(pattern string, c ControllerInterface, mappingMethods ...string) { reflectVal := reflect.ValueOf(c) t := reflect.Indirect(reflectVal).Type() methods := make(map[string]string) @@ -183,7 +183,7 @@ func (p *ControllerRegistor) Add(pattern string, c ControllerInterface, mappingM } } -func (p *ControllerRegistor) addToRouter(method, pattern string, r *controllerInfo) { +func (p *ControllerRegister) addToRouter(method, pattern string, r *controllerInfo) { if !RouterCaseSensitive { pattern = strings.ToLower(pattern) } @@ -198,7 +198,7 @@ func (p *ControllerRegistor) addToRouter(method, pattern string, r *controllerIn // only when the Runmode is dev will generate router file in the router/auto.go from the controller // Include(&BankAccount{}, &OrderController{},&RefundController{},&ReceiptController{}) -func (p *ControllerRegistor) Include(cList ...ControllerInterface) { +func (p *ControllerRegister) Include(cList ...ControllerInterface) { if RunMode == "dev" { skip := make(map[string]bool, 10) for _, c := range cList { @@ -243,7 +243,7 @@ func (p *ControllerRegistor) Include(cList ...ControllerInterface) { // Get("/", func(ctx *context.Context){ // ctx.Output.Body("hello world") // }) -func (p *ControllerRegistor) Get(pattern string, f FilterFunc) { +func (p *ControllerRegister) Get(pattern string, f FilterFunc) { p.AddMethod("get", pattern, f) } @@ -252,7 +252,7 @@ func (p *ControllerRegistor) Get(pattern string, f FilterFunc) { // Post("/api", func(ctx *context.Context){ // ctx.Output.Body("hello world") // }) -func (p *ControllerRegistor) Post(pattern string, f FilterFunc) { +func (p *ControllerRegister) Post(pattern string, f FilterFunc) { p.AddMethod("post", pattern, f) } @@ -261,7 +261,7 @@ func (p *ControllerRegistor) Post(pattern string, f FilterFunc) { // Put("/api/:id", func(ctx *context.Context){ // ctx.Output.Body("hello world") // }) -func (p *ControllerRegistor) Put(pattern string, f FilterFunc) { +func (p *ControllerRegister) Put(pattern string, f FilterFunc) { p.AddMethod("put", pattern, f) } @@ -270,7 +270,7 @@ func (p *ControllerRegistor) Put(pattern string, f FilterFunc) { // Delete("/api/:id", func(ctx *context.Context){ // ctx.Output.Body("hello world") // }) -func (p *ControllerRegistor) Delete(pattern string, f FilterFunc) { +func (p *ControllerRegister) Delete(pattern string, f FilterFunc) { p.AddMethod("delete", pattern, f) } @@ -279,7 +279,7 @@ func (p *ControllerRegistor) Delete(pattern string, f FilterFunc) { // Head("/api/:id", func(ctx *context.Context){ // ctx.Output.Body("hello world") // }) -func (p *ControllerRegistor) Head(pattern string, f FilterFunc) { +func (p *ControllerRegister) Head(pattern string, f FilterFunc) { p.AddMethod("head", pattern, f) } @@ -288,7 +288,7 @@ func (p *ControllerRegistor) Head(pattern string, f FilterFunc) { // Patch("/api/:id", func(ctx *context.Context){ // ctx.Output.Body("hello world") // }) -func (p *ControllerRegistor) Patch(pattern string, f FilterFunc) { +func (p *ControllerRegister) Patch(pattern string, f FilterFunc) { p.AddMethod("patch", pattern, f) } @@ -297,7 +297,7 @@ func (p *ControllerRegistor) Patch(pattern string, f FilterFunc) { // Options("/api/:id", func(ctx *context.Context){ // ctx.Output.Body("hello world") // }) -func (p *ControllerRegistor) Options(pattern string, f FilterFunc) { +func (p *ControllerRegister) Options(pattern string, f FilterFunc) { p.AddMethod("options", pattern, f) } @@ -306,7 +306,7 @@ func (p *ControllerRegistor) Options(pattern string, f FilterFunc) { // Any("/api/:id", func(ctx *context.Context){ // ctx.Output.Body("hello world") // }) -func (p *ControllerRegistor) Any(pattern string, f FilterFunc) { +func (p *ControllerRegister) Any(pattern string, f FilterFunc) { p.AddMethod("*", pattern, f) } @@ -315,7 +315,7 @@ func (p *ControllerRegistor) Any(pattern string, f FilterFunc) { // AddMethod("get","/api/:id", func(ctx *context.Context){ // ctx.Output.Body("hello world") // }) -func (p *ControllerRegistor) AddMethod(method, pattern string, f FilterFunc) { +func (p *ControllerRegister) AddMethod(method, pattern string, f FilterFunc) { if _, ok := HTTPMETHOD[strings.ToUpper(method)]; method != "*" && !ok { panic("not support http method: " + method) } @@ -344,7 +344,7 @@ func (p *ControllerRegistor) AddMethod(method, pattern string, f FilterFunc) { } // add user defined Handler -func (p *ControllerRegistor) Handler(pattern string, h http.Handler, options ...interface{}) { +func (p *ControllerRegister) Handler(pattern string, h http.Handler, options ...interface{}) { route := &controllerInfo{} route.pattern = pattern route.routerType = routerTypeHandler @@ -359,21 +359,21 @@ func (p *ControllerRegistor) Handler(pattern string, h http.Handler, options ... } } -// Add auto router to ControllerRegistor. +// Add auto router to ControllerRegister. // example beego.AddAuto(&MainContorlller{}), // MainController has method List and Page. // visit the url /main/list to execute List function // /main/page to execute Page function. -func (p *ControllerRegistor) AddAuto(c ControllerInterface) { +func (p *ControllerRegister) AddAuto(c ControllerInterface) { p.AddAutoPrefix("/", c) } -// Add auto router to ControllerRegistor with prefix. +// Add auto router to ControllerRegister with prefix. // example beego.AddAutoPrefix("/admin",&MainContorlller{}), // MainController has method List and Page. // visit the url /admin/main/list to execute List function // /admin/main/page to execute Page function. -func (p *ControllerRegistor) AddAutoPrefix(prefix string, c ControllerInterface) { +func (p *ControllerRegister) AddAutoPrefix(prefix string, c ControllerInterface) { reflectVal := reflect.ValueOf(c) rt := reflectVal.Type() ct := reflect.Indirect(reflectVal).Type() @@ -401,7 +401,7 @@ func (p *ControllerRegistor) AddAutoPrefix(prefix string, c ControllerInterface) // Add a FilterFunc with pattern rule and action constant. // The bool params is for setting the returnOnOutput value (false allows multiple filters to execute) -func (p *ControllerRegistor) InsertFilter(pattern string, pos int, filter FilterFunc, params ...bool) error { +func (p *ControllerRegister) InsertFilter(pattern string, pos int, filter FilterFunc, params ...bool) error { mr := new(FilterRouter) mr.tree = NewTree() @@ -420,7 +420,7 @@ func (p *ControllerRegistor) InsertFilter(pattern string, pos int, filter Filter } // add Filter into -func (p *ControllerRegistor) insertFilterRouter(pos int, mr *FilterRouter) error { +func (p *ControllerRegister) insertFilterRouter(pos int, mr *FilterRouter) error { p.filters[pos] = append(p.filters[pos], mr) p.enableFilter = true return nil @@ -428,7 +428,7 @@ func (p *ControllerRegistor) insertFilterRouter(pos int, mr *FilterRouter) error // UrlFor does another controller handler in this request function. // it can access any controller method. -func (p *ControllerRegistor) UrlFor(endpoint string, values ...interface{}) string { +func (p *ControllerRegister) UrlFor(endpoint string, values ...interface{}) string { paths := strings.Split(endpoint, ".") if len(paths) <= 1 { Warn("urlfor endpoint must like path.controller.method") @@ -460,7 +460,7 @@ func (p *ControllerRegistor) UrlFor(endpoint string, values ...interface{}) stri return "" } -func (p *ControllerRegistor) geturl(t *Tree, url, controllName, methodName string, params map[string]string, httpMethod string) (bool, string) { +func (p *ControllerRegister) geturl(t *Tree, url, controllName, methodName string, params map[string]string, httpMethod string) (bool, string) { for k, subtree := range t.fixrouters { u := path.Join(url, k) ok, u := p.geturl(subtree, u, controllName, methodName, params, httpMethod) @@ -575,7 +575,7 @@ func (p *ControllerRegistor) geturl(t *Tree, url, controllName, methodName strin } // Implement http.Handler interface. -func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) { +func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) { starttime := time.Now() var runrouter reflect.Type var findrouter bool @@ -861,7 +861,7 @@ Admin: } } -func (p *ControllerRegistor) recoverPanic(context *beecontext.Context) { +func (p *ControllerRegister) recoverPanic(context *beecontext.Context) { if err := recover(); err != nil { if err == USERSTOPRUN { return From 57fdc308e34e7b656585f1b56fb47078e10963c5 Mon Sep 17 00:00:00 2001 From: wulove Date: Thu, 6 Aug 2015 09:36:43 +0800 Subject: [PATCH 153/436] =?UTF-8?q?AutoRender=E4=B8=BA=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E7=BC=96=E8=AF=91=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit AutoRender为空，Controller.Render()不再执行，故无需编译模版 --- beego.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/beego.go b/beego.go index 60483764..7bcc0740 100644 --- a/beego.go +++ b/beego.go @@ -306,11 +306,13 @@ func initBeforeHttpRun() { } go GlobalSessions.GC() } - - err := BuildTemplate(ViewsPath) - if err != nil { - if RunMode == "dev" { - Warn(err) + + if AutoRender { + err := BuildTemplate(ViewsPath) + if err != nil { + if RunMode == "dev" { + Warn(err) + } } } From 877b5c233e889046853b17e799fa65e7aee1ee6b Mon Sep 17 00:00:00 2001 From: wulove Date: Thu, 6 Aug 2015 10:09:34 +0800 Subject: [PATCH 154/436] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=A8=A1=E7=89=88=E5=87=BD=E6=95=B0BuildTemplate=E5=8F=AF?= =?UTF-8?q?=E5=8F=98=E5=8F=82=E6=95=B0=EF=BC=8C=E4=BD=BF=E4=B9=8B=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=8D=95=E4=B8=AA=E6=88=96=E5=A4=9A=E4=B8=AA=E6=A8=A1?= =?UTF-8?q?=E7=89=88=E7=9A=84=E7=BC=96=E8=AF=91=EF=BC=8C=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E9=92=88=E5=AF=B9=E5=BC=80=E5=8F=91=E6=A8=A1=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E6=AF=8F=E4=B8=AA=E8=AF=B7=E6=B1=82=E5=8F=AA=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E8=AF=B7=E6=B1=82=E7=9B=B8=E5=85=B3=E6=A8=A1?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加编译模版函数BuildTemplate可变参数，使之支持单个或多个模版的编译，同时针对开发模式，每个请求只编译当前请求相关模版，不再每次请求都编译全部模版 --- controller.go | 15 +++++++++++++-- template.go | 14 ++++++++------ template_test.go | 2 +- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/controller.go b/controller.go index a8b9e8d3..65b311b6 100644 --- a/controller.go +++ b/controller.go @@ -200,8 +200,19 @@ func (c *Controller) RenderBytes() ([]byte, error) { if c.TplNames == "" { c.TplNames = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt } + if RunMode == "dev" { - BuildTemplate(ViewsPath) + buildFiles := make([]string, 1) + buildFiles = append(buildFiles, c.TplNames) + if c.LayoutSections != nil { + for _, sectionTpl := range c.LayoutSections { + if sectionTpl == "" { + continue + } + buildFiles = append(buildFiles, sectionTpl) + } + } + BuildTemplate(ViewsPath, buildFiles...) } newbytes := bytes.NewBufferString("") if _, ok := BeeTemplates[c.TplNames]; !ok { @@ -246,7 +257,7 @@ func (c *Controller) RenderBytes() ([]byte, error) { c.TplNames = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt } if RunMode == "dev" { - BuildTemplate(ViewsPath) + BuildTemplate(ViewsPath, c.TplNames) } ibytes := bytes.NewBufferString("") if _, ok := BeeTemplates[c.TplNames]; !ok { diff --git a/template.go b/template.go index 64b1939e..45ecbe52 100644 --- a/template.go +++ b/template.go @@ -127,7 +127,7 @@ func AddTemplateExt(ext string) { // build all template files in a directory. // it makes beego can render any template file in view directory. -func BuildTemplate(dir string) error { +func BuildTemplate(dir string, files... string) error { if _, err := os.Stat(dir); err != nil { if os.IsNotExist(err) { return nil @@ -148,11 +148,13 @@ func BuildTemplate(dir string) error { } for _, v := range self.files { for _, file := range v { - t, err := getTemplate(self.root, file, v...) - if err != nil { - Trace("parse template err:", file, err) - } else { - BeeTemplates[file] = t + if (files == nil || utils.InSlice(file, files)) { + t, err := getTemplate(self.root, file, v...) + if err != nil { + Trace("parse template err:", file, err) + } else { + BeeTemplates[file] = t + } } } } diff --git a/template_test.go b/template_test.go index b35da5ce..79740f2b 100644 --- a/template_test.go +++ b/template_test.go @@ -123,7 +123,7 @@ func TestRelativeTemplate(t *testing.T) { f.Close() } } - if err := BuildTemplate(dir); err != nil { + if err := BuildTemplate(dir, files[1]); err != nil { t.Fatal(err) } if err := BeeTemplates["easyui/rbac/user.tpl"].ExecuteTemplate(os.Stdout, "easyui/rbac/user.tpl", nil); err != nil { From d4e15c0bd0d27c5ed4f49d150e1972af9a58d6bb Mon Sep 17 00:00:00 2001 From: Sergey Shcherbina Date: Mon, 17 Aug 2015 00:08:02 +0500 Subject: [PATCH 155/436] Added MapGet template func --- template.go | 1 + templatefunc.go | 73 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/template.go b/template.go index 64b1939e..905f0bef 100644 --- a/template.go +++ b/template.go @@ -54,6 +54,7 @@ func init() { beegoTplFuncMap["assets_js"] = AssetsJs beegoTplFuncMap["assets_css"] = AssetsCss beegoTplFuncMap["config"] = Config + beegoTplFuncMap["map_get"] = MapGet // go1.2 added template funcs // Comparisons diff --git a/templatefunc.go b/templatefunc.go index 28ed15a3..6092f71e 100644 --- a/templatefunc.go +++ b/templatefunc.go @@ -652,3 +652,76 @@ func ge(arg1, arg2 interface{}) (bool, error) { } // go1.2 added template funcs. end + +// getting value from map by keys +// usage: +// Data["m"] = map[string]interface{} { +// "a": 1, +// "1": map[string]float64{ +// "c": 4, +// }, +// } +// +// {{ map_get m "a" }} // return 1 +// {{ map_get m 1 "c" }} // return 4 +func MapGet(arg1 interface{}, arg2 ...interface{}) (interface{}, error) { + arg1Type := reflect.TypeOf(arg1) + arg1Val := reflect.ValueOf(arg1) + + if arg1Type.Kind() == reflect.Map && len(arg2) > 0 { + // check whether arg2[0] type equals to arg1 key type + // if they are different, make convertion + arg2Val := reflect.ValueOf(arg2[0]) + arg2Type := reflect.TypeOf(arg2[0]) + if arg2Type.Kind() != arg1Type.Key().Kind() { + // convert arg2Value to string + var arg2ConvertedVal interface{} + arg2String := fmt.Sprintf("%v", arg2[0]) + + // convert string representation to any other type + switch arg1Type.Key().Kind() { + case reflect.Bool: + arg2ConvertedVal, _ = strconv.ParseBool(arg2String) + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + arg2ConvertedVal, _ = strconv.ParseInt(arg2String, 0, 64) + case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: + arg2ConvertedVal, _ = strconv.ParseUint(arg2String, 0, 64) + case reflect.Float32, reflect.Float64: + arg2ConvertedVal, _ = strconv.ParseFloat(arg2String, 64) + case reflect.String: + arg2ConvertedVal = arg2String + default: + arg2ConvertedVal = arg2Val.Interface() + } + arg2Val = reflect.ValueOf(arg2ConvertedVal) + } + + storedVal := arg1Val.MapIndex(arg2Val) + + var result interface{} + + switch arg1Type.Elem().Kind() { + case reflect.Bool: + result = storedVal.Bool() + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + result = storedVal.Int() + case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: + result = storedVal.Uint() + case reflect.Float32, reflect.Float64: + result = storedVal.Float() + case reflect.String: + result = storedVal.String() + default: + result = storedVal.Interface() + } + + // if there is more keys, handle this recursively + if len(arg2) > 1 { + return MapGet(result, arg2[1:]...) + } else { + return result, nil + } + } else { + return nil, nil + } +} From d91840779ac5e82cfea039f1fdd7fa38c7f7d908 Mon Sep 17 00:00:00 2001 From: Hepri Date: Mon, 17 Aug 2015 01:18:29 +0500 Subject: [PATCH 156/436] Update templatefunc.go --- templatefunc.go | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/templatefunc.go b/templatefunc.go index 6092f71e..0bfdd31c 100644 --- a/templatefunc.go +++ b/templatefunc.go @@ -698,29 +698,36 @@ func MapGet(arg1 interface{}, arg2 ...interface{}) (interface{}, error) { storedVal := arg1Val.MapIndex(arg2Val) - var result interface{} + + if storedVal.IsValid() { + var result interface{} - switch arg1Type.Elem().Kind() { - case reflect.Bool: - result = storedVal.Bool() - case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: - result = storedVal.Int() - case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: - result = storedVal.Uint() - case reflect.Float32, reflect.Float64: - result = storedVal.Float() - case reflect.String: - result = storedVal.String() - default: - result = storedVal.Interface() - } + switch arg1Type.Elem().Kind() { + case reflect.Bool: + result = storedVal.Bool() + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + result = storedVal.Int() + case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: + result = storedVal.Uint() + case reflect.Float32, reflect.Float64: + result = storedVal.Float() + case reflect.String: + result = storedVal.String() + default: + result = storedVal.Interface() + } - // if there is more keys, handle this recursively - if len(arg2) > 1 { - return MapGet(result, arg2[1:]...) + // if there is more keys, handle this recursively + if len(arg2) > 1 { + return MapGet(result, arg2[1:]...) + } else { + return result, nil + } } else { - return result, nil + return nil, nil } + + } else { return nil, nil } From 9107fd8898fd98d94a342cc1b251237619f48794 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 17 Aug 2015 22:33:28 +0800 Subject: [PATCH 157/436] remove the default timeout setting --- httplib/httplib.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 68c22d70..a160bce0 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -74,12 +74,6 @@ func SetDefaultSetting(setting BeegoHttpSettings) { settingMutex.Lock() defer settingMutex.Unlock() defaultSetting = setting - if defaultSetting.ConnectTimeout == 0 { - defaultSetting.ConnectTimeout = 60 * time.Second - } - if defaultSetting.ReadWriteTimeout == 0 { - defaultSetting.ReadWriteTimeout = 60 * time.Second - } } // return *BeegoHttpRequest with specific method From 860006bfdae293bd30944a5dd7980b8f964da5b7 Mon Sep 17 00:00:00 2001 From: Shuai Date: Tue, 18 Aug 2015 19:28:17 +0800 Subject: [PATCH 158/436] =?UTF-8?q?httplib=E8=AF=B7=E6=B1=82=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=94=AF=E6=8C=81[]string?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- httplib/httplib.go | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 68c22d70..c671cc0a 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -100,8 +100,8 @@ func NewBeegoRequest(rawurl, method string) *BeegoHttpRequest { return &BeegoHttpRequest{ url: rawurl, req: &req, - params: map[string]string{}, - files: map[string]string{}, + params: map[string]interface{}{}, + files: map[string]string{}, setting: defaultSetting, resp: &resp, } @@ -150,7 +150,7 @@ type BeegoHttpSettings struct { type BeegoHttpRequest struct { url string req *http.Request - params map[string]string + params map[string]interface{} files map[string]string setting BeegoHttpSettings resp *http.Response @@ -272,8 +272,13 @@ func (b *BeegoHttpRequest) SetProxy(proxy func(*http.Request) (*url.URL, error)) // Param adds query param in to request. // params build query string as ?key1=value1&key2=value2... -func (b *BeegoHttpRequest) Param(key, value string) *BeegoHttpRequest { - b.params[key] = value +func (b *BeegoHttpRequest) Param(key, value interface{}) *BeegoHttpRequest { + switch value.(type) { + case string: + b.params[key.(string)] = value.(string) + case []string: + b.params[key.(string)] = value.([]string) + } return b } @@ -348,7 +353,14 @@ func (b *BeegoHttpRequest) buildUrl(paramBody string) { } } for k, v := range b.params { - bodyWriter.WriteField(k, v) + switch v.(type) { + case string: + bodyWriter.WriteField(k, v.(string)) + case []string: + for _, vv := range v.([]string) { + bodyWriter.WriteField(k, vv) + } + } } bodyWriter.Close() pw.Close() @@ -383,10 +395,20 @@ func (b *BeegoHttpRequest) SendOut() (*http.Response, error) { if len(b.params) > 0 { var buf bytes.Buffer for k, v := range b.params { - buf.WriteString(url.QueryEscape(k)) - buf.WriteByte('=') - buf.WriteString(url.QueryEscape(v)) - buf.WriteByte('&') + switch v.(type) { + case string: + buf.WriteString(url.QueryEscape(k)) + buf.WriteByte('=') + buf.WriteString(url.QueryEscape(v.(string))) + buf.WriteByte('&') + case []string: + for _, vv := range v.([]string) { + buf.WriteString(url.QueryEscape(k)) + buf.WriteByte('=') + buf.WriteString(url.QueryEscape(vv)) + buf.WriteByte('&') + } + } } paramBody = buf.String() paramBody = paramBody[0 : len(paramBody)-1] From ff92f22d841a7015958ede181d8c76164c7c84bb Mon Sep 17 00:00:00 2001 From: Shuai Date: Tue, 18 Aug 2015 23:19:24 +0800 Subject: [PATCH 159/436] =?UTF-8?q?=E5=88=A0=E9=99=A4Param=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=96=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- httplib/httplib.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index c671cc0a..1b7b207d 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -272,13 +272,8 @@ func (b *BeegoHttpRequest) SetProxy(proxy func(*http.Request) (*url.URL, error)) // Param adds query param in to request. // params build query string as ?key1=value1&key2=value2... -func (b *BeegoHttpRequest) Param(key, value interface{}) *BeegoHttpRequest { - switch value.(type) { - case string: - b.params[key.(string)] = value.(string) - case []string: - b.params[key.(string)] = value.([]string) - } +func (b *BeegoHttpRequest) Param(key string, value interface{}) *BeegoHttpRequest { + b.params[key] = value return b } From 506f54a080ed4006676af3019d79bdee0507e4bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=B0=8F=E7=8E=89?= Date: Wed, 19 Aug 2015 15:23:50 +0800 Subject: [PATCH 160/436] Update router.go, add Flush for responseWriter --- router.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/router.go b/router.go index 217ad65f..7cce86fe 100644 --- a/router.go +++ b/router.go @@ -931,6 +931,13 @@ func (w *responseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) { return hj.Hijack() } +func (w *responseWriter) Flush() { + f, ok := w.writer.(http.Flusher) + if ok { + f.Flush() + } +} + func tourl(params map[string]string) string { if len(params) == 0 { return "" From 0e3fe64c6922bc21f33530a8379b6406b874ba98 Mon Sep 17 00:00:00 2001 From: Sergey Shcherbina Date: Thu, 20 Aug 2015 19:04:43 +0500 Subject: [PATCH 161/436] Added TestMapGet --- templatefunc_test.go | 77 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/templatefunc_test.go b/templatefunc_test.go index 60af5bf5..cc467d95 100644 --- a/templatefunc_test.go +++ b/templatefunc_test.go @@ -244,3 +244,80 @@ func TestParseFormTag(t *testing.T) { t.Errorf("Form Tag that should be ignored was not correctly parsed.") } } + +func TestMapGet(t *testing.T) { + // test one level map + m1 := map[string]int64{ + "a": 1, + "1": 2, + } + + if res, err := MapGet(m1, "a"); err == nil { + if res.(int64) != 1 { + t.Errorf("Should return 1, but return %v", res) + } + } else { + t.Errorf("Error happens %v", err) + } + + if res, err := MapGet(m1, "1"); err == nil { + if res.(int64) != 2 { + t.Errorf("Should return 2, but return %v", res) + } + } else { + t.Errorf("Error happens %v", err) + } + + if res, err := MapGet(m1, 1); err == nil { + if res.(int64) != 2 { + t.Errorf("Should return 2, but return %v", res) + } + } else { + t.Errorf("Error happens %v", err) + } + + // test 2 level map + m2 := map[string]interface{}{ + "1": map[string]float64{ + "2": 3.5, + }, + } + + if res, err := MapGet(m2, 1, 2); err == nil { + if res.(float64) != 3.5 { + t.Errorf("Should return 3.5, but return %v", res) + } + } else { + t.Errorf("Error happens %v", err) + } + + // test 5 level map + m5 := map[string]interface{}{ + "1": map[string]interface{}{ + "2": map[string]interface{}{ + "3": map[string]interface{}{ + "4": map[string]interface{}{ + "5": 1.2, + }, + }, + }, + }, + } + + if res, err := MapGet(m5, 1, 2, 3, 4, 5); err == nil { + if res.(float64) != 1.2 { + t.Errorf("Should return 1.2, but return %v", res) + } + } else { + t.Errorf("Error happens %v", err) + } + + // check whether element not exists in map + if res, err := MapGet(m5, 5, 4, 3, 2, 1); err == nil { + if res != nil { + t.Errorf("Should return nil, but return %v", res) + } + } else { + t.Errorf("Error happens %v", err) + } +} From 38ddb61199f7ab90bfa7265a3b6cd68ecfb81c76 Mon Sep 17 00:00:00 2001 From: wulove Date: Fri, 21 Aug 2015 10:32:53 +0800 Subject: [PATCH 162/436] files is []string, use len(files)==0 --- template.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.go b/template.go index 45ecbe52..32468d77 100644 --- a/template.go +++ b/template.go @@ -148,7 +148,7 @@ func BuildTemplate(dir string, files... string) error { } for _, v := range self.files { for _, file := range v { - if (files == nil || utils.InSlice(file, files)) { + if (len(files) == 0 || utils.InSlice(file, files)) { t, err := getTemplate(self.root, file, v...) if err != nil { Trace("parse template err:", file, err) From 99b1c5c54b72b0096a6a27b06d670a0738b8f8c2 Mon Sep 17 00:00:00 2001 From: tabalt <245291359@qq.com> Date: Fri, 21 Aug 2015 10:53:59 +0800 Subject: [PATCH 163/436] fixed mux1 to mux --- grace/grace.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grace/grace.go b/grace/grace.go index e5577267..33bf196c 100644 --- a/grace/grace.go +++ b/grace/grace.go @@ -32,7 +32,7 @@ // mux := http.NewServeMux() // mux.HandleFunc("/hello", handler) // -// err := grace.ListenAndServe("localhost:8080", mux1) +// err := grace.ListenAndServe("localhost:8080", mux) // if err != nil { // log.Println(err) // } From 862ea226e5c8b2099c9d3a4e7ed5df90ceae5a56 Mon Sep 17 00:00:00 2001 From: Shuai Date: Mon, 24 Aug 2015 00:16:56 +0800 Subject: [PATCH 164/436] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- httplib/httplib.go | 45 ++++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 27 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 1b7b207d..b10b770a 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -100,8 +100,8 @@ func NewBeegoRequest(rawurl, method string) *BeegoHttpRequest { return &BeegoHttpRequest{ url: rawurl, req: &req, - params: map[string]interface{}{}, - files: map[string]string{}, + params: map[string][]string{}, + files: map[string]string{}, setting: defaultSetting, resp: &resp, } @@ -150,7 +150,7 @@ type BeegoHttpSettings struct { type BeegoHttpRequest struct { url string req *http.Request - params map[string]interface{} + params map[string][]string files map[string]string setting BeegoHttpSettings resp *http.Response @@ -272,8 +272,12 @@ func (b *BeegoHttpRequest) SetProxy(proxy func(*http.Request) (*url.URL, error)) // Param adds query param in to request. // params build query string as ?key1=value1&key2=value2... -func (b *BeegoHttpRequest) Param(key string, value interface{}) *BeegoHttpRequest { - b.params[key] = value +func (b *BeegoHttpRequest) Param(key, value string) *BeegoHttpRequest { + if param, ok := b.params[key]; ok { + b.params[key] = append(param, value) + } else { + b.params[key] = []string{value} + } return b } @@ -348,14 +352,9 @@ func (b *BeegoHttpRequest) buildUrl(paramBody string) { } } for k, v := range b.params { - switch v.(type) { - case string: - bodyWriter.WriteField(k, v.(string)) - case []string: - for _, vv := range v.([]string) { - bodyWriter.WriteField(k, vv) - } - } + for _, vv := range v { + bodyWriter.WriteField(k, vv) + } } bodyWriter.Close() pw.Close() @@ -390,20 +389,12 @@ func (b *BeegoHttpRequest) SendOut() (*http.Response, error) { if len(b.params) > 0 { var buf bytes.Buffer for k, v := range b.params { - switch v.(type) { - case string: - buf.WriteString(url.QueryEscape(k)) - buf.WriteByte('=') - buf.WriteString(url.QueryEscape(v.(string))) - buf.WriteByte('&') - case []string: - for _, vv := range v.([]string) { - buf.WriteString(url.QueryEscape(k)) - buf.WriteByte('=') - buf.WriteString(url.QueryEscape(vv)) - buf.WriteByte('&') - } - } + for _, vv := range v { + buf.WriteString(url.QueryEscape(k)) + buf.WriteByte('=') + buf.WriteString(url.QueryEscape(vv)) + buf.WriteByte('&') + } } paramBody = buf.String() paramBody = paramBody[0 : len(paramBody)-1] From 0c33673197f1ecdba5a77418798565db9e68a378 Mon Sep 17 00:00:00 2001 From: Pelle Johnsen Date: Mon, 24 Aug 2015 09:41:10 +0200 Subject: [PATCH 165/436] Revert spaces > tabs change --- orm/orm_queryset.go | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/orm/orm_queryset.go b/orm/orm_queryset.go index 106b62e5..ea236964 100644 --- a/orm/orm_queryset.go +++ b/orm/orm_queryset.go @@ -122,21 +122,21 @@ func (o querySet) Distinct() QuerySeter { // set relation model to query together. // it will query relation models and assign to parent model. func (o querySet) RelatedSel(params ...interface{}) QuerySeter { - if len(params) == 0 { - o.relDepth = DefaultRelsDepth - } else { - for _, p := range params { - switch val := p.(type) { - case string: - o.related = append(o.related, val) - case int: - o.relDepth = val - default: - panic(fmt.Errorf(" wrong param kind: %v", val)) - } - } - } - return &o + if len(params) == 0 { + o.relDepth = DefaultRelsDepth + } else { + for _, p := range params { + switch val := p.(type) { + case string: + o.related = append(o.related, val) + case int: + o.relDepth = val + default: + panic(fmt.Errorf(" wrong param kind: %v", val)) + } + } + } + return &o } // set condition to QuerySeter. From cbb6591bdb8e14b2b87d6ffed3f79dd75c586eae Mon Sep 17 00:00:00 2001 From: Viet Hung Nguyen Date: Wed, 26 Aug 2015 15:57:28 +0700 Subject: [PATCH 166/436] fix typo --- config/config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.go b/config/config.go index 8d9261b8..d0eca747 100644 --- a/config/config.go +++ b/config/config.go @@ -88,12 +88,12 @@ func Register(name string, adapter Config) { // adapterName is ini/json/xml/yaml. // filename is the config file path. -func NewConfig(adapterName, fileaname string) (ConfigContainer, error) { +func NewConfig(adapterName, filename string) (ConfigContainer, error) { adapter, ok := adapters[adapterName] if !ok { return nil, fmt.Errorf("config: unknown adaptername %q (forgotten import?)", adapterName) } - return adapter.Parse(fileaname) + return adapter.Parse(filename) } // adapterName is ini/json/xml/yaml. From c516819c56fac85abd82a2991b0b699c196b07ee Mon Sep 17 00:00:00 2001 From: Yongzheng Lai Date: Fri, 28 Aug 2015 16:54:49 +0800 Subject: [PATCH 167/436] Update error.go this caused `http: multiple response.WriteHeader calls` when using method `CustomAbort` or `Abort` when status is already in errMap like 404. --- error.go | 1 - 1 file changed, 1 deletion(-) diff --git a/error.go b/error.go index 99a1fcf3..21768cdb 100644 --- a/error.go +++ b/error.go @@ -453,7 +453,6 @@ func exception(errcode string, ctx *context.Context) { func executeError(err *errorInfo, ctx *context.Context, code int) { if err.errorType == errorTypeHandler { - ctx.ResponseWriter.WriteHeader(code) err.handler(ctx.ResponseWriter, ctx.Request) return } From ad6547936e038759488f5a24823fba4baba9a077 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 28 Aug 2015 23:08:00 +0800 Subject: [PATCH 168/436] fix the http: multiple response.WriteHeader calls --- plugins/apiauth/apiauth.go | 14 +++++++------- plugins/cors/cors.go | 5 +---- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/plugins/apiauth/apiauth.go b/plugins/apiauth/apiauth.go index bbae7def..56a92d25 100644 --- a/plugins/apiauth/apiauth.go +++ b/plugins/apiauth/apiauth.go @@ -83,41 +83,41 @@ func APIBaiscAuth(appid, appkey string) beego.FilterFunc { func APIAuthWithFunc(f AppIdToAppSecret, timeout int) beego.FilterFunc { return func(ctx *context.Context) { if ctx.Input.Query("appid") == "" { - ctx.Output.SetStatus(403) + ctx.ResponseWriter.WriteHeader(403) ctx.WriteString("miss query param: appid") return } appsecret := f(ctx.Input.Query("appid")) if appsecret == "" { - ctx.Output.SetStatus(403) + ctx.ResponseWriter.WriteHeader(403) ctx.WriteString("not exist this appid") return } if ctx.Input.Query("signature") == "" { - ctx.Output.SetStatus(403) + ctx.ResponseWriter.WriteHeader(403) ctx.WriteString("miss query param: signature") return } if ctx.Input.Query("timestamp") == "" { - ctx.Output.SetStatus(403) + ctx.ResponseWriter.WriteHeader(403) ctx.WriteString("miss query param: timestamp") return } u, err := time.Parse("2006-01-02 15:04:05", ctx.Input.Query("timestamp")) if err != nil { - ctx.Output.SetStatus(403) + ctx.ResponseWriter.WriteHeader(403) ctx.WriteString("timestamp format is error, should 2006-01-02 15:04:05") return } t := time.Now() if t.Sub(u).Seconds() > float64(timeout) { - ctx.Output.SetStatus(403) + ctx.ResponseWriter.WriteHeader(403) ctx.WriteString("timeout! the request time is long ago, please try again") return } if ctx.Input.Query("signature") != Signature(appsecret, ctx.Input.Method(), ctx.Request.Form, ctx.Input.Uri()) { - ctx.Output.SetStatus(403) + ctx.ResponseWriter.WriteHeader(403) ctx.WriteString("auth failed") } } diff --git a/plugins/cors/cors.go b/plugins/cors/cors.go index 052d3bc6..1e973a40 100644 --- a/plugins/cors/cors.go +++ b/plugins/cors/cors.go @@ -24,7 +24,7 @@ // // - PUT and PATCH methods // // - Origin header // // - Credentials share -// beego.InsertFilter("*", beego.BeforeRouter,cors.Allow(&cors.Options{ +// beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{ // AllowOrigins: []string{"https://*.foo.com"}, // AllowMethods: []string{"PUT", "PATCH"}, // AllowHeaders: []string{"Origin"}, @@ -36,7 +36,6 @@ package cors import ( - "net/http" "regexp" "strconv" "strings" @@ -216,8 +215,6 @@ func Allow(opts *Options) beego.FilterFunc { for key, value := range headers { ctx.Output.Header(key, value) } - ctx.Output.SetStatus(http.StatusOK) - ctx.WriteString("") return } headers = opts.Header(origin) From dd4cbdda66af752f229fb0a6bf8ac9900df5e482 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 31 Aug 2015 11:58:11 +0800 Subject: [PATCH 169/436] update the gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 39ae5706..9806457b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .DS_Store *.swp *.swo +beego.iml From 9fd571830d62fce13a06743512b00c8582ebb2da Mon Sep 17 00:00:00 2001 From: Yongzheng Lai Date: Tue, 1 Sep 2015 17:52:44 +0800 Subject: [PATCH 170/436] Update beego.go Maybe the `Hard Coding` should have a higher priority --- beego.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/beego.go b/beego.go index cfebfbea..516e3116 100644 --- a/beego.go +++ b/beego.go @@ -259,6 +259,8 @@ func AddAPPStartHook(hf hookfunc) { // beego.Run(":8089") // beego.Run("127.0.0.1:8089") func Run(params ...string) { + initBeforeHttpRun() + if len(params) > 0 && params[0] != "" { strs := strings.Split(params[0], ":") if len(strs) > 0 && strs[0] != "" { @@ -268,7 +270,6 @@ func Run(params ...string) { HttpPort, _ = strconv.Atoi(strs[1]) } } - initBeforeHttpRun() if EnableAdmin { go beeAdminApp.Run() From adca4558044e9eb5bc64492021f2128773930826 Mon Sep 17 00:00:00 2001 From: onealtang Date: Wed, 2 Sep 2015 15:50:40 +0800 Subject: [PATCH 171/436] always use server's locale to parse date When parsing the date without time, it's always using UTC date, which is unexpected. If we want to use UTC date, it's recommend to set the server's timezone as UTC, and keep the code flexible. --- templatefunc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templatefunc.go b/templatefunc.go index 28ed15a3..39ada253 100644 --- a/templatefunc.go +++ b/templatefunc.go @@ -352,7 +352,7 @@ func ParseForm(form url.Values, obj interface{}) error { if len(tags) > 1 { format = tags[1] } - t, err := time.Parse(format, value) + t, err := time.ParseInLocation(format, value, time.Local) if err != nil { return err } From a074df9c2e9d25ffdb0050b68488b2484497cee4 Mon Sep 17 00:00:00 2001 From: f0r Date: Thu, 3 Sep 2015 00:45:09 +0800 Subject: [PATCH 172/436] =?UTF-8?q?=E4=B8=BAquerySeter=E6=B7=BB=E5=8A=A0Gr?= =?UTF-8?q?oupBy=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- orm/db.go | 6 ++++-- orm/db_tables.go | 24 ++++++++++++++++++++++++ orm/orm_queryset.go | 7 +++++++ orm/types.go | 1 + 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/orm/db.go b/orm/db.go index cefd5dfc..1803db4f 100644 --- a/orm/db.go +++ b/orm/db.go @@ -802,6 +802,7 @@ func (d *dbBase) ReadBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condi tables.parseRelated(qs.related, qs.relDepth) where, args := tables.getCondSql(cond, false, tz) + groupBy := tables.getGroupSql(qs.groups) orderBy := tables.getOrderSql(qs.orders) limit := tables.getLimitSql(mi, offset, rlimit) join := tables.getJoinSql() @@ -818,7 +819,7 @@ func (d *dbBase) ReadBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condi if qs.distinct { sqlSelect += " DISTINCT" } - query := fmt.Sprintf("%s %s FROM %s%s%s T0 %s%s%s%s", sqlSelect, sels, Q, mi.table, Q, join, where, orderBy, limit) + query := fmt.Sprintf("%s %s FROM %s%s%s T0 %s%s%s%s%s", sqlSelect, sels, Q, mi.table, Q, join, where, groupBy, orderBy, limit) d.ins.ReplaceMarks(&query) @@ -1448,13 +1449,14 @@ func (d *dbBase) ReadValues(q dbQuerier, qs *querySet, mi *modelInfo, cond *Cond } where, args := tables.getCondSql(cond, false, tz) + groupBy := tables.getGroupSql(qs.groups) orderBy := tables.getOrderSql(qs.orders) limit := tables.getLimitSql(mi, qs.offset, qs.limit) join := tables.getJoinSql() sels := strings.Join(cols, ", ") - query := fmt.Sprintf("SELECT %s FROM %s%s%s T0 %s%s%s%s", sels, Q, mi.table, Q, join, where, orderBy, limit) + query := fmt.Sprintf("SELECT %s FROM %s%s%s T0 %s%s%s%s%s", sels, Q, mi.table, Q, join, where, groupBy,orderBy, limit) d.ins.ReplaceMarks(&query) diff --git a/orm/db_tables.go b/orm/db_tables.go index a9aa10ab..245be891 100644 --- a/orm/db_tables.go +++ b/orm/db_tables.go @@ -390,6 +390,30 @@ func (t *dbTables) getCondSql(cond *Condition, sub bool, tz *time.Location) (whe return } +// generate group sql. +func (t *dbTables) getGroupSql(groups []string) (groupSql string) { + if len(groups) == 0 { + return + } + + Q := t.base.TableQuote() + + groupSqls := make([]string, 0, len(groups)) + for _, group := range groups { + exprs := strings.Split(group, ExprSep) + + index, _, fi, suc := t.parseExprs(t.mi, exprs) + if suc == false { + panic(fmt.Errorf("unknown field/column name `%s`", strings.Join(exprs, ExprSep))) + } + + groupSqls = append(groupSqls, fmt.Sprintf("%s.%s%s%s", index, Q, fi.column, Q)) + } + + groupSql = fmt.Sprintf("GROUP BY %s ", strings.Join(groupSqls, ", ")) + return +} + // generate order sql. func (t *dbTables) getOrderSql(orders []string) (orderSql string) { if len(orders) == 0 { diff --git a/orm/orm_queryset.go b/orm/orm_queryset.go index ea236964..af16b694 100644 --- a/orm/orm_queryset.go +++ b/orm/orm_queryset.go @@ -60,6 +60,7 @@ type querySet struct { relDepth int limit int64 offset int64 + groups []string orders []string distinct bool orm *orm @@ -106,6 +107,12 @@ func (o querySet) Offset(offset interface{}) QuerySeter { return &o } +// add GROUP expression +func (o querySet) GroupBy(exprs ...string) QuerySeter { + o.groups = exprs + return &o +} + // add ORDER expression. // "column" means ASC, "-column" means DESC. func (o querySet) OrderBy(exprs ...string) QuerySeter { diff --git a/orm/types.go b/orm/types.go index 4347e46f..95a3fee3 100644 --- a/orm/types.go +++ b/orm/types.go @@ -66,6 +66,7 @@ type QuerySeter interface { SetCond(*Condition) QuerySeter Limit(interface{}, ...interface{}) QuerySeter Offset(interface{}) QuerySeter + GroupBy(...string) QuerySeter OrderBy(...string) QuerySeter Distinct() QuerySeter RelatedSel(...interface{}) QuerySeter From 9ab7466d5c36ad08a5173cb91e885d4c02c32157 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 4 Sep 2015 22:20:55 +0800 Subject: [PATCH 173/436] fix the cappital --- logs/smtp.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/logs/smtp.go b/logs/smtp.go index 95123ebf..f9b292b7 100644 --- a/logs/smtp.go +++ b/logs/smtp.go @@ -31,9 +31,9 @@ const ( // smtpWriter implements LoggerInterface and is used to send emails via given SMTP-server. type SmtpWriter struct { - Username string `json:"Username"` + Username string `json:"username"` Password string `json:"password"` - Host string `json:"Host"` + Host string `json:"host"` Subject string `json:"subject"` FromAddress string `json:"fromAddress"` RecipientAddresses []string `json:"sendTos"` From f9fe89fff0e6044468d27fb14febbc7ee38ae336 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 4 Sep 2015 22:33:03 +0800 Subject: [PATCH 174/436] fix the file rotate test case issues --- logs/file_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logs/file_test.go b/logs/file_test.go index c71e9bb4..97260f12 100644 --- a/logs/file_test.go +++ b/logs/file_test.go @@ -103,7 +103,7 @@ func TestFileRotate(t *testing.T) { log.Critical("critical") log.Emergency("emergency") time.Sleep(time.Second * 4) - rotatename := "test3.log" + fmt.Sprintf(".%s.%03d", time.Now().Format("2006-01-02"), 1) + rotatename := "test3" + fmt.Sprintf(".%s.%03d", time.Now().Format("2006-01-02"), 1) + ".log" b, err := exists(rotatename) if !b || err != nil { t.Fatal("rotate not generated") From 34aa9002bba92457bafdace3ecb2773caeed7503 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 4 Sep 2015 23:03:10 +0800 Subject: [PATCH 175/436] fix the httplib test case timeout --- httplib/httplib_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/httplib/httplib_test.go b/httplib/httplib_test.go index 0b551c53..0b6b5779 100644 --- a/httplib/httplib_test.go +++ b/httplib/httplib_test.go @@ -19,6 +19,7 @@ import ( "os" "strings" "testing" + "time" ) func TestResponse(t *testing.T) { @@ -153,6 +154,7 @@ func TestWithSetting(t *testing.T) { setting.EnableCookie = true setting.UserAgent = v setting.Transport = nil + setting.ReadWriteTimeout = 5 * time.Second SetDefaultSetting(setting) str, err := Get("http://httpbin.org/get").String() From f55bbbdff41b43402fe8f4767ed0ebfcc35da46b Mon Sep 17 00:00:00 2001 From: sidbusy Date: Sat, 5 Sep 2015 10:31:31 +0800 Subject: [PATCH 176/436] allows custom the TableName of Session --- session/mysql/sess_mysql.go | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/session/mysql/sess_mysql.go b/session/mysql/sess_mysql.go index 76a13932..26237e95 100644 --- a/session/mysql/sess_mysql.go +++ b/session/mysql/sess_mysql.go @@ -51,7 +51,10 @@ import ( _ "github.com/go-sql-driver/mysql" ) -var mysqlpder = &MysqlProvider{} +var ( + TableName = "session" + mysqlpder = &MysqlProvider{} +) // mysql session store type MysqlSessionStore struct { @@ -110,7 +113,7 @@ func (st *MysqlSessionStore) SessionRelease(w http.ResponseWriter) { if err != nil { return } - st.c.Exec("UPDATE session set `session_data`=?, `session_expiry`=? where session_key=?", + st.c.Exec("UPDATE "+TableName+" set `session_data`=?, `session_expiry`=? where session_key=?", b, time.Now().Unix(), st.sid) } @@ -141,11 +144,11 @@ func (mp *MysqlProvider) SessionInit(maxlifetime int64, savePath string) error { // get mysql session by sid func (mp *MysqlProvider) SessionRead(sid string) (session.SessionStore, error) { c := mp.connectInit() - row := c.QueryRow("select session_data from session where session_key=?", sid) + row := c.QueryRow("select session_data from "+TableName+" where session_key=?", sid) var sessiondata []byte err := row.Scan(&sessiondata) if err == sql.ErrNoRows { - c.Exec("insert into session(`session_key`,`session_data`,`session_expiry`) values(?,?,?)", + c.Exec("insert into "+TableName+"(`session_key`,`session_data`,`session_expiry`) values(?,?,?)", sid, "", time.Now().Unix()) } var kv map[interface{}]interface{} @@ -165,7 +168,7 @@ func (mp *MysqlProvider) SessionRead(sid string) (session.SessionStore, error) { func (mp *MysqlProvider) SessionExist(sid string) bool { c := mp.connectInit() defer c.Close() - row := c.QueryRow("select session_data from session where session_key=?", sid) + row := c.QueryRow("select session_data from "+TableName+" where session_key=?", sid) var sessiondata []byte err := row.Scan(&sessiondata) if err == sql.ErrNoRows { @@ -178,13 +181,13 @@ func (mp *MysqlProvider) SessionExist(sid string) bool { // generate new sid for mysql session func (mp *MysqlProvider) SessionRegenerate(oldsid, sid string) (session.SessionStore, error) { c := mp.connectInit() - row := c.QueryRow("select session_data from session where session_key=?", oldsid) + row := c.QueryRow("select session_data from "+TableName+" where session_key=?", oldsid) var sessiondata []byte err := row.Scan(&sessiondata) if err == sql.ErrNoRows { - c.Exec("insert into session(`session_key`,`session_data`,`session_expiry`) values(?,?,?)", oldsid, "", time.Now().Unix()) + c.Exec("insert into "+TableName+"(`session_key`,`session_data`,`session_expiry`) values(?,?,?)", oldsid, "", time.Now().Unix()) } - c.Exec("update session set `session_key`=? where session_key=?", sid, oldsid) + c.Exec("update "+TableName+" set `session_key`=? where session_key=?", sid, oldsid) var kv map[interface{}]interface{} if len(sessiondata) == 0 { kv = make(map[interface{}]interface{}) @@ -201,7 +204,7 @@ func (mp *MysqlProvider) SessionRegenerate(oldsid, sid string) (session.SessionS // delete mysql session by sid func (mp *MysqlProvider) SessionDestroy(sid string) error { c := mp.connectInit() - c.Exec("DELETE FROM session where session_key=?", sid) + c.Exec("DELETE FROM "+TableName+" where session_key=?", sid) c.Close() return nil } @@ -209,7 +212,7 @@ func (mp *MysqlProvider) SessionDestroy(sid string) error { // delete expired values in mysql session func (mp *MysqlProvider) SessionGC() { c := mp.connectInit() - c.Exec("DELETE from session where session_expiry < ?", time.Now().Unix()-mp.maxlifetime) + c.Exec("DELETE from "+TableName+" where session_expiry < ?", time.Now().Unix()-mp.maxlifetime) c.Close() return } @@ -219,7 +222,7 @@ func (mp *MysqlProvider) SessionAll() int { c := mp.connectInit() defer c.Close() var total int - err := c.QueryRow("SELECT count(*) as num from session").Scan(&total) + err := c.QueryRow("SELECT count(*) as num from " + TableName).Scan(&total) if err != nil { return 0 } From 5ad999a3d177832162c1c3bbc164c652208c7d85 Mon Sep 17 00:00:00 2001 From: Yongzheng Lai Date: Sun, 6 Sep 2015 12:01:50 +0800 Subject: [PATCH 177/436] Update tree.go fix routers for: ``` /topic/:id/?:auth /topic/:id/?:auth:int ``` --- tree.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tree.go b/tree.go index e0d9c1c2..f15af91a 100644 --- a/tree.go +++ b/tree.go @@ -208,6 +208,11 @@ func (t *Tree) addseg(segments []string, route interface{}, wildcards []string, } else { t.leaves = append(t.leaves, &leafInfo{runObject: route, wildcards: wildcards}) } + for i, v := range wildcards { + if v==":" && i!=0{ + t.leaves = append(t.leaves, &leafInfo{runObject: route, wildcards: wildcards[:i+1]}) + } + } } else { seg := segments[0] iswild, params, regexpStr := splitSegment(seg) From 508a57be1efa3a4638ba4729f2f4e63c3a18d6bb Mon Sep 17 00:00:00 2001 From: Yongzheng Lai Date: Sun, 6 Sep 2015 12:07:12 +0800 Subject: [PATCH 178/436] Update tree_test.go --- tree_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tree_test.go b/tree_test.go index 1d2890e1..40065e77 100644 --- a/tree_test.go +++ b/tree_test.go @@ -26,6 +26,10 @@ var routers []testinfo func init() { routers = make([]testinfo, 0) + routers = append(routers, testinfo{"/topic/:id/?:auth", "/topic/1", map[string]string{":id": "1"}}) + routers = append(routers, testinfo{"/topic/:id/?:auth", "/topic/1/2", map[string]string{":id": "1",":auth":"2"}}) + routers = append(routers, testinfo{"/topic/:id/?:auth:int", "/topic/1", map[string]string{":id": "1"}}) + routers = append(routers, testinfo{"/topic/:id/?:auth:int", "/topic/1/123", map[string]string{":id": "1",":auth":"123"}}) routers = append(routers, testinfo{"/:id", "/123", map[string]string{":id": "123"}}) routers = append(routers, testinfo{"/hello/?:id", "/hello", map[string]string{":id": ""}}) routers = append(routers, testinfo{"/", "/", nil}) From ddd9bf1305635e499561a7dc4088acfbc9314873 Mon Sep 17 00:00:00 2001 From: Yongzheng Lai Date: Sun, 6 Sep 2015 12:16:05 +0800 Subject: [PATCH 179/436] Update tree.go --- tree.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tree.go b/tree.go index f15af91a..8f0df589 100644 --- a/tree.go +++ b/tree.go @@ -209,7 +209,7 @@ func (t *Tree) addseg(segments []string, route interface{}, wildcards []string, t.leaves = append(t.leaves, &leafInfo{runObject: route, wildcards: wildcards}) } for i, v := range wildcards { - if v==":" && i!=0{ + if v==":" { t.leaves = append(t.leaves, &leafInfo{runObject: route, wildcards: wildcards[:i+1]}) } } From 1377d16559e6e145958e0a0cf96cfdb614b2cd03 Mon Sep 17 00:00:00 2001 From: Yongzheng Lai Date: Sun, 6 Sep 2015 12:17:16 +0800 Subject: [PATCH 180/436] Update tree_test.go --- tree_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tree_test.go b/tree_test.go index 40065e77..7fe70f51 100644 --- a/tree_test.go +++ b/tree_test.go @@ -26,6 +26,8 @@ var routers []testinfo func init() { routers = make([]testinfo, 0) + routers = append(routers, testinfo{"/topic/?:auth:int", "/topic", nil}) + routers = append(routers, testinfo{"/topic/?:auth:int", "/topic/123", map[string]string{":auth":"123"}}) routers = append(routers, testinfo{"/topic/:id/?:auth", "/topic/1", map[string]string{":id": "1"}}) routers = append(routers, testinfo{"/topic/:id/?:auth", "/topic/1/2", map[string]string{":id": "1",":auth":"2"}}) routers = append(routers, testinfo{"/topic/:id/?:auth:int", "/topic/1", map[string]string{":id": "1"}}) From 06ec3a931ddb0f19681520d798cdc5d260050df6 Mon Sep 17 00:00:00 2001 From: Kyoung-chan Lee Date: Sun, 6 Sep 2015 17:13:55 +0900 Subject: [PATCH 181/436] Fix a wrong test name. --- cache/memcache/memcache_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cache/memcache/memcache_test.go b/cache/memcache/memcache_test.go index 0523ae85..27b085e6 100644 --- a/cache/memcache/memcache_test.go +++ b/cache/memcache/memcache_test.go @@ -23,7 +23,7 @@ import ( "time" ) -func TestRedisCache(t *testing.T) { +func TestMemcacheCache(t *testing.T) { bm, err := cache.NewCache("memcache", `{"conn": "127.0.0.1:11211"}`) if err != nil { t.Error("init err") From 4ad743fc8b5fcbd2037cfe2a4da14d1b46c4cc27 Mon Sep 17 00:00:00 2001 From: Kyoung-chan Lee Date: Sun, 6 Sep 2015 17:20:18 +0900 Subject: [PATCH 182/436] Update a outdated information in README. --- cache/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cache/README.md b/cache/README.md index 72d0d1c5..893b213f 100644 --- a/cache/README.md +++ b/cache/README.md @@ -43,7 +43,7 @@ interval means the gc time. The cache will check at each time interval, whether ## Memcache adapter -Memcache adapter use the vitess's [Memcache](http://code.google.com/p/vitess/go/memcache) client. +Memcache adapter use the [gomemcache](http://github.com/bradfitz/gomemcache) client. Configure like this: From fe1ec1675f7b29f340e5f3e387a72eec64bf75ad Mon Sep 17 00:00:00 2001 From: Kyoung-chan Lee Date: Sun, 6 Sep 2015 17:22:33 +0900 Subject: [PATCH 183/436] Fix a wrong url (http 404). --- cache/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cache/README.md b/cache/README.md index 893b213f..4152c57e 100644 --- a/cache/README.md +++ b/cache/README.md @@ -52,7 +52,7 @@ Configure like this: ## Redis adapter -Redis adapter use the [redigo](http://github.com/garyburd/redigo/redis) client. +Redis adapter use the [redigo](http://github.com/garyburd/redigo) client. Configure like this: From a2a6ec954b5a8ccb13b8b9b4cb600c8bac509791 Mon Sep 17 00:00:00 2001 From: Yongzheng Lai Date: Sun, 6 Sep 2015 22:13:58 +0800 Subject: [PATCH 184/436] Update tree.go go fmt --- tree.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tree.go b/tree.go index 8f0df589..46d05ae7 100644 --- a/tree.go +++ b/tree.go @@ -209,7 +209,7 @@ func (t *Tree) addseg(segments []string, route interface{}, wildcards []string, t.leaves = append(t.leaves, &leafInfo{runObject: route, wildcards: wildcards}) } for i, v := range wildcards { - if v==":" { + if v == ":" { t.leaves = append(t.leaves, &leafInfo{runObject: route, wildcards: wildcards[:i+1]}) } } From eb3479b753986929aeaba194905b4a044283137f Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 6 Sep 2015 23:00:42 +0800 Subject: [PATCH 185/436] optimize the app structure --- app.go | 189 ++++++++++++++++++++++++++++++++++++++++++++++++++ beego.go | 201 +++--------------------------------------------------- config.go | 4 -- 3 files changed, 198 insertions(+), 196 deletions(-) diff --git a/app.go b/app.go index eddf7e21..96e2ad2c 100644 --- a/app.go +++ b/app.go @@ -20,12 +20,22 @@ import ( "net/http" "net/http/fcgi" "os" + "path" "time" "github.com/astaxie/beego/grace" "github.com/astaxie/beego/utils" ) +var ( + BeeApp *App +) + +func init() { + // create beego application + BeeApp = NewApp() +} + // App defines beego application with a new PatternServeMux. type App struct { Handlers *ControllerRegister @@ -170,3 +180,182 @@ func (app *App) Run() { } <-endRunning } + +// Router adds a patterned controller handler to BeeApp. +// it's an alias method of App.Router. +// usage: +// simple router +// beego.Router("/admin", &admin.UserController{}) +// beego.Router("/admin/index", &admin.ArticleController{}) +// +// regex router +// +// beego.Router("/api/:id([0-9]+)", &controllers.RController{}) +// +// custom rules +// beego.Router("/api/list",&RestController{},"*:ListFood") +// beego.Router("/api/create",&RestController{},"post:CreateFood") +// beego.Router("/api/update",&RestController{},"put:UpdateFood") +// beego.Router("/api/delete",&RestController{},"delete:DeleteFood") +func Router(rootpath string, c ControllerInterface, mappingMethods ...string) *App { + BeeApp.Handlers.Add(rootpath, c, mappingMethods...) + return BeeApp +} + +// Router add list from +// usage: +// beego.Include(&BankAccount{}, &OrderController{},&RefundController{},&ReceiptController{}) +// type BankAccount struct{ +// beego.Controller +// } +// +// register the function +// func (b *BankAccount)Mapping(){ +// b.Mapping("ShowAccount" , b.ShowAccount) +// b.Mapping("ModifyAccount", b.ModifyAccount) +//} +// +// //@router /account/:id [get] +// func (b *BankAccount) ShowAccount(){ +// //logic +// } +// +// +// //@router /account/:id [post] +// func (b *BankAccount) ModifyAccount(){ +// //logic +// } +// +// the comments @router url methodlist +// url support all the function Router's pattern +// methodlist [get post head put delete options *] +func Include(cList ...ControllerInterface) *App { + BeeApp.Handlers.Include(cList...) + return BeeApp +} + +// RESTRouter adds a restful controller handler to BeeApp. +// its' controller implements beego.ControllerInterface and +// defines a param "pattern/:objectId" to visit each resource. +func RESTRouter(rootpath string, c ControllerInterface) *App { + Router(rootpath, c) + Router(path.Join(rootpath, ":objectId"), c) + return BeeApp +} + +// AutoRouter adds defined controller handler to BeeApp. +// it's same to App.AutoRouter. +// if beego.AddAuto(&MainContorlller{}) and MainController has methods List and Page, +// visit the url /main/list to exec List function or /main/page to exec Page function. +func AutoRouter(c ControllerInterface) *App { + BeeApp.Handlers.AddAuto(c) + return BeeApp +} + +// AutoPrefix adds controller handler to BeeApp with prefix. +// it's same to App.AutoRouterWithPrefix. +// if beego.AutoPrefix("/admin",&MainContorlller{}) and MainController has methods List and Page, +// visit the url /admin/main/list to exec List function or /admin/main/page to exec Page function. +func AutoPrefix(prefix string, c ControllerInterface) *App { + BeeApp.Handlers.AddAutoPrefix(prefix, c) + return BeeApp +} + +// register router for Get method +// usage: +// beego.Get("/", func(ctx *context.Context){ +// ctx.Output.Body("hello world") +// }) +func Get(rootpath string, f FilterFunc) *App { + BeeApp.Handlers.Get(rootpath, f) + return BeeApp +} + +// register router for Post method +// usage: +// beego.Post("/api", func(ctx *context.Context){ +// ctx.Output.Body("hello world") +// }) +func Post(rootpath string, f FilterFunc) *App { + BeeApp.Handlers.Post(rootpath, f) + return BeeApp +} + +// register router for Delete method +// usage: +// beego.Delete("/api", func(ctx *context.Context){ +// ctx.Output.Body("hello world") +// }) +func Delete(rootpath string, f FilterFunc) *App { + BeeApp.Handlers.Delete(rootpath, f) + return BeeApp +} + +// register router for Put method +// usage: +// beego.Put("/api", func(ctx *context.Context){ +// ctx.Output.Body("hello world") +// }) +func Put(rootpath string, f FilterFunc) *App { + BeeApp.Handlers.Put(rootpath, f) + return BeeApp +} + +// register router for Head method +// usage: +// beego.Head("/api", func(ctx *context.Context){ +// ctx.Output.Body("hello world") +// }) +func Head(rootpath string, f FilterFunc) *App { + BeeApp.Handlers.Head(rootpath, f) + return BeeApp +} + +// register router for Options method +// usage: +// beego.Options("/api", func(ctx *context.Context){ +// ctx.Output.Body("hello world") +// }) +func Options(rootpath string, f FilterFunc) *App { + BeeApp.Handlers.Options(rootpath, f) + return BeeApp +} + +// register router for Patch method +// usage: +// beego.Patch("/api", func(ctx *context.Context){ +// ctx.Output.Body("hello world") +// }) +func Patch(rootpath string, f FilterFunc) *App { + BeeApp.Handlers.Patch(rootpath, f) + return BeeApp +} + +// register router for all method +// usage: +// beego.Any("/api", func(ctx *context.Context){ +// ctx.Output.Body("hello world") +// }) +func Any(rootpath string, f FilterFunc) *App { + BeeApp.Handlers.Any(rootpath, f) + return BeeApp +} + +// register router for own Handler +// usage: +// beego.Handler("/api", func(ctx *context.Context){ +// ctx.Output.Body("hello world") +// }) +func Handler(rootpath string, h http.Handler, options ...interface{}) *App { + BeeApp.Handlers.Handler(rootpath, h, options...) + return BeeApp +} + +// InsertFilter adds a FilterFunc with pattern condition and action constant. +// The pos means action constant including +// beego.BeforeStatic, beego.BeforeRouter, beego.BeforeExec, beego.AfterExec and beego.FinishRouter. +// The bool params is for setting the returnOnOutput value (false allows multiple filters to execute) +func InsertFilter(pattern string, pos int, filter FilterFunc, params ...bool) *App { + BeeApp.Handlers.InsertFilter(pattern, pos, filter, params...) + return BeeApp +} diff --git a/beego.go b/beego.go index 43f98755..ead5a6d4 100644 --- a/beego.go +++ b/beego.go @@ -15,9 +15,7 @@ package beego import ( - "net/http" "os" - "path" "path/filepath" "strconv" "strings" @@ -28,178 +26,12 @@ import ( // beego web framework version. const VERSION = "1.5.0" -type hookfunc func() error //hook function to run -var hooks []hookfunc //hook function slice to store the hookfunc +//hook function to run +type hookfunc func() error -// Router adds a patterned controller handler to BeeApp. -// it's an alias method of App.Router. -// usage: -// simple router -// beego.Router("/admin", &admin.UserController{}) -// beego.Router("/admin/index", &admin.ArticleController{}) -// -// regex router -// -// beego.Router("/api/:id([0-9]+)", &controllers.RController{}) -// -// custom rules -// beego.Router("/api/list",&RestController{},"*:ListFood") -// beego.Router("/api/create",&RestController{},"post:CreateFood") -// beego.Router("/api/update",&RestController{},"put:UpdateFood") -// beego.Router("/api/delete",&RestController{},"delete:DeleteFood") -func Router(rootpath string, c ControllerInterface, mappingMethods ...string) *App { - BeeApp.Handlers.Add(rootpath, c, mappingMethods...) - return BeeApp -} - -// Router add list from -// usage: -// beego.Include(&BankAccount{}, &OrderController{},&RefundController{},&ReceiptController{}) -// type BankAccount struct{ -// beego.Controller -// } -// -// register the function -// func (b *BankAccount)Mapping(){ -// b.Mapping("ShowAccount" , b.ShowAccount) -// b.Mapping("ModifyAccount", b.ModifyAccount) -//} -// -// //@router /account/:id [get] -// func (b *BankAccount) ShowAccount(){ -// //logic -// } -// -// -// //@router /account/:id [post] -// func (b *BankAccount) ModifyAccount(){ -// //logic -// } -// -// the comments @router url methodlist -// url support all the function Router's pattern -// methodlist [get post head put delete options *] -func Include(cList ...ControllerInterface) *App { - BeeApp.Handlers.Include(cList...) - return BeeApp -} - -// RESTRouter adds a restful controller handler to BeeApp. -// its' controller implements beego.ControllerInterface and -// defines a param "pattern/:objectId" to visit each resource. -func RESTRouter(rootpath string, c ControllerInterface) *App { - Router(rootpath, c) - Router(path.Join(rootpath, ":objectId"), c) - return BeeApp -} - -// AutoRouter adds defined controller handler to BeeApp. -// it's same to App.AutoRouter. -// if beego.AddAuto(&MainContorlller{}) and MainController has methods List and Page, -// visit the url /main/list to exec List function or /main/page to exec Page function. -func AutoRouter(c ControllerInterface) *App { - BeeApp.Handlers.AddAuto(c) - return BeeApp -} - -// AutoPrefix adds controller handler to BeeApp with prefix. -// it's same to App.AutoRouterWithPrefix. -// if beego.AutoPrefix("/admin",&MainContorlller{}) and MainController has methods List and Page, -// visit the url /admin/main/list to exec List function or /admin/main/page to exec Page function. -func AutoPrefix(prefix string, c ControllerInterface) *App { - BeeApp.Handlers.AddAutoPrefix(prefix, c) - return BeeApp -} - -// register router for Get method -// usage: -// beego.Get("/", func(ctx *context.Context){ -// ctx.Output.Body("hello world") -// }) -func Get(rootpath string, f FilterFunc) *App { - BeeApp.Handlers.Get(rootpath, f) - return BeeApp -} - -// register router for Post method -// usage: -// beego.Post("/api", func(ctx *context.Context){ -// ctx.Output.Body("hello world") -// }) -func Post(rootpath string, f FilterFunc) *App { - BeeApp.Handlers.Post(rootpath, f) - return BeeApp -} - -// register router for Delete method -// usage: -// beego.Delete("/api", func(ctx *context.Context){ -// ctx.Output.Body("hello world") -// }) -func Delete(rootpath string, f FilterFunc) *App { - BeeApp.Handlers.Delete(rootpath, f) - return BeeApp -} - -// register router for Put method -// usage: -// beego.Put("/api", func(ctx *context.Context){ -// ctx.Output.Body("hello world") -// }) -func Put(rootpath string, f FilterFunc) *App { - BeeApp.Handlers.Put(rootpath, f) - return BeeApp -} - -// register router for Head method -// usage: -// beego.Head("/api", func(ctx *context.Context){ -// ctx.Output.Body("hello world") -// }) -func Head(rootpath string, f FilterFunc) *App { - BeeApp.Handlers.Head(rootpath, f) - return BeeApp -} - -// register router for Options method -// usage: -// beego.Options("/api", func(ctx *context.Context){ -// ctx.Output.Body("hello world") -// }) -func Options(rootpath string, f FilterFunc) *App { - BeeApp.Handlers.Options(rootpath, f) - return BeeApp -} - -// register router for Patch method -// usage: -// beego.Patch("/api", func(ctx *context.Context){ -// ctx.Output.Body("hello world") -// }) -func Patch(rootpath string, f FilterFunc) *App { - BeeApp.Handlers.Patch(rootpath, f) - return BeeApp -} - -// register router for all method -// usage: -// beego.Any("/api", func(ctx *context.Context){ -// ctx.Output.Body("hello world") -// }) -func Any(rootpath string, f FilterFunc) *App { - BeeApp.Handlers.Any(rootpath, f) - return BeeApp -} - -// register router for own Handler -// usage: -// beego.Handler("/api", func(ctx *context.Context){ -// ctx.Output.Body("hello world") -// }) -func Handler(rootpath string, h http.Handler, options ...interface{}) *App { - BeeApp.Handlers.Handler(rootpath, h, options...) - return BeeApp -} +var ( + hooks = make([]hookfunc, 0) //hook function slice to store the hookfunc +) // SetViewsPath sets view directory path in beego application. func SetViewsPath(path string) *App { @@ -228,15 +60,6 @@ func DelStaticPath(url string) *App { return BeeApp } -// InsertFilter adds a FilterFunc with pattern condition and action constant. -// The pos means action constant including -// beego.BeforeStatic, beego.BeforeRouter, beego.BeforeExec, beego.AfterExec and beego.FinishRouter. -// The bool params is for setting the returnOnOutput value (false allows multiple filters to execute) -func InsertFilter(pattern string, pos int, filter FilterFunc, params ...bool) *App { - BeeApp.Handlers.InsertFilter(pattern, pos, filter, params...) - return BeeApp -} - // The hookfunc will run in beego.Run() // such as sessionInit, middlerware start, buildtemplate, admin start func AddAPPStartHook(hf hookfunc) { @@ -249,7 +72,7 @@ func AddAPPStartHook(hf hookfunc) { // beego.Run("127.0.0.1:8089") func Run(params ...string) { initBeforeHttpRun() - + if len(params) > 0 && params[0] != "" { strs := strings.Split(params[0], ":") if len(strs) > 0 && strs[0] != "" { @@ -307,13 +130,11 @@ func initBeforeHttpRun() { } go GlobalSessions.GC() } - + if AutoRender { err := BuildTemplate(ViewsPath) - if err != nil { - if RunMode == "dev" { - Warn(err) - } + if err != nil && RunMode == "dev" { + Warn(err) } } @@ -338,7 +159,3 @@ func TestBeegoInit(apppath string) { os.Chdir(AppPath) initBeforeHttpRun() } - -func init() { - hooks = make([]hookfunc, 0) -} diff --git a/config.go b/config.go index 09d0df24..2bbd14f6 100644 --- a/config.go +++ b/config.go @@ -29,7 +29,6 @@ import ( ) var ( - BeeApp *App // beego application AppName string AppPath string workPath string @@ -215,9 +214,6 @@ func (b *beegoAppConfig) SaveConfigFile(filename string) error { } func init() { - // create beego application - BeeApp = NewApp() - workPath, _ = os.Getwd() workPath, _ = filepath.Abs(workPath) // initialize default configurations From 85d8ec5ca65a1615289cdd6e80645e885556a0e6 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 7 Sep 2015 19:18:04 +0800 Subject: [PATCH 186/436] optimize the beego structure --- beego.go | 138 +++++++++++++++++++++---------------------------------- error.go | 41 ----------------- hooks.go | 100 ++++++++++++++++++++++++++++++++++++++++ mime.go | 11 ----- 4 files changed, 153 insertions(+), 137 deletions(-) create mode 100644 hooks.go diff --git a/beego.go b/beego.go index ead5a6d4..042a4270 100644 --- a/beego.go +++ b/beego.go @@ -19,8 +19,6 @@ import ( "path/filepath" "strconv" "strings" - - "github.com/astaxie/beego/session" ) // beego web framework version. @@ -33,33 +31,6 @@ var ( hooks = make([]hookfunc, 0) //hook function slice to store the hookfunc ) -// SetViewsPath sets view directory path in beego application. -func SetViewsPath(path string) *App { - ViewsPath = path - return BeeApp -} - -// SetStaticPath sets static directory path and proper url pattern in beego application. -// if beego.SetStaticPath("static","public"), visit /static/* to load static file in folder "public". -func SetStaticPath(url string, path string) *App { - if !strings.HasPrefix(url, "/") { - url = "/" + url - } - url = strings.TrimRight(url, "/") - StaticDir[url] = path - return BeeApp -} - -// DelStaticPath removes the static folder setting in this url pattern in beego application. -func DelStaticPath(url string) *App { - if !strings.HasPrefix(url, "/") { - url = "/" + url - } - url = strings.TrimRight(url, "/") - delete(StaticDir, url) - return BeeApp -} - // The hookfunc will run in beego.Run() // such as sessionInit, middlerware start, buildtemplate, admin start func AddAPPStartHook(hf hookfunc) { @@ -90,62 +61,6 @@ func Run(params ...string) { BeeApp.Run() } -func initBeforeHttpRun() { - // if AppConfigPath not In the conf/app.conf reParse config - if AppConfigPath != filepath.Join(AppPath, "conf", "app.conf") { - err := ParseConfig() - if err != nil && AppConfigPath != filepath.Join(workPath, "conf", "app.conf") { - // configuration is critical to app, panic here if parse failed - panic(err) - } - } - - //init mime - AddAPPStartHook(initMime) - - // do hooks function - for _, hk := range hooks { - err := hk() - if err != nil { - panic(err) - } - } - - if SessionOn { - var err error - sessionConfig := AppConfig.String("sessionConfig") - if sessionConfig == "" { - sessionConfig = `{"cookieName":"` + SessionName + `",` + - `"gclifetime":` + strconv.FormatInt(SessionGCMaxLifetime, 10) + `,` + - `"providerConfig":"` + filepath.ToSlash(SessionSavePath) + `",` + - `"secure":` + strconv.FormatBool(EnableHttpTLS) + `,` + - `"enableSetCookie":` + strconv.FormatBool(SessionAutoSetCookie) + `,` + - `"domain":"` + SessionDomain + `",` + - `"cookieLifeTime":` + strconv.Itoa(SessionCookieLifeTime) + `}` - } - GlobalSessions, err = session.NewManager(SessionProvider, - sessionConfig) - if err != nil { - panic(err) - } - go GlobalSessions.GC() - } - - if AutoRender { - err := BuildTemplate(ViewsPath) - if err != nil && RunMode == "dev" { - Warn(err) - } - } - - registerDefaultErrorHandler() - - if EnableDocs { - Get("/docs", serverDocs) - Get("/docs/*", serverDocs) - } -} - // this function is for test package init func TestBeegoInit(apppath string) { AppPath = apppath @@ -159,3 +74,56 @@ func TestBeegoInit(apppath string) { os.Chdir(AppPath) initBeforeHttpRun() } + +func initBeforeHttpRun() { + // if AppConfigPath not In the conf/app.conf reParse config + if AppConfigPath != filepath.Join(AppPath, "conf", "app.conf") { + err := ParseConfig() + if err != nil && AppConfigPath != filepath.Join(workPath, "conf", "app.conf") { + // configuration is critical to app, panic here if parse failed + panic(err) + } + } + + //init mime + AddAPPStartHook(registerMime) + AddAPPStartHook(registerDefaultErrorHandler) + AddAPPStartHook(registerSession) + AddAPPStartHook(registerDocs) + AddAPPStartHook(registerTemplate) + + // do hooks function + for _, hk := range hooks { + err := hk() + if err != nil { + panic(err) + } + } +} + +// SetViewsPath sets view directory path in beego application. +func SetViewsPath(path string) *App { + ViewsPath = path + return BeeApp +} + +// SetStaticPath sets static directory path and proper url pattern in beego application. +// if beego.SetStaticPath("static","public"), visit /static/* to load static file in folder "public". +func SetStaticPath(url string, path string) *App { + if !strings.HasPrefix(url, "/") { + url = "/" + url + } + url = strings.TrimRight(url, "/") + StaticDir[url] = path + return BeeApp +} + +// DelStaticPath removes the static folder setting in this url pattern in beego application. +func DelStaticPath(url string) *App { + if !strings.HasPrefix(url, "/") { + url = "/" + url + } + url = strings.TrimRight(url, "/") + delete(StaticDir, url) + return BeeApp +} diff --git a/error.go b/error.go index 21768cdb..f5c0c80b 100644 --- a/error.go +++ b/error.go @@ -358,47 +358,6 @@ func gatewayTimeout(rw http.ResponseWriter, r *http.Request) { t.Execute(rw, data) } -// register default error http handlers, 404,401,403,500 and 503. -func registerDefaultErrorHandler() { - if _, ok := ErrorMaps["401"]; !ok { - Errorhandler("401", unauthorized) - } - - if _, ok := ErrorMaps["402"]; !ok { - Errorhandler("402", paymentRequired) - } - - if _, ok := ErrorMaps["403"]; !ok { - Errorhandler("403", forbidden) - } - - if _, ok := ErrorMaps["404"]; !ok { - Errorhandler("404", notFound) - } - - if _, ok := ErrorMaps["405"]; !ok { - Errorhandler("405", methodNotAllowed) - } - - if _, ok := ErrorMaps["500"]; !ok { - Errorhandler("500", internalServerError) - } - if _, ok := ErrorMaps["501"]; !ok { - Errorhandler("501", notImplemented) - } - if _, ok := ErrorMaps["502"]; !ok { - Errorhandler("502", badGateway) - } - - if _, ok := ErrorMaps["503"]; !ok { - Errorhandler("503", serviceUnavailable) - } - - if _, ok := ErrorMaps["504"]; !ok { - Errorhandler("504", gatewayTimeout) - } -} - // ErrorHandler registers http.HandlerFunc to each http err code string. // usage: // beego.ErrorHandler("404",NotFound) diff --git a/hooks.go b/hooks.go new file mode 100644 index 00000000..ded0d794 --- /dev/null +++ b/hooks.go @@ -0,0 +1,100 @@ +package beego + +import ( + "mime" + "path/filepath" + "strconv" + + "github.com/astaxie/beego/session" +) + +// +func registerMime() error { + for k, v := range mimemaps { + mime.AddExtensionType(k, v) + } + return nil +} + +// register default error http handlers, 404,401,403,500 and 503. +func registerDefaultErrorHandler() error { + if _, ok := ErrorMaps["401"]; !ok { + Errorhandler("401", unauthorized) + } + + if _, ok := ErrorMaps["402"]; !ok { + Errorhandler("402", paymentRequired) + } + + if _, ok := ErrorMaps["403"]; !ok { + Errorhandler("403", forbidden) + } + + if _, ok := ErrorMaps["404"]; !ok { + Errorhandler("404", notFound) + } + + if _, ok := ErrorMaps["405"]; !ok { + Errorhandler("405", methodNotAllowed) + } + + if _, ok := ErrorMaps["500"]; !ok { + Errorhandler("500", internalServerError) + } + if _, ok := ErrorMaps["501"]; !ok { + Errorhandler("501", notImplemented) + } + if _, ok := ErrorMaps["502"]; !ok { + Errorhandler("502", badGateway) + } + + if _, ok := ErrorMaps["503"]; !ok { + Errorhandler("503", serviceUnavailable) + } + + if _, ok := ErrorMaps["504"]; !ok { + Errorhandler("504", gatewayTimeout) + } + return nil +} + +func registerSession() error { + if SessionOn { + var err error + sessionConfig := AppConfig.String("sessionConfig") + if sessionConfig == "" { + sessionConfig = `{"cookieName":"` + SessionName + `",` + + `"gclifetime":` + strconv.FormatInt(SessionGCMaxLifetime, 10) + `,` + + `"providerConfig":"` + filepath.ToSlash(SessionSavePath) + `",` + + `"secure":` + strconv.FormatBool(EnableHttpTLS) + `,` + + `"enableSetCookie":` + strconv.FormatBool(SessionAutoSetCookie) + `,` + + `"domain":"` + SessionDomain + `",` + + `"cookieLifeTime":` + strconv.Itoa(SessionCookieLifeTime) + `}` + } + GlobalSessions, err = session.NewManager(SessionProvider, + sessionConfig) + if err != nil { + return err + } + go GlobalSessions.GC() + } + return nil +} + +func registerTemplate() error { + if AutoRender { + err := BuildTemplate(ViewsPath) + if err != nil && RunMode == "dev" { + Warn(err) + } + } + return nil +} + +func registerDocs() error { + if EnableDocs { + Get("/docs", serverDocs) + Get("/docs/*", serverDocs) + } + return nil +} diff --git a/mime.go b/mime.go index 20246c21..0034976e 100644 --- a/mime.go +++ b/mime.go @@ -14,10 +14,6 @@ package beego -import ( - "mime" -) - var mimemaps map[string]string = map[string]string{ ".3dm": "x-world/x-3dmf", ".3dmf": "x-world/x-3dmf", @@ -558,10 +554,3 @@ var mimemaps map[string]string = map[string]string{ ".oex": "application/x-opera-extension", ".mustache": "text/html", } - -func initMime() error { - for k, v := range mimemaps { - mime.AddExtensionType(k, v) - } - return nil -} From 284dfc08438819c57800f9998234684ccc8aa47b Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 7 Sep 2015 19:21:55 +0800 Subject: [PATCH 187/436] move the template related fun to template.go --- beego.go | 27 --------------------------- template.go | 31 +++++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/beego.go b/beego.go index 042a4270..b79e0e3f 100644 --- a/beego.go +++ b/beego.go @@ -100,30 +100,3 @@ func initBeforeHttpRun() { } } } - -// SetViewsPath sets view directory path in beego application. -func SetViewsPath(path string) *App { - ViewsPath = path - return BeeApp -} - -// SetStaticPath sets static directory path and proper url pattern in beego application. -// if beego.SetStaticPath("static","public"), visit /static/* to load static file in folder "public". -func SetStaticPath(url string, path string) *App { - if !strings.HasPrefix(url, "/") { - url = "/" + url - } - url = strings.TrimRight(url, "/") - StaticDir[url] = path - return BeeApp -} - -// DelStaticPath removes the static folder setting in this url pattern in beego application. -func DelStaticPath(url string) *App { - if !strings.HasPrefix(url, "/") { - url = "/" + url - } - url = strings.TrimRight(url, "/") - delete(StaticDir, url) - return BeeApp -} diff --git a/template.go b/template.go index fdd9dc37..e976886a 100644 --- a/template.go +++ b/template.go @@ -128,7 +128,7 @@ func AddTemplateExt(ext string) { // build all template files in a directory. // it makes beego can render any template file in view directory. -func BuildTemplate(dir string, files... string) error { +func BuildTemplate(dir string, files ...string) error { if _, err := os.Stat(dir); err != nil { if os.IsNotExist(err) { return nil @@ -149,7 +149,7 @@ func BuildTemplate(dir string, files... string) error { } for _, v := range self.files { for _, file := range v { - if (len(files) == 0 || utils.InSlice(file, files)) { + if len(files) == 0 || utils.InSlice(file, files) { t, err := getTemplate(self.root, file, v...) if err != nil { Trace("parse template err:", file, err) @@ -263,3 +263,30 @@ func _getTemplate(t0 *template.Template, root string, submods [][]string, others } return } + +// SetViewsPath sets view directory path in beego application. +func SetViewsPath(path string) *App { + ViewsPath = path + return BeeApp +} + +// SetStaticPath sets static directory path and proper url pattern in beego application. +// if beego.SetStaticPath("static","public"), visit /static/* to load static file in folder "public". +func SetStaticPath(url string, path string) *App { + if !strings.HasPrefix(url, "/") { + url = "/" + url + } + url = strings.TrimRight(url, "/") + StaticDir[url] = path + return BeeApp +} + +// DelStaticPath removes the static folder setting in this url pattern in beego application. +func DelStaticPath(url string) *App { + if !strings.HasPrefix(url, "/") { + url = "/" + url + } + url = strings.TrimRight(url, "/") + delete(StaticDir, url) + return BeeApp +} From fe9c52fb69b226b177c6ae1732038497cc60c120 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 7 Sep 2015 19:27:53 +0800 Subject: [PATCH 188/436] optimize init admin --- beego.go | 36 ++++++++++++++++-------------------- hooks.go | 7 +++++++ 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/beego.go b/beego.go index b79e0e3f..81df5752 100644 --- a/beego.go +++ b/beego.go @@ -54,27 +54,9 @@ func Run(params ...string) { } } - if EnableAdmin { - go beeAdminApp.Run() - } - BeeApp.Run() } -// this function is for test package init -func TestBeegoInit(apppath string) { - AppPath = apppath - os.Setenv("BEEGO_RUNMODE", "test") - AppConfigPath = filepath.Join(AppPath, "conf", "app.conf") - err := ParseConfig() - if err != nil && !os.IsNotExist(err) { - // for init if doesn't have app.conf will not panic - Info(err) - } - os.Chdir(AppPath) - initBeforeHttpRun() -} - func initBeforeHttpRun() { // if AppConfigPath not In the conf/app.conf reParse config if AppConfigPath != filepath.Join(AppPath, "conf", "app.conf") { @@ -91,12 +73,26 @@ func initBeforeHttpRun() { AddAPPStartHook(registerSession) AddAPPStartHook(registerDocs) AddAPPStartHook(registerTemplate) + AddAPPStartHook(registerAdmin) // do hooks function for _, hk := range hooks { - err := hk() - if err != nil { + if err := hk(); err != nil { panic(err) } } } + +// this function is for test package init +func TestBeegoInit(apppath string) { + AppPath = apppath + os.Setenv("BEEGO_RUNMODE", "test") + AppConfigPath = filepath.Join(AppPath, "conf", "app.conf") + err := ParseConfig() + if err != nil && !os.IsNotExist(err) { + // for init if doesn't have app.conf will not panic + Info(err) + } + os.Chdir(AppPath) + initBeforeHttpRun() +} diff --git a/hooks.go b/hooks.go index ded0d794..78aec636 100644 --- a/hooks.go +++ b/hooks.go @@ -98,3 +98,10 @@ func registerDocs() error { } return nil } + +func registerAdmin() error { + if EnableAdmin { + go beeAdminApp.Run() + } + return nil +} From 919675e7935293772a593a3bb6e37eeceb09157c Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 7 Sep 2015 19:29:52 +0800 Subject: [PATCH 189/436] update the comments --- beego.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/beego.go b/beego.go index 81df5752..d5d66c13 100644 --- a/beego.go +++ b/beego.go @@ -67,7 +67,7 @@ func initBeforeHttpRun() { } } - //init mime + //init hooks AddAPPStartHook(registerMime) AddAPPStartHook(registerDefaultErrorHandler) AddAPPStartHook(registerSession) @@ -75,7 +75,6 @@ func initBeforeHttpRun() { AddAPPStartHook(registerTemplate) AddAPPStartHook(registerAdmin) - // do hooks function for _, hk := range hooks { if err := hk(); err != nil { panic(err) From 152127c2af9f56f376b0e1931f14721031e7dc2d Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 7 Sep 2015 21:38:53 +0800 Subject: [PATCH 190/436] make golint happy --- admin.go | 4 ++-- app.go | 21 +++++++++++---------- beego.go | 11 ++++++----- hooks.go | 3 +-- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/admin.go b/admin.go index 64d7fe34..583eadfc 100644 --- a/admin.go +++ b/admin.go @@ -314,14 +314,14 @@ func profIndex(rw http.ResponseWriter, r *http.Request) { data["Content"] = result.String() if format == "json" && command == "gc summary" { - dataJson, err := json.Marshal(data) + dataJSON, err := json.Marshal(data) if err != nil { http.Error(rw, err.Error(), http.StatusInternalServerError) return } rw.Header().Set("Content-Type", "application/json") - rw.Write(dataJson) + rw.Write(dataJSON) return } diff --git a/app.go b/app.go index 96e2ad2c..c340bcbe 100644 --- a/app.go +++ b/app.go @@ -28,6 +28,7 @@ import ( ) var ( + // BeeApp is an application instance BeeApp *App ) @@ -202,7 +203,7 @@ func Router(rootpath string, c ControllerInterface, mappingMethods ...string) *A return BeeApp } -// Router add list from +// Include will generate router file in the router/xxx.go from the controller's comments // usage: // beego.Include(&BankAccount{}, &OrderController{},&RefundController{},&ReceiptController{}) // type BankAccount struct{ @@ -261,7 +262,7 @@ func AutoPrefix(prefix string, c ControllerInterface) *App { return BeeApp } -// register router for Get method +// Get used to register router for Get method // usage: // beego.Get("/", func(ctx *context.Context){ // ctx.Output.Body("hello world") @@ -271,7 +272,7 @@ func Get(rootpath string, f FilterFunc) *App { return BeeApp } -// register router for Post method +// Post used to register router for Post method // usage: // beego.Post("/api", func(ctx *context.Context){ // ctx.Output.Body("hello world") @@ -281,7 +282,7 @@ func Post(rootpath string, f FilterFunc) *App { return BeeApp } -// register router for Delete method +// Delete used to register router for Delete method // usage: // beego.Delete("/api", func(ctx *context.Context){ // ctx.Output.Body("hello world") @@ -291,7 +292,7 @@ func Delete(rootpath string, f FilterFunc) *App { return BeeApp } -// register router for Put method +// Put used to register router for Put method // usage: // beego.Put("/api", func(ctx *context.Context){ // ctx.Output.Body("hello world") @@ -301,7 +302,7 @@ func Put(rootpath string, f FilterFunc) *App { return BeeApp } -// register router for Head method +// Head used to register router for Head method // usage: // beego.Head("/api", func(ctx *context.Context){ // ctx.Output.Body("hello world") @@ -311,7 +312,7 @@ func Head(rootpath string, f FilterFunc) *App { return BeeApp } -// register router for Options method +// Options used to register router for Options method // usage: // beego.Options("/api", func(ctx *context.Context){ // ctx.Output.Body("hello world") @@ -321,7 +322,7 @@ func Options(rootpath string, f FilterFunc) *App { return BeeApp } -// register router for Patch method +// Patch used to register router for Patch method // usage: // beego.Patch("/api", func(ctx *context.Context){ // ctx.Output.Body("hello world") @@ -331,7 +332,7 @@ func Patch(rootpath string, f FilterFunc) *App { return BeeApp } -// register router for all method +// Any used to register router for all methods // usage: // beego.Any("/api", func(ctx *context.Context){ // ctx.Output.Body("hello world") @@ -341,7 +342,7 @@ func Any(rootpath string, f FilterFunc) *App { return BeeApp } -// register router for own Handler +// Handler used to register a Handler router // usage: // beego.Handler("/api", func(ctx *context.Context){ // ctx.Output.Body("hello world") diff --git a/beego.go b/beego.go index d5d66c13..06d53750 100644 --- a/beego.go +++ b/beego.go @@ -31,7 +31,8 @@ var ( hooks = make([]hookfunc, 0) //hook function slice to store the hookfunc ) -// The hookfunc will run in beego.Run() +// AddAPPStartHook is used to register the hookfunc +// The hookfuncs will run in beego.Run() // such as sessionInit, middlerware start, buildtemplate, admin start func AddAPPStartHook(hf hookfunc) { hooks = append(hooks, hf) @@ -42,7 +43,7 @@ func AddAPPStartHook(hf hookfunc) { // beego.Run(":8089") // beego.Run("127.0.0.1:8089") func Run(params ...string) { - initBeforeHttpRun() + initBeforeHTTPRun() if len(params) > 0 && params[0] != "" { strs := strings.Split(params[0], ":") @@ -57,7 +58,7 @@ func Run(params ...string) { BeeApp.Run() } -func initBeforeHttpRun() { +func initBeforeHTTPRun() { // if AppConfigPath not In the conf/app.conf reParse config if AppConfigPath != filepath.Join(AppPath, "conf", "app.conf") { err := ParseConfig() @@ -82,7 +83,7 @@ func initBeforeHttpRun() { } } -// this function is for test package init +// TestBeegoInit is for test package init func TestBeegoInit(apppath string) { AppPath = apppath os.Setenv("BEEGO_RUNMODE", "test") @@ -93,5 +94,5 @@ func TestBeegoInit(apppath string) { Info(err) } os.Chdir(AppPath) - initBeforeHttpRun() + initBeforeHTTPRun() } diff --git a/hooks.go b/hooks.go index 78aec636..526913c3 100644 --- a/hooks.go +++ b/hooks.go @@ -71,8 +71,7 @@ func registerSession() error { `"domain":"` + SessionDomain + `",` + `"cookieLifeTime":` + strconv.Itoa(SessionCookieLifeTime) + `}` } - GlobalSessions, err = session.NewManager(SessionProvider, - sessionConfig) + GlobalSessions, err = session.NewManager(SessionProvider, sessionConfig) if err != nil { return err } From f28a941e267d4c416eae6aaca032a1dc05a3f401 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 7 Sep 2015 23:19:42 +0800 Subject: [PATCH 191/436] make golint happy and also make the config readable --- admin.go | 28 +++---- app.go | 44 +++++----- beego.go | 4 +- config.go | 235 +++++++++++++++++++++++++++++++++--------------------- hooks.go | 4 +- router.go | 4 +- 6 files changed, 185 insertions(+), 134 deletions(-) diff --git a/admin.go b/admin.go index 583eadfc..93087e12 100644 --- a/admin.go +++ b/admin.go @@ -101,11 +101,11 @@ func listConf(rw http.ResponseWriter, r *http.Request) { m["AppConfigPath"] = AppConfigPath m["StaticDir"] = StaticDir m["StaticExtensionsToGzip"] = StaticExtensionsToGzip - m["HttpAddr"] = HttpAddr - m["HttpPort"] = HttpPort - m["HttpTLS"] = EnableHttpTLS - m["HttpCertFile"] = HttpCertFile - m["HttpKeyFile"] = HttpKeyFile + m["HTTPAddr"] = HTTPAddr + m["HTTPPort"] = HTTPPort + m["HTTPTLS"] = EnableHTTPTLS + m["HTTPCertFile"] = HTTPCertFile + m["HTTPKeyFile"] = HTTPKeyFile m["RecoverPanic"] = RecoverPanic m["AutoRender"] = AutoRender m["ViewsPath"] = ViewsPath @@ -114,14 +114,14 @@ func listConf(rw http.ResponseWriter, r *http.Request) { m["SessionProvider"] = SessionProvider m["SessionName"] = SessionName m["SessionGCMaxLifetime"] = SessionGCMaxLifetime - m["SessionSavePath"] = SessionSavePath + m["SessionProviderConfig"] = SessionProviderConfig m["SessionCookieLifeTime"] = SessionCookieLifeTime - m["UseFcgi"] = UseFcgi + m["EnabelFcgi"] = EnabelFcgi m["MaxMemory"] = MaxMemory m["EnableGzip"] = EnableGzip m["DirectoryIndex"] = DirectoryIndex - m["HttpServerTimeOut"] = HttpServerTimeOut - m["ErrorsShow"] = ErrorsShow + m["HTTPServerTimeOut"] = HTTPServerTimeOut + m["EnableErrorsShow"] = EnableErrorsShow m["XSRFKEY"] = XSRFKEY m["EnableXSRF"] = EnableXSRF m["XSRFExpire"] = XSRFExpire @@ -130,8 +130,8 @@ func listConf(rw http.ResponseWriter, r *http.Request) { m["TemplateRight"] = TemplateRight m["BeegoServerName"] = BeegoServerName m["EnableAdmin"] = EnableAdmin - m["AdminHttpAddr"] = AdminHttpAddr - m["AdminHttpPort"] = AdminHttpPort + m["AdminHTTPAddr"] = AdminHTTPAddr + m["AdminHTTPPort"] = AdminHTTPPort tmpl := template.Must(template.New("dashboard").Parse(dashboardTpl)) tmpl = template.Must(tmpl.Parse(configTpl)) @@ -451,10 +451,10 @@ func (admin *adminApp) Run() { if len(toolbox.AdminTaskList) > 0 { toolbox.StartTask() } - addr := AdminHttpAddr + addr := AdminHTTPAddr - if AdminHttpPort != 0 { - addr = fmt.Sprintf("%s:%d", AdminHttpAddr, AdminHttpPort) + if AdminHTTPPort != 0 { + addr = fmt.Sprintf("%s:%d", AdminHTTPAddr, AdminHTTPPort) } for p, f := range admin.routers { http.Handle(p, f) diff --git a/app.go b/app.go index c340bcbe..d10d436c 100644 --- a/app.go +++ b/app.go @@ -52,10 +52,10 @@ func NewApp() *App { // Run beego application. func (app *App) Run() { - addr := HttpAddr + addr := HTTPAddr - if HttpPort != 0 { - addr = fmt.Sprintf("%s:%d", HttpAddr, HttpPort) + if HTTPPort != 0 { + addr = fmt.Sprintf("%s:%d", HTTPAddr, HTTPPort) } var ( @@ -64,8 +64,8 @@ func (app *App) Run() { ) endRunning := make(chan bool, 1) - if UseFcgi { - if UseStdIo { + if EnabelFcgi { + if EnableStdIo { err = fcgi.Serve(nil, app.Handlers) // standard I/O if err == nil { BeeLogger.Info("Use FCGI via standard I/O") @@ -73,7 +73,7 @@ func (app *App) Run() { BeeLogger.Info("Cannot use FCGI via standard I/O", err) } } else { - if HttpPort == 0 { + if HTTPPort == 0 { // remove the Socket file before start if utils.FileExists(addr) { os.Remove(addr) @@ -91,18 +91,18 @@ func (app *App) Run() { if Graceful { app.Server.Addr = addr app.Server.Handler = app.Handlers - app.Server.ReadTimeout = time.Duration(HttpServerTimeOut) * time.Second - app.Server.WriteTimeout = time.Duration(HttpServerTimeOut) * time.Second - if EnableHttpTLS { + app.Server.ReadTimeout = time.Duration(HTTPServerTimeOut) * time.Second + app.Server.WriteTimeout = time.Duration(HTTPServerTimeOut) * time.Second + if EnableHTTPTLS { go func() { time.Sleep(20 * time.Microsecond) - if HttpsPort != 0 { - addr = fmt.Sprintf("%s:%d", HttpAddr, HttpsPort) + if HTTPSPort != 0 { + addr = fmt.Sprintf("%s:%d", HTTPAddr, HTTPSPort) app.Server.Addr = addr } server := grace.NewServer(addr, app.Handlers) server.Server = app.Server - err := server.ListenAndServeTLS(HttpCertFile, HttpKeyFile) + err := server.ListenAndServeTLS(HTTPCertFile, HTTPKeyFile) if err != nil { BeeLogger.Critical("ListenAndServeTLS: ", err, fmt.Sprintf("%d", os.Getpid())) time.Sleep(100 * time.Microsecond) @@ -110,11 +110,11 @@ func (app *App) Run() { } }() } - if EnableHttpListen { + if EnableHTTPListen { go func() { server := grace.NewServer(addr, app.Handlers) server.Server = app.Server - if ListenTCP4 && HttpAddr == "" { + if ListenTCP4 && HTTPAddr == "" { server.Network = "tcp4" } err := server.ListenAndServe() @@ -128,17 +128,17 @@ func (app *App) Run() { } else { app.Server.Addr = addr app.Server.Handler = app.Handlers - app.Server.ReadTimeout = time.Duration(HttpServerTimeOut) * time.Second - app.Server.WriteTimeout = time.Duration(HttpServerTimeOut) * time.Second + app.Server.ReadTimeout = time.Duration(HTTPServerTimeOut) * time.Second + app.Server.WriteTimeout = time.Duration(HTTPServerTimeOut) * time.Second - if EnableHttpTLS { + if EnableHTTPTLS { go func() { time.Sleep(20 * time.Microsecond) - if HttpsPort != 0 { - app.Server.Addr = fmt.Sprintf("%s:%d", HttpAddr, HttpsPort) + if HTTPSPort != 0 { + app.Server.Addr = fmt.Sprintf("%s:%d", HTTPAddr, HTTPSPort) } BeeLogger.Info("https server Running on %s", app.Server.Addr) - err := app.Server.ListenAndServeTLS(HttpCertFile, HttpKeyFile) + err := app.Server.ListenAndServeTLS(HTTPCertFile, HTTPKeyFile) if err != nil { BeeLogger.Critical("ListenAndServeTLS: ", err) time.Sleep(100 * time.Microsecond) @@ -147,11 +147,11 @@ func (app *App) Run() { }() } - if EnableHttpListen { + if EnableHTTPListen { go func() { app.Server.Addr = addr BeeLogger.Info("http server Running on %s", app.Server.Addr) - if ListenTCP4 && HttpAddr == "" { + if ListenTCP4 && HTTPAddr == "" { ln, err := net.Listen("tcp4", app.Server.Addr) if err != nil { BeeLogger.Critical("ListenAndServe: ", err) diff --git a/beego.go b/beego.go index 06d53750..329e0713 100644 --- a/beego.go +++ b/beego.go @@ -48,10 +48,10 @@ func Run(params ...string) { if len(params) > 0 && params[0] != "" { strs := strings.Split(params[0], ":") if len(strs) > 0 && strs[0] != "" { - HttpAddr = strs[0] + HTTPAddr = strs[0] } if len(strs) > 1 && strs[1] != "" { - HttpPort, _ = strconv.Atoi(strs[1]) + HTTPPort, _ = strconv.Atoi(strs[1]) } } diff --git a/config.go b/config.go index 2bbd14f6..ae334cd7 100644 --- a/config.go +++ b/config.go @@ -29,59 +29,115 @@ import ( ) var ( - AppName string - AppPath string - workPath string - AppConfigPath string - StaticDir map[string]string - TemplateCache map[string]*template.Template // template caching map - StaticExtensionsToGzip []string // files with should be compressed with gzip (.js,.css,etc) - EnableHttpListen bool - HttpAddr string - HttpPort int - ListenTCP4 bool - EnableHttpTLS bool - HttpsPort int - HttpCertFile string - HttpKeyFile string - RecoverPanic bool // flag of auto recover panic - AutoRender bool // flag of render template automatically - ViewsPath string - AppConfig *beegoAppConfig - RunMode string // run mode, "dev" or "prod" - GlobalSessions *session.Manager // global session mananger - SessionOn bool // flag of starting session auto. default is false. - SessionProvider string // default session provider, memory, mysql , redis ,etc. - SessionName string // the cookie name when saving session id into cookie. - SessionGCMaxLifetime int64 // session gc time for auto cleaning expired session. - SessionSavePath string // if use mysql/redis/file provider, define save path to connection info. - SessionCookieLifeTime int // the life time of session id in cookie. - SessionAutoSetCookie bool // auto setcookie - SessionDomain string // the cookie domain default is empty - UseFcgi bool - UseStdIo bool - MaxMemory int64 - EnableGzip bool // flag of enable gzip - DirectoryIndex bool // flag of display directory index. default is false. - HttpServerTimeOut int64 - ErrorsShow bool // flag of show errors in page. if true, show error and trace info in page rendered with error template. - XSRFKEY string // xsrf hash salt string. - EnableXSRF bool // flag of enable xsrf. - XSRFExpire int // the expiry of xsrf value. - CopyRequestBody bool // flag of copy raw request body in context. - TemplateLeft string - TemplateRight string - BeegoServerName string // beego server name exported in response header. - EnableAdmin bool // flag of enable admin module to log every request info. - AdminHttpAddr string // http server configurations for admin module. - AdminHttpPort int - FlashName string // name of the flash variable found in response header and cookie - FlashSeperator string // used to seperate flash key:value - AppConfigProvider string // config provider - EnableDocs bool // enable generate docs & server docs API Swagger - RouterCaseSensitive bool // router case sensitive default is true - AccessLogs bool // print access logs, default is false - Graceful bool // use graceful start the server + // AccessLogs represent whether output the access logs, default is false + AccessLogs bool + // AdminHTTPAddr is address for admin + AdminHTTPAddr string + // AdminHTTPPort is listens port for admin + AdminHTTPPort int + // AppConfig is the instance of Config, store the config information from file + AppConfig *beegoAppConfig + // AppName represent Application name, always the project folder name + AppName string + // AppPath is the path to the application + AppPath string + // AppConfigPath is the path to the config files + AppConfigPath string + // AppConfigProvider is the provider for the config, default is ini + AppConfigProvider string + // AutoRender is a flag of render template automatically. It's always turn off in API application + // default is true + AutoRender bool + // BeegoServerName exported in response header. + BeegoServerName string + // CopyRequestBody is just useful for raw request body in context. default is false + CopyRequestBody bool + // DirectoryIndex wheather display directory index. default is false. + DirectoryIndex bool + // EnableAdmin means turn on admin module to log every request info. + EnableAdmin bool + // EnableDocs enable generate docs & server docs API Swagger + EnableDocs bool + // EnableErrorsShow wheather show errors in page. if true, show error and trace info in page rendered with error template. + EnableErrorsShow bool + // EnabelFcgi turn on the fcgi Listen, default is false + EnabelFcgi bool + // EnableGzip means gzip the response + EnableGzip bool + // EnableHTTPListen represent whether turn on the HTTP, default is true + EnableHTTPListen bool + // EnableHTTPTLS represent whether turn on the HTTPS, default is true + EnableHTTPTLS bool + // EnableStdIo works with EnabelFcgi Use FCGI via standard I/O + EnableStdIo bool + // EnableXSRF whether turn on xsrf. default is false + EnableXSRF bool + // FlashName is the name of the flash variable found in response header and cookie + FlashName string + // FlashSeperator used to seperate flash key:value, default is BEEGOFLASH + FlashSeperator string + // GlobalSessions is the instance for the session manager + GlobalSessions *session.Manager + // Graceful means use graceful module to start the server + Graceful bool + // workPath is always the same as AppPath, but sometime when it started with other + // program, like supervisor + workPath string + // ListenTCP4 represent only Listen in TCP4, default is false + ListenTCP4 bool + // MaxMemory The whole request body is parsed and up to a total of maxMemory + // bytes of its file parts are stored in memory, with the remainder stored on disk in temporary files + MaxMemory int64 + // HTTPAddr is the TCP network address addr for HTTP + HTTPAddr string + // HTTPPort is listens port for HTTP + HTTPPort int + // HTTPSPort is listens port for HTTPS + HTTPSPort int + // HTTPCertFile is the path to certificate file + HTTPCertFile string + // HTTPKeyFile is the path to private key file + HTTPKeyFile string + // HTTPServerTimeOut HTTP server timeout. default is 0, no timeout + HTTPServerTimeOut int64 + // RecoverPanic is a flag for auto recover panic, default is true + RecoverPanic bool + // RouterCaseSensitive means whether router case sensitive, default is true + RouterCaseSensitive bool + // RunMode represent the staging, "dev" or "prod" + RunMode string + // SessionOn means whether turn on the session auto when application started. default is false. + SessionOn bool + // SessionProvider means session provider, e.q memory, mysql, redis,etc. + SessionProvider string + // SessionName is the cookie name when saving session id into cookie. + SessionName string + // SessionGCMaxLifetime for auto cleaning expired session. + SessionGCMaxLifetime int64 + // SessionProviderConfig is for the provider config, define save path or connection info. + SessionProviderConfig string + // SessionCookieLifeTime means the life time of session id in cookie. + SessionCookieLifeTime int + // SessionAutoSetCookie auto setcookie + SessionAutoSetCookie bool + // SessionDomain means the cookie domain default is empty + SessionDomain string + // StaticDir store the static path, key is path, value is the folder + StaticDir map[string]string + // StaticExtensionsToGzip stores the extensions which need to gzip(.js,.css,etc) + StaticExtensionsToGzip []string + // TemplateCache store the caching template + TemplateCache map[string]*template.Template + // TemplateLeft left delimiter + TemplateLeft string + // TemplateRight right delimiter + TemplateRight string + // ViewsPath means the template folder + ViewsPath string + // XSRFKEY xsrf hash salt string. + XSRFKEY string + // XSRFExpire is the expiry of xsrf value. + XSRFExpire int ) type beegoAppConfig struct { @@ -239,12 +295,12 @@ func init() { TemplateCache = make(map[string]*template.Template) // set this to 0.0.0.0 to make this app available to externally - EnableHttpListen = true //default enable http Listen + EnableHTTPListen = true //default enable http Listen - HttpAddr = "" - HttpPort = 8080 + HTTPAddr = "" + HTTPPort = 8080 - HttpsPort = 10443 + HTTPSPort = 10443 AppName = "beego" @@ -260,20 +316,15 @@ func init() { SessionProvider = "memory" SessionName = "beegosessionID" SessionGCMaxLifetime = 3600 - SessionSavePath = "" + SessionProviderConfig = "" SessionCookieLifeTime = 0 //set cookie default is the brower life SessionAutoSetCookie = true - UseFcgi = false - UseStdIo = false - MaxMemory = 1 << 26 //64MB - EnableGzip = false + HTTPServerTimeOut = 0 - HttpServerTimeOut = 0 - - ErrorsShow = true + EnableErrorsShow = true XSRFKEY = "beegoxsrf" XSRFExpire = 0 @@ -284,8 +335,8 @@ func init() { BeegoServerName = "beegoServer:" + VERSION EnableAdmin = false - AdminHttpAddr = "127.0.0.1" - AdminHttpPort = 8088 + AdminHTTPAddr = "127.0.0.1" + AdminHTTPPort = 8088 FlashName = "BEEGO_FLASH" FlashSeperator = "BEEGOFLASH" @@ -326,18 +377,18 @@ func ParseConfig() (err error) { RunMode = runmode } - HttpAddr = AppConfig.String("HttpAddr") + HTTPAddr = AppConfig.String("HTTPAddr") - if v, err := AppConfig.Int("HttpPort"); err == nil { - HttpPort = v + if v, err := AppConfig.Int("HTTPPort"); err == nil { + HTTPPort = v } if v, err := AppConfig.Bool("ListenTCP4"); err == nil { ListenTCP4 = v } - if v, err := AppConfig.Bool("EnableHttpListen"); err == nil { - EnableHttpListen = v + if v, err := AppConfig.Bool("EnableHTTPListen"); err == nil { + EnableHTTPListen = v } if maxmemory, err := AppConfig.Int64("MaxMemory"); err == nil { @@ -372,8 +423,8 @@ func ParseConfig() (err error) { SessionName = sessName } - if sesssavepath := AppConfig.String("SessionSavePath"); sesssavepath != "" { - SessionSavePath = sesssavepath + if sessProvConfig := AppConfig.String("SessionProviderConfig"); sessProvConfig != "" { + SessionProviderConfig = sessProvConfig } if sessMaxLifeTime, err := AppConfig.Int64("SessionGCMaxLifetime"); err == nil && sessMaxLifeTime != 0 { @@ -384,8 +435,8 @@ func ParseConfig() (err error) { SessionCookieLifeTime = sesscookielifetime } - if usefcgi, err := AppConfig.Bool("UseFcgi"); err == nil { - UseFcgi = usefcgi + if enabelFcgi, err := AppConfig.Bool("EnabelFcgi"); err == nil { + EnabelFcgi = enabelFcgi } if enablegzip, err := AppConfig.Bool("EnableGzip"); err == nil { @@ -396,12 +447,12 @@ func ParseConfig() (err error) { DirectoryIndex = directoryindex } - if timeout, err := AppConfig.Int64("HttpServerTimeOut"); err == nil { - HttpServerTimeOut = timeout + if timeout, err := AppConfig.Int64("HTTPServerTimeOut"); err == nil { + HTTPServerTimeOut = timeout } - if errorsshow, err := AppConfig.Bool("ErrorsShow"); err == nil { - ErrorsShow = errorsshow + if errorsshow, err := AppConfig.Bool("EnableErrorsShow"); err == nil { + EnableErrorsShow = errorsshow } if copyrequestbody, err := AppConfig.Bool("CopyRequestBody"); err == nil { @@ -428,20 +479,20 @@ func ParseConfig() (err error) { TemplateRight = tplright } - if httptls, err := AppConfig.Bool("EnableHttpTLS"); err == nil { - EnableHttpTLS = httptls + if httptls, err := AppConfig.Bool("EnableHTTPTLS"); err == nil { + EnableHTTPTLS = httptls } - if httpsport, err := AppConfig.Int("HttpsPort"); err == nil { - HttpsPort = httpsport + if httpsport, err := AppConfig.Int("HTTPSPort"); err == nil { + HTTPSPort = httpsport } - if certfile := AppConfig.String("HttpCertFile"); certfile != "" { - HttpCertFile = certfile + if certfile := AppConfig.String("HTTPCertFile"); certfile != "" { + HTTPCertFile = certfile } - if keyfile := AppConfig.String("HttpKeyFile"); keyfile != "" { - HttpKeyFile = keyfile + if keyfile := AppConfig.String("HTTPKeyFile"); keyfile != "" { + HTTPKeyFile = keyfile } if serverName := AppConfig.String("BeegoServerName"); serverName != "" { @@ -491,12 +542,12 @@ func ParseConfig() (err error) { EnableAdmin = enableadmin } - if adminhttpaddr := AppConfig.String("AdminHttpAddr"); adminhttpaddr != "" { - AdminHttpAddr = adminhttpaddr + if adminhttpaddr := AppConfig.String("AdminHTTPAddr"); adminhttpaddr != "" { + AdminHTTPAddr = adminhttpaddr } - if adminhttpport, err := AppConfig.Int("AdminHttpPort"); err == nil { - AdminHttpPort = adminhttpport + if adminhttpport, err := AppConfig.Int("AdminHTTPPort"); err == nil { + AdminHTTPPort = adminhttpport } if enabledocs, err := AppConfig.Bool("EnableDocs"); err == nil { diff --git a/hooks.go b/hooks.go index 526913c3..3691a800 100644 --- a/hooks.go +++ b/hooks.go @@ -65,8 +65,8 @@ func registerSession() error { if sessionConfig == "" { sessionConfig = `{"cookieName":"` + SessionName + `",` + `"gclifetime":` + strconv.FormatInt(SessionGCMaxLifetime, 10) + `,` + - `"providerConfig":"` + filepath.ToSlash(SessionSavePath) + `",` + - `"secure":` + strconv.FormatBool(EnableHttpTLS) + `,` + + `"providerConfig":"` + filepath.ToSlash(SessionProviderConfig) + `",` + + `"secure":` + strconv.FormatBool(EnableHTTPTLS) + `,` + `"enableSetCookie":` + strconv.FormatBool(SessionAutoSetCookie) + `,` + `"domain":"` + SessionDomain + `",` + `"cookieLifeTime":` + strconv.Itoa(SessionCookieLifeTime) + `}` diff --git a/router.go b/router.go index 7cce86fe..4ac6cb5b 100644 --- a/router.go +++ b/router.go @@ -617,7 +617,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) if ok, params := filterR.ValidRouter(urlPath); ok { for k, v := range params { if context.Input.Params == nil { - context.Input.Params = make(map[string]string) + context.Input.Params = make(map[string]string) } context.Input.Params[k] = v } @@ -869,7 +869,7 @@ func (p *ControllerRegister) recoverPanic(context *beecontext.Context) { if !RecoverPanic { panic(err) } else { - if ErrorsShow { + if EnableErrorsShow { if _, ok := ErrorMaps[fmt.Sprint(err)]; ok { exception(fmt.Sprint(err), context) return From 61570ac2f7b429220a9b2603bec299bb560aa8ab Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 8 Sep 2015 10:43:42 +0800 Subject: [PATCH 192/436] make golint happy with controller.go --- controller.go | 132 +++++++++++++++++++++++------------------------- router.go | 2 +- template.go | 2 +- templatefunc.go | 30 +++++------ 4 files changed, 80 insertions(+), 86 deletions(-) diff --git a/controller.go b/controller.go index 65b311b6..cad2b5ac 100644 --- a/controller.go +++ b/controller.go @@ -34,18 +34,19 @@ import ( //commonly used mime-types const ( - applicationJson = "application/json" - applicationXml = "application/xml" - textXml = "text/xml" + applicationJSON = "application/json" + applicationXML = "application/xml" + textXML = "text/xml" ) var ( - // custom error when user stop request handler manually. - USERSTOPRUN = errors.New("User stop run") - GlobalControllerRouter map[string][]ControllerComments = make(map[string][]ControllerComments) //pkgpath+controller:comments + // ErrAbort custom error when user stop request handler manually. + ErrAbort = errors.New("User stop run") + // GlobalControllerRouter store comments with controller. pkgpath+controller:comments + GlobalControllerRouter = make(map[string][]ControllerComments) ) -// store the comment for the controller method +// ControllerComments store the comment for the controller method type ControllerComments struct { Method string Router string @@ -64,7 +65,7 @@ type Controller struct { Layout string LayoutSections map[string]string // the key is the section name and the value is the template name TplExt string - _xsrf_token string + _xsrfToken string gotofunc string CruSession session.SessionStore XSRFExpire int @@ -153,20 +154,20 @@ func (c *Controller) Options() { http.Error(c.Ctx.ResponseWriter, "Method Not Allowed", 405) } -// call function fn +// HandlerFunc call function with the name func (c *Controller) HandlerFunc(fnname string) bool { if v, ok := c.methodMapping[fnname]; ok { v() return true - } else { - return false } + return false } // URLMapping register the internal Controller router. func (c *Controller) URLMapping() { } +// Mapping the method to function func (c *Controller) Mapping(method string, fn func()) { c.methodMapping[method] = fn } @@ -177,13 +178,11 @@ func (c *Controller) Render() error { return nil } rb, err := c.RenderBytes() - if err != nil { return err - } else { - c.Ctx.Output.Header("Content-Type", "text/html; charset=utf-8") - c.Ctx.Output.Body(rb) } + c.Ctx.Output.Header("Content-Type", "text/html; charset=utf-8") + c.Ctx.Output.Body(rb) return nil } @@ -200,7 +199,7 @@ func (c *Controller) RenderBytes() ([]byte, error) { if c.TplNames == "" { c.TplNames = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt } - + if RunMode == "dev" { buildFiles := make([]string, 1) buildFiles = append(buildFiles, c.TplNames) @@ -252,25 +251,25 @@ func (c *Controller) RenderBytes() ([]byte, error) { } icontent, _ := ioutil.ReadAll(ibytes) return icontent, nil - } else { - if c.TplNames == "" { - c.TplNames = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt - } - if RunMode == "dev" { - BuildTemplate(ViewsPath, c.TplNames) - } - ibytes := bytes.NewBufferString("") - if _, ok := BeeTemplates[c.TplNames]; !ok { - panic("can't find templatefile in the path:" + c.TplNames) - } - err := BeeTemplates[c.TplNames].ExecuteTemplate(ibytes, c.TplNames, c.Data) - if err != nil { - Trace("template Execute err:", err) - return nil, err - } - icontent, _ := ioutil.ReadAll(ibytes) - return icontent, nil } + + if c.TplNames == "" { + c.TplNames = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt + } + if RunMode == "dev" { + BuildTemplate(ViewsPath, c.TplNames) + } + ibytes := bytes.NewBufferString("") + if _, ok := BeeTemplates[c.TplNames]; !ok { + panic("can't find templatefile in the path:" + c.TplNames) + } + err := BeeTemplates[c.TplNames].ExecuteTemplate(ibytes, c.TplNames, c.Data) + if err != nil { + Trace("template Execute err:", err) + return nil, err + } + icontent, _ := ioutil.ReadAll(ibytes) + return icontent, nil } // Redirect sends the redirection response to url with status code. @@ -278,7 +277,7 @@ func (c *Controller) Redirect(url string, code int) { c.Ctx.Redirect(code, url) } -// Aborts stops controller handler and show the error data if code is defined in ErrorMap or code string. +// Abort stops controller handler and show the error data if code is defined in ErrorMap or code string. func (c *Controller) Abort(code string) { status, err := strconv.Atoi(code) if err != nil { @@ -296,29 +295,28 @@ func (c *Controller) CustomAbort(status int, body string) { } // last panic user string c.Ctx.ResponseWriter.Write([]byte(body)) - panic(USERSTOPRUN) + panic(ErrAbort) } // StopRun makes panic of USERSTOPRUN error and go to recover function if defined. func (c *Controller) StopRun() { - panic(USERSTOPRUN) + panic(ErrAbort) } -// UrlFor does another controller handler in this request function. +// URLFor does another controller handler in this request function. // it goes to this controller method if endpoint is not clear. -func (c *Controller) UrlFor(endpoint string, values ...interface{}) string { +func (c *Controller) URLFor(endpoint string, values ...interface{}) string { if len(endpoint) <= 0 { return "" } if endpoint[0] == '.' { - return UrlFor(reflect.Indirect(reflect.ValueOf(c.AppController)).Type().Name()+endpoint, values...) - } else { - return UrlFor(endpoint, values...) + return URLFor(reflect.Indirect(reflect.ValueOf(c.AppController)).Type().Name()+endpoint, values...) } + return URLFor(endpoint, values...) } -// ServeJson sends a json response with encoding charset. -func (c *Controller) ServeJson(encoding ...bool) { +// ServeJSON sends a json response with encoding charset. +func (c *Controller) ServeJSON(encoding ...bool) { var hasIndent bool var hasencoding bool if RunMode == "prod" { @@ -332,8 +330,8 @@ func (c *Controller) ServeJson(encoding ...bool) { c.Ctx.Output.Json(c.Data["json"], hasIndent, hasencoding) } -// ServeJsonp sends a jsonp response. -func (c *Controller) ServeJsonp() { +// ServeJSONP sends a jsonp response. +func (c *Controller) ServeJSONP() { var hasIndent bool if RunMode == "prod" { hasIndent = false @@ -343,8 +341,8 @@ func (c *Controller) ServeJsonp() { c.Ctx.Output.Jsonp(c.Data["jsonp"], hasIndent) } -// ServeXml sends xml response. -func (c *Controller) ServeXml() { +// ServeXML sends xml response. +func (c *Controller) ServeXML() { var hasIndent bool if RunMode == "prod" { hasIndent = false @@ -358,12 +356,12 @@ func (c *Controller) ServeXml() { func (c *Controller) ServeFormatted() { accept := c.Ctx.Input.Header("Accept") switch accept { - case applicationJson: - c.ServeJson() - case applicationXml, textXml: - c.ServeXml() + case applicationJSON: + c.ServeJSON() + case applicationXML, textXML: + c.ServeXML() default: - c.ServeJson() + c.ServeJSON() } } @@ -389,9 +387,8 @@ func (c *Controller) GetString(key string, def ...string) string { if v := c.Ctx.Input.Query(key); v != "" { return v - } else { - return defv } + return defv } // GetStrings returns the input string slice by key string or the default value while it's present and input is blank @@ -410,9 +407,8 @@ func (c *Controller) GetStrings(key string, def ...[]string) []string { vs := f[key] if len(vs) > 0 { return vs - } else { - return defv } + return defv } // GetInt returns input as an int or the default value while it's present and input is blank @@ -586,7 +582,7 @@ func (c *Controller) GetSession(name interface{}) interface{} { return c.CruSession.Get(name) } -// SetSession removes value from session. +// DelSession removes value from session. func (c *Controller) DelSession(name interface{}) { if c.CruSession == nil { c.StartSession() @@ -625,34 +621,34 @@ func (c *Controller) SetSecureCookie(Secret, name, value string, others ...inter c.Ctx.SetSecureCookie(Secret, name, value, others...) } -// XsrfToken creates a xsrf token string and returns. -func (c *Controller) XsrfToken() string { - if c._xsrf_token == "" { +// XSRFToken creates a CSRF token string and returns. +func (c *Controller) XSRFToken() string { + if c._xsrfToken == "" { var expire int64 if c.XSRFExpire > 0 { expire = int64(c.XSRFExpire) } else { expire = int64(XSRFExpire) } - c._xsrf_token = c.Ctx.XsrfToken(XSRFKEY, expire) + c._xsrfToken = c.Ctx.XsrfToken(XSRFKEY, expire) } - return c._xsrf_token + return c._xsrfToken } -// CheckXsrfCookie checks xsrf token in this request is valid or not. +// CheckXSRFCookie checks xsrf token in this request is valid or not. // the token can provided in request header "X-Xsrftoken" and "X-CsrfToken" // or in form field value named as "_xsrf". -func (c *Controller) CheckXsrfCookie() bool { +func (c *Controller) CheckXSRFCookie() bool { if !c.EnableXSRF { return true } return c.Ctx.CheckXsrfCookie() } -// XsrfFormHtml writes an input field contains xsrf token value. -func (c *Controller) XsrfFormHtml() string { +// XSRFFormHTML writes an input field contains xsrf token value. +func (c *Controller) XSRFFormHTML() string { return "" + c._xsrfToken + "\"/>" } // GetControllerAndAction gets the executing controller name and action name. diff --git a/router.go b/router.go index 4ac6cb5b..6fbf90ea 100644 --- a/router.go +++ b/router.go @@ -863,7 +863,7 @@ Admin: func (p *ControllerRegister) recoverPanic(context *beecontext.Context) { if err := recover(); err != nil { - if err == USERSTOPRUN { + if err == ErrAbort { return } if !RecoverPanic { diff --git a/template.go b/template.go index e976886a..9403c71f 100644 --- a/template.go +++ b/template.go @@ -65,7 +65,7 @@ func init() { beegoTplFuncMap["lt"] = lt // < beegoTplFuncMap["ne"] = ne // != - beegoTplFuncMap["urlfor"] = UrlFor // != + beegoTplFuncMap["urlfor"] = URLFor // != } // AddFuncMap let user to register a func in the template. diff --git a/templatefunc.go b/templatefunc.go index d1f64f8a..1106e4d0 100644 --- a/templatefunc.go +++ b/templatefunc.go @@ -140,11 +140,11 @@ func Compare(a, b interface{}) (equal bool) { } func CompareNot(a, b interface{}) (equal bool) { - return ! Compare(a, b) + return !Compare(a, b) } func NotNil(a interface{}) (is_nil bool) { - return CompareNot(a, nil) + return CompareNot(a, nil) } func Config(returnType, key string, defaultVal interface{}) (value interface{}, err error) { @@ -237,14 +237,14 @@ func Htmlunquote(src string) string { return strings.TrimSpace(text) } -// UrlFor returns url string with another registered controller handler with params. +// URLFor returns url string with another registered controller handler with params. // usage: // -// UrlFor(".index") -// print UrlFor("index") +// URLFor(".index") +// print URLFor("index") // router /login -// print UrlFor("login") -// print UrlFor("login", "next","/"") +// print URLFor("login") +// print URLFor("login", "next","/"") // router /profile/:username // print UrlFor("profile", ":username","John Doe") // result: @@ -254,7 +254,7 @@ func Htmlunquote(src string) string { // /user/John%20Doe // // more detail http://beego.me/docs/mvc/controller/urlbuilding.md -func UrlFor(endpoint string, values ...interface{}) string { +func URLFor(endpoint string, values ...interface{}) string { return BeeApp.Handlers.UrlFor(endpoint, values...) } @@ -698,22 +698,21 @@ func MapGet(arg1 interface{}, arg2 ...interface{}) (interface{}, error) { storedVal := arg1Val.MapIndex(arg2Val) - if storedVal.IsValid() { var result interface{} switch arg1Type.Elem().Kind() { - case reflect.Bool: + case reflect.Bool: result = storedVal.Bool() - case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: + case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: result = storedVal.Int() - case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: + case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: result = storedVal.Uint() - case reflect.Float32, reflect.Float64: + case reflect.Float32, reflect.Float64: result = storedVal.Float() - case reflect.String: + case reflect.String: result = storedVal.String() - default: + default: result = storedVal.Interface() } @@ -727,7 +726,6 @@ func MapGet(arg1 interface{}, arg2 ...interface{}) (interface{}, error) { return nil, nil } - } else { return nil, nil } From 67b36d7c487a163ce2496a9f7d38d6dc12090f36 Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 8 Sep 2015 21:41:38 +0800 Subject: [PATCH 193/436] make golint happy --- controller.go | 4 +- doc.go | 2 +- docs.go | 9 +++-- error.go | 6 +-- filter.go | 3 +- flash_test.go | 2 +- hooks.go | 20 +++++----- log.go | 15 ++++--- memzipfile.go | 6 ++- mime.go | 2 +- namespace.go | 105 +++++++++++++++++++++++++------------------------ router.go | 4 +- router_test.go | 4 +- 13 files changed, 94 insertions(+), 88 deletions(-) diff --git a/controller.go b/controller.go index cad2b5ac..b225df03 100644 --- a/controller.go +++ b/controller.go @@ -88,8 +88,8 @@ type ControllerInterface interface { Options() Finish() Render() error - XsrfToken() string - CheckXsrfCookie() bool + XSRFToken() string + CheckXSRFCookie() bool HandlerFunc(fn string) bool URLMapping() } diff --git a/doc.go b/doc.go index 3a5b5cb8..4be305b3 100644 --- a/doc.go +++ b/doc.go @@ -1,4 +1,5 @@ /* +Package beego provide a MVC framework beego: an open-source, high-performance, modular, full-stack web framework It is used for rapid development of RESTful APIs, web apps and backend services in Go. @@ -14,4 +15,3 @@ beego is inspired by Tornado, Sinatra and Flask with the added benefit of some G more infomation: http://beego.me */ package beego - diff --git a/docs.go b/docs.go index aaad205e..1dbed6cc 100644 --- a/docs.go +++ b/docs.go @@ -20,20 +20,21 @@ import ( "github.com/astaxie/beego/context" ) -var GlobalDocApi map[string]interface{} +// GlobalDocAPI store the swagger api documents +var GlobalDocAPI map[string]interface{} func init() { if EnableDocs { - GlobalDocApi = make(map[string]interface{}) + GlobalDocAPI = make(map[string]interface{}) } } func serverDocs(ctx *context.Context) { var obj interface{} if splat := ctx.Input.Param(":splat"); splat == "" { - obj = GlobalDocApi["Root"] + obj = GlobalDocAPI["Root"] } else { - if v, ok := GlobalDocApi[splat]; ok { + if v, ok := GlobalDocAPI[splat]; ok { obj = v } } diff --git a/error.go b/error.go index f5c0c80b..b4708b30 100644 --- a/error.go +++ b/error.go @@ -362,7 +362,7 @@ func gatewayTimeout(rw http.ResponseWriter, r *http.Request) { // usage: // beego.ErrorHandler("404",NotFound) // beego.ErrorHandler("500",InternalServerError) -func Errorhandler(code string, h http.HandlerFunc) *App { +func ErrorHandler(code string, h http.HandlerFunc) *App { errinfo := &errorInfo{} errinfo.errorType = errorTypeHandler errinfo.handler = h @@ -373,7 +373,7 @@ func Errorhandler(code string, h http.HandlerFunc) *App { // ErrorController registers ControllerInterface to each http err code string. // usage: -// beego.ErrorHandler(&controllers.ErrorController{}) +// beego.ErrorController(&controllers.ErrorController{}) func ErrorController(c ControllerInterface) *App { reflectVal := reflect.ValueOf(c) rt := reflectVal.Type() @@ -431,7 +431,7 @@ func executeError(err *errorInfo, ctx *context.Context, code int) { execController.URLMapping() - in := make([]reflect.Value, 0) + var in []reflect.Value method := vc.MethodByName(err.method) method.Call(in) diff --git a/filter.go b/filter.go index f673ab66..7dbc7028 100644 --- a/filter.go +++ b/filter.go @@ -39,7 +39,6 @@ func (f *FilterRouter) ValidRouter(url string) (bool, map[string]string) { } if isok, ok := isok.(bool); ok { return isok, params - } else { - return false, nil } + return false, nil } diff --git a/flash_test.go b/flash_test.go index b655f552..640d54de 100644 --- a/flash_test.go +++ b/flash_test.go @@ -30,7 +30,7 @@ func (t *TestFlashController) TestWriteFlash() { flash.Notice("TestFlashString") flash.Store(&t.Controller) // we choose to serve json because we don't want to load a template html file - t.ServeJson(true) + t.ServeJSON(true) } func TestFlashHeader(t *testing.T) { diff --git a/hooks.go b/hooks.go index 3691a800..178d8dc4 100644 --- a/hooks.go +++ b/hooks.go @@ -19,41 +19,41 @@ func registerMime() error { // register default error http handlers, 404,401,403,500 and 503. func registerDefaultErrorHandler() error { if _, ok := ErrorMaps["401"]; !ok { - Errorhandler("401", unauthorized) + ErrorHandler("401", unauthorized) } if _, ok := ErrorMaps["402"]; !ok { - Errorhandler("402", paymentRequired) + ErrorHandler("402", paymentRequired) } if _, ok := ErrorMaps["403"]; !ok { - Errorhandler("403", forbidden) + ErrorHandler("403", forbidden) } if _, ok := ErrorMaps["404"]; !ok { - Errorhandler("404", notFound) + ErrorHandler("404", notFound) } if _, ok := ErrorMaps["405"]; !ok { - Errorhandler("405", methodNotAllowed) + ErrorHandler("405", methodNotAllowed) } if _, ok := ErrorMaps["500"]; !ok { - Errorhandler("500", internalServerError) + ErrorHandler("500", internalServerError) } if _, ok := ErrorMaps["501"]; !ok { - Errorhandler("501", notImplemented) + ErrorHandler("501", notImplemented) } if _, ok := ErrorMaps["502"]; !ok { - Errorhandler("502", badGateway) + ErrorHandler("502", badGateway) } if _, ok := ErrorMaps["503"]; !ok { - Errorhandler("503", serviceUnavailable) + ErrorHandler("503", serviceUnavailable) } if _, ok := ErrorMaps["504"]; !ok { - Errorhandler("504", gatewayTimeout) + ErrorHandler("504", gatewayTimeout) } return nil } diff --git a/log.go b/log.go index 7949ed96..68252236 100644 --- a/log.go +++ b/log.go @@ -32,18 +32,18 @@ const ( LevelDebug ) -// SetLogLevel sets the global log level used by the simple -// logger. +// SetLevel sets the global log level used by the simple logger. func SetLevel(l int) { BeeLogger.SetLevel(l) } +// SetLogFuncCall set the CallDepth, default is 3 func SetLogFuncCall(b bool) { BeeLogger.EnableFuncCallDepth(b) BeeLogger.SetLogFuncCallDepth(3) } -// logger references the used application logger. +// BeeLogger references the used application logger. var BeeLogger *logs.BeeLogger // SetLogger sets a new logger. @@ -55,10 +55,12 @@ func SetLogger(adaptername string, config string) error { return nil } +// Emergency logs a message at emergency level. func Emergency(v ...interface{}) { BeeLogger.Emergency(generateFmtStr(len(v)), v...) } +// Alert logs a message at alert level. func Alert(v ...interface{}) { BeeLogger.Alert(generateFmtStr(len(v)), v...) } @@ -78,21 +80,22 @@ func Warning(v ...interface{}) { BeeLogger.Warning(generateFmtStr(len(v)), v...) } -// compatibility alias for Warning() +// Warn compatibility alias for Warning() func Warn(v ...interface{}) { BeeLogger.Warn(generateFmtStr(len(v)), v...) } +// Notice logs a message at notice level. func Notice(v ...interface{}) { BeeLogger.Notice(generateFmtStr(len(v)), v...) } -// Info logs a message at info level. +// Informational logs a message at info level. func Informational(v ...interface{}) { BeeLogger.Informational(generateFmtStr(len(v)), v...) } -// compatibility alias for Warning() +// Info compatibility alias for Warning() func Info(v ...interface{}) { BeeLogger.Info(generateFmtStr(len(v)), v...) } diff --git a/memzipfile.go b/memzipfile.go index cc5e3851..0fff44b6 100644 --- a/memzipfile.go +++ b/memzipfile.go @@ -28,8 +28,10 @@ import ( "time" ) -var gmfim map[string]*memFileInfo = make(map[string]*memFileInfo) -var lock sync.RWMutex +var ( + gmfim = make(map[string]*memFileInfo) + lock sync.RWMutex +) // OpenMemZipFile returns MemFile object with a compressed static file. // it's used for serve static file if gzip enable. diff --git a/mime.go b/mime.go index 0034976e..e85fcb2a 100644 --- a/mime.go +++ b/mime.go @@ -14,7 +14,7 @@ package beego -var mimemaps map[string]string = map[string]string{ +var mimemaps = map[string]string{ ".3dm": "x-world/x-3dmf", ".3dmf": "x-world/x-3dmf", ".7z": "application/x-7z-compressed", diff --git a/namespace.go b/namespace.go index 86dc2ebd..0dfdd7af 100644 --- a/namespace.go +++ b/namespace.go @@ -23,7 +23,8 @@ import ( type namespaceCond func(*beecontext.Context) bool -type innerNamespace func(*Namespace) +// LinkNamespace used as link action +type LinkNamespace func(*Namespace) // Namespace is store all the info type Namespace struct { @@ -31,8 +32,8 @@ type Namespace struct { handlers *ControllerRegister } -// get new Namespace -func NewNamespace(prefix string, params ...innerNamespace) *Namespace { +// NewNamespace get new Namespace +func NewNamespace(prefix string, params ...LinkNamespace) *Namespace { ns := &Namespace{ prefix: prefix, handlers: NewControllerRegister(), @@ -43,7 +44,7 @@ func NewNamespace(prefix string, params ...innerNamespace) *Namespace { return ns } -// set condtion function +// Cond set condtion function // if cond return true can run this namespace, else can't // usage: // ns.Cond(func (ctx *context.Context) bool{ @@ -72,7 +73,7 @@ func (n *Namespace) Cond(cond namespaceCond) *Namespace { return n } -// add filter in the Namespace +// Filter add filter in the Namespace // action has before & after // FilterFunc // usage: @@ -95,98 +96,98 @@ func (n *Namespace) Filter(action string, filter ...FilterFunc) *Namespace { return n } -// same as beego.Rourer +// Router same as beego.Rourer // refer: https://godoc.org/github.com/astaxie/beego#Router func (n *Namespace) Router(rootpath string, c ControllerInterface, mappingMethods ...string) *Namespace { n.handlers.Add(rootpath, c, mappingMethods...) return n } -// same as beego.AutoRouter +// AutoRouter same as beego.AutoRouter // refer: https://godoc.org/github.com/astaxie/beego#AutoRouter func (n *Namespace) AutoRouter(c ControllerInterface) *Namespace { n.handlers.AddAuto(c) return n } -// same as beego.AutoPrefix +// AutoPrefix same as beego.AutoPrefix // refer: https://godoc.org/github.com/astaxie/beego#AutoPrefix func (n *Namespace) AutoPrefix(prefix string, c ControllerInterface) *Namespace { n.handlers.AddAutoPrefix(prefix, c) return n } -// same as beego.Get +// Get same as beego.Get // refer: https://godoc.org/github.com/astaxie/beego#Get func (n *Namespace) Get(rootpath string, f FilterFunc) *Namespace { n.handlers.Get(rootpath, f) return n } -// same as beego.Post +// Post same as beego.Post // refer: https://godoc.org/github.com/astaxie/beego#Post func (n *Namespace) Post(rootpath string, f FilterFunc) *Namespace { n.handlers.Post(rootpath, f) return n } -// same as beego.Delete +// Delete same as beego.Delete // refer: https://godoc.org/github.com/astaxie/beego#Delete func (n *Namespace) Delete(rootpath string, f FilterFunc) *Namespace { n.handlers.Delete(rootpath, f) return n } -// same as beego.Put +// Put same as beego.Put // refer: https://godoc.org/github.com/astaxie/beego#Put func (n *Namespace) Put(rootpath string, f FilterFunc) *Namespace { n.handlers.Put(rootpath, f) return n } -// same as beego.Head +// Head same as beego.Head // refer: https://godoc.org/github.com/astaxie/beego#Head func (n *Namespace) Head(rootpath string, f FilterFunc) *Namespace { n.handlers.Head(rootpath, f) return n } -// same as beego.Options +// Options same as beego.Options // refer: https://godoc.org/github.com/astaxie/beego#Options func (n *Namespace) Options(rootpath string, f FilterFunc) *Namespace { n.handlers.Options(rootpath, f) return n } -// same as beego.Patch +// Patch same as beego.Patch // refer: https://godoc.org/github.com/astaxie/beego#Patch func (n *Namespace) Patch(rootpath string, f FilterFunc) *Namespace { n.handlers.Patch(rootpath, f) return n } -// same as beego.Any +// Any same as beego.Any // refer: https://godoc.org/github.com/astaxie/beego#Any func (n *Namespace) Any(rootpath string, f FilterFunc) *Namespace { n.handlers.Any(rootpath, f) return n } -// same as beego.Handler +// Handler same as beego.Handler // refer: https://godoc.org/github.com/astaxie/beego#Handler func (n *Namespace) Handler(rootpath string, h http.Handler) *Namespace { n.handlers.Handler(rootpath, h) return n } -// add include class +// Include add include class // refer: https://godoc.org/github.com/astaxie/beego#Include func (n *Namespace) Include(cList ...ControllerInterface) *Namespace { n.handlers.Include(cList...) return n } -// nest Namespace +// Namespace add nest Namespace // usage: //ns := beego.NewNamespace(“/v1”). //Namespace( @@ -230,7 +231,7 @@ func (n *Namespace) Namespace(ns ...*Namespace) *Namespace { return n } -// register Namespace into beego.Handler +// AddNamespace register Namespace into beego.Handler // support multi Namespace func AddNamespace(nl ...*Namespace) { for _, n := range nl { @@ -275,113 +276,113 @@ func addPrefix(t *Tree, prefix string) { } -// Namespace Condition -func NSCond(cond namespaceCond) innerNamespace { +// NSCond is Namespace Condition +func NSCond(cond namespaceCond) LinkNamespace { return func(ns *Namespace) { ns.Cond(cond) } } -// Namespace BeforeRouter filter -func NSBefore(filiterList ...FilterFunc) innerNamespace { +// NSBefore Namespace BeforeRouter filter +func NSBefore(filiterList ...FilterFunc) LinkNamespace { return func(ns *Namespace) { ns.Filter("before", filiterList...) } } -// Namespace FinishRouter filter -func NSAfter(filiterList ...FilterFunc) innerNamespace { +// NSAfter add Namespace FinishRouter filter +func NSAfter(filiterList ...FilterFunc) LinkNamespace { return func(ns *Namespace) { ns.Filter("after", filiterList...) } } -// Namespace Include ControllerInterface -func NSInclude(cList ...ControllerInterface) innerNamespace { +// NSInclude Namespace Include ControllerInterface +func NSInclude(cList ...ControllerInterface) LinkNamespace { return func(ns *Namespace) { ns.Include(cList...) } } -// Namespace Router -func NSRouter(rootpath string, c ControllerInterface, mappingMethods ...string) innerNamespace { +// NSRouter call Namespace Router +func NSRouter(rootpath string, c ControllerInterface, mappingMethods ...string) LinkNamespace { return func(ns *Namespace) { ns.Router(rootpath, c, mappingMethods...) } } -// Namespace Get -func NSGet(rootpath string, f FilterFunc) innerNamespace { +// NSGet call Namespace Get +func NSGet(rootpath string, f FilterFunc) LinkNamespace { return func(ns *Namespace) { ns.Get(rootpath, f) } } -// Namespace Post -func NSPost(rootpath string, f FilterFunc) innerNamespace { +// NSPost call Namespace Post +func NSPost(rootpath string, f FilterFunc) LinkNamespace { return func(ns *Namespace) { ns.Post(rootpath, f) } } -// Namespace Head -func NSHead(rootpath string, f FilterFunc) innerNamespace { +// NSHead call Namespace Head +func NSHead(rootpath string, f FilterFunc) LinkNamespace { return func(ns *Namespace) { ns.Head(rootpath, f) } } -// Namespace Put -func NSPut(rootpath string, f FilterFunc) innerNamespace { +// NSPut call Namespace Put +func NSPut(rootpath string, f FilterFunc) LinkNamespace { return func(ns *Namespace) { ns.Put(rootpath, f) } } -// Namespace Delete -func NSDelete(rootpath string, f FilterFunc) innerNamespace { +// NSDelete call Namespace Delete +func NSDelete(rootpath string, f FilterFunc) LinkNamespace { return func(ns *Namespace) { ns.Delete(rootpath, f) } } -// Namespace Any -func NSAny(rootpath string, f FilterFunc) innerNamespace { +// NSAny call Namespace Any +func NSAny(rootpath string, f FilterFunc) LinkNamespace { return func(ns *Namespace) { ns.Any(rootpath, f) } } -// Namespace Options -func NSOptions(rootpath string, f FilterFunc) innerNamespace { +// NSOptions call Namespace Options +func NSOptions(rootpath string, f FilterFunc) LinkNamespace { return func(ns *Namespace) { ns.Options(rootpath, f) } } -// Namespace Patch -func NSPatch(rootpath string, f FilterFunc) innerNamespace { +// NSPatch call Namespace Patch +func NSPatch(rootpath string, f FilterFunc) LinkNamespace { return func(ns *Namespace) { ns.Patch(rootpath, f) } } -//Namespace AutoRouter -func NSAutoRouter(c ControllerInterface) innerNamespace { +// NSAutoRouter call Namespace AutoRouter +func NSAutoRouter(c ControllerInterface) LinkNamespace { return func(ns *Namespace) { ns.AutoRouter(c) } } -// Namespace AutoPrefix -func NSAutoPrefix(prefix string, c ControllerInterface) innerNamespace { +// NSAutoPrefix call Namespace AutoPrefix +func NSAutoPrefix(prefix string, c ControllerInterface) LinkNamespace { return func(ns *Namespace) { ns.AutoPrefix(prefix, c) } } -// Namespace add sub Namespace -func NSNamespace(prefix string, params ...innerNamespace) innerNamespace { +// NSNamespace add sub Namespace +func NSNamespace(prefix string, params ...LinkNamespace) LinkNamespace { return func(ns *Namespace) { n := NewNamespace(prefix, params...) ns.Namespace(n) diff --git a/router.go b/router.go index 6fbf90ea..dc4ddb0f 100644 --- a/router.go +++ b/router.go @@ -770,10 +770,10 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) //if XSRF is Enable then check cookie where there has any cookie in the request's cookie _csrf if EnableXSRF { - execController.XsrfToken() + execController.XSRFToken() if r.Method == "POST" || r.Method == "DELETE" || r.Method == "PUT" || (r.Method == "POST" && (context.Input.Query("_method") == "DELETE" || context.Input.Query("_method") == "PUT")) { - execController.CheckXsrfCookie() + execController.CheckXSRFCookie() } } diff --git a/router_test.go b/router_test.go index 005f32d6..093a1fad 100644 --- a/router_test.go +++ b/router_test.go @@ -53,7 +53,7 @@ func (tc *TestController) Myext() { } func (tc *TestController) GetUrl() { - tc.Ctx.Output.Body([]byte(tc.UrlFor(".Myext"))) + tc.Ctx.Output.Body([]byte(tc.URLFor(".Myext"))) } func (t *TestController) GetParams() { @@ -76,7 +76,7 @@ type JsonController struct { func (this *JsonController) Prepare() { this.Data["json"] = "prepare" - this.ServeJson(true) + this.ServeJSON(true) } func (this *JsonController) Get() { From 21fffc446b4f45e87c724e63afa0f05a36ff87cf Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 8 Sep 2015 21:45:45 +0800 Subject: [PATCH 194/436] make golint happy parser.go --- parser.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/parser.go b/parser.go index cf8dee22..dd468c1c 100644 --- a/parser.go +++ b/parser.go @@ -42,13 +42,13 @@ func init() { ` var ( - lastupdateFilename string = "lastupdate.tmp" + lastupdateFilename = "lastupdate.tmp" commentFilename string pkgLastupdate map[string]int64 genInfoList map[string][]ControllerComments ) -const COMMENTFL = "commentsRouter_" +const coomentPrefix = "commentsRouter_" func init() { pkgLastupdate = make(map[string]int64) @@ -56,7 +56,7 @@ func init() { func parserPkg(pkgRealpath, pkgpath string) error { rep := strings.NewReplacer("/", "_", ".", "_") - commentFilename = COMMENTFL + rep.Replace(pkgpath) + ".go" + commentFilename = coomentPrefix + rep.Replace(pkgpath) + ".go" if !compareFile(pkgRealpath) { Info(pkgRealpath + " has not changed, not reloading") return nil @@ -129,9 +129,11 @@ func parserComments(comments *ast.CommentGroup, funcName, controllerName, pkgpat func genRouterCode() { os.Mkdir(path.Join(workPath, "routers"), 0755) Info("generate router from comments") - var globalinfo string - sortKey := make([]string, 0) - for k, _ := range genInfoList { + var ( + globalinfo string + sortKey []string + ) + for k := range genInfoList { sortKey = append(sortKey, k) } sort.Strings(sortKey) From c11740b647e765499470a21c7baefcf20ab0fb7a Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 8 Sep 2015 22:01:13 +0800 Subject: [PATCH 195/436] make golint happy router.go --- router.go | 137 ++++++++++++++++++++++++------------------------ templatefunc.go | 2 +- 2 files changed, 69 insertions(+), 70 deletions(-) diff --git a/router.go b/router.go index dc4ddb0f..12b5f6ae 100644 --- a/router.go +++ b/router.go @@ -34,8 +34,8 @@ import ( "github.com/astaxie/beego/utils" ) +// default filter execution points const ( - // default filter execution points BeforeStatic = iota BeforeRouter BeforeExec @@ -50,7 +50,7 @@ const ( ) var ( - // supported http methods. + // HTTPMETHOD list the supported http methods. HTTPMETHOD = map[string]string{ "GET": "GET", "POST": "POST", @@ -71,10 +71,12 @@ var ( "SetSecureCookie", "XsrfToken", "CheckXsrfCookie", "XsrfFormHtml", "GetControllerAndAction"} - url_placeholder = "{{placeholder}}" - DefaultLogFilter FilterHandler = &logFilter{} + urlPlaceholder = "{{placeholder}}" + // DefaultAccessLogFilter will skip the accesslog if return true + DefaultAccessLogFilter FilterHandler = &logFilter{} ) +// FilterHandler is an interface for type FilterHandler interface { Filter(*beecontext.Context) bool } @@ -96,7 +98,7 @@ func (l *logFilter) Filter(ctx *beecontext.Context) bool { return false } -// To append a slice's value into "exceptMethod", for controller's methods shouldn't reflect to AutoRouter +// ExceptMethodAppend to append a slice's value into "exceptMethod", for controller's methods shouldn't reflect to AutoRouter func ExceptMethodAppend(action string) { exceptMethod = append(exceptMethod, action) } @@ -196,7 +198,7 @@ func (p *ControllerRegister) addToRouter(method, pattern string, r *controllerIn } } -// only when the Runmode is dev will generate router file in the router/auto.go from the controller +// Include only when the Runmode is dev will generate router file in the router/auto.go from the controller // Include(&BankAccount{}, &OrderController{},&RefundController{},&ReceiptController{}) func (p *ControllerRegister) Include(cList ...ControllerInterface) { if RunMode == "dev" { @@ -238,7 +240,7 @@ func (p *ControllerRegister) Include(cList ...ControllerInterface) { } } -// add get method +// Get add get method // usage: // Get("/", func(ctx *context.Context){ // ctx.Output.Body("hello world") @@ -247,7 +249,7 @@ func (p *ControllerRegister) Get(pattern string, f FilterFunc) { p.AddMethod("get", pattern, f) } -// add post method +// Post add post method // usage: // Post("/api", func(ctx *context.Context){ // ctx.Output.Body("hello world") @@ -256,7 +258,7 @@ func (p *ControllerRegister) Post(pattern string, f FilterFunc) { p.AddMethod("post", pattern, f) } -// add put method +// Put add put method // usage: // Put("/api/:id", func(ctx *context.Context){ // ctx.Output.Body("hello world") @@ -265,7 +267,7 @@ func (p *ControllerRegister) Put(pattern string, f FilterFunc) { p.AddMethod("put", pattern, f) } -// add delete method +// Delete add delete method // usage: // Delete("/api/:id", func(ctx *context.Context){ // ctx.Output.Body("hello world") @@ -274,7 +276,7 @@ func (p *ControllerRegister) Delete(pattern string, f FilterFunc) { p.AddMethod("delete", pattern, f) } -// add head method +// Head add head method // usage: // Head("/api/:id", func(ctx *context.Context){ // ctx.Output.Body("hello world") @@ -283,7 +285,7 @@ func (p *ControllerRegister) Head(pattern string, f FilterFunc) { p.AddMethod("head", pattern, f) } -// add patch method +// Patch add patch method // usage: // Patch("/api/:id", func(ctx *context.Context){ // ctx.Output.Body("hello world") @@ -292,7 +294,7 @@ func (p *ControllerRegister) Patch(pattern string, f FilterFunc) { p.AddMethod("patch", pattern, f) } -// add options method +// Options add options method // usage: // Options("/api/:id", func(ctx *context.Context){ // ctx.Output.Body("hello world") @@ -301,7 +303,7 @@ func (p *ControllerRegister) Options(pattern string, f FilterFunc) { p.AddMethod("options", pattern, f) } -// add all method +// Any add all method // usage: // Any("/api/:id", func(ctx *context.Context){ // ctx.Output.Body("hello world") @@ -310,7 +312,7 @@ func (p *ControllerRegister) Any(pattern string, f FilterFunc) { p.AddMethod("*", pattern, f) } -// add http method router +// AddMethod add http method router // usage: // AddMethod("get","/api/:id", func(ctx *context.Context){ // ctx.Output.Body("hello world") @@ -343,7 +345,7 @@ func (p *ControllerRegister) AddMethod(method, pattern string, f FilterFunc) { } } -// add user defined Handler +// Handler add user defined Handler func (p *ControllerRegister) Handler(pattern string, h http.Handler, options ...interface{}) { route := &controllerInfo{} route.pattern = pattern @@ -359,7 +361,7 @@ func (p *ControllerRegister) Handler(pattern string, h http.Handler, options ... } } -// Add auto router to ControllerRegister. +// AddAuto router to ControllerRegister. // example beego.AddAuto(&MainContorlller{}), // MainController has method List and Page. // visit the url /main/list to execute List function @@ -368,7 +370,7 @@ func (p *ControllerRegister) AddAuto(c ControllerInterface) { p.AddAutoPrefix("/", c) } -// Add auto router to ControllerRegister with prefix. +// AddAutoPrefix Add auto router to ControllerRegister with prefix. // example beego.AddAutoPrefix("/admin",&MainContorlller{}), // MainController has method List and Page. // visit the url /admin/main/list to execute List function @@ -399,7 +401,7 @@ func (p *ControllerRegister) AddAutoPrefix(prefix string, c ControllerInterface) } } -// Add a FilterFunc with pattern rule and action constant. +// InsertFilter Add a FilterFunc with pattern rule and action constant. // The bool params is for setting the returnOnOutput value (false allows multiple filters to execute) func (p *ControllerRegister) InsertFilter(pattern string, pos int, filter FilterFunc, params ...bool) error { @@ -426,9 +428,9 @@ func (p *ControllerRegister) insertFilterRouter(pos int, mr *FilterRouter) error return nil } -// UrlFor does another controller handler in this request function. +// URLFor does another controller handler in this request function. // it can access any controller method. -func (p *ControllerRegister) UrlFor(endpoint string, values ...interface{}) string { +func (p *ControllerRegister) URLFor(endpoint string, values ...interface{}) string { paths := strings.Split(endpoint, ".") if len(paths) <= 1 { Warn("urlfor endpoint must like path.controller.method") @@ -469,7 +471,7 @@ func (p *ControllerRegister) geturl(t *Tree, url, controllName, methodName strin } } if t.wildcard != nil { - u := path.Join(url, url_placeholder) + u := path.Join(url, urlPlaceholder) ok, u := p.geturl(t.wildcard, u, controllName, methodName, params, httpMethod) if ok { return ok, u @@ -499,22 +501,21 @@ func (p *ControllerRegister) geturl(t *Tree, url, controllName, methodName strin if find { if l.regexps == nil { if len(l.wildcards) == 0 { - return true, strings.Replace(url, "/"+url_placeholder, "", 1) + tourl(params) + return true, strings.Replace(url, "/"+urlPlaceholder, "", 1) + tourl(params) } if len(l.wildcards) == 1 { if v, ok := params[l.wildcards[0]]; ok { delete(params, l.wildcards[0]) - return true, strings.Replace(url, url_placeholder, v, 1) + tourl(params) - } else { - return false, "" + return true, strings.Replace(url, urlPlaceholder, v, 1) + tourl(params) } + return false, "" } if len(l.wildcards) == 3 && l.wildcards[0] == "." { if p, ok := params[":path"]; ok { if e, isok := params[":ext"]; isok { delete(params, ":path") delete(params, ":ext") - return true, strings.Replace(url, url_placeholder, p+"."+e, -1) + tourl(params) + return true, strings.Replace(url, urlPlaceholder, p+"."+e, -1) + tourl(params) } } } @@ -526,45 +527,43 @@ func (p *ControllerRegister) geturl(t *Tree, url, controllName, methodName strin } if u, ok := params[v]; ok { delete(params, v) - url = strings.Replace(url, url_placeholder, u, 1) + url = strings.Replace(url, urlPlaceholder, u, 1) } else { if canskip { canskip = false continue - } else { - return false, "" } + return false, "" } } return true, url + tourl(params) - } else { - var i int - var startreg bool - regurl := "" - for _, v := range strings.Trim(l.regexps.String(), "^$") { - if v == '(' { - startreg = true - continue - } else if v == ')' { - startreg = false - if v, ok := params[l.wildcards[i]]; ok { - delete(params, l.wildcards[i]) - regurl = regurl + v - i++ - } else { - break - } - } else if !startreg { - regurl = string(append([]rune(regurl), v)) + } + var i int + var startreg bool + regurl := "" + for _, v := range strings.Trim(l.regexps.String(), "^$") { + if v == '(' { + startreg = true + continue + } else if v == ')' { + startreg = false + if v, ok := params[l.wildcards[i]]; ok { + delete(params, l.wildcards[i]) + regurl = regurl + v + i++ + } else { + break } + } else if !startreg { + regurl = string(append([]rune(regurl), v)) } - if l.regexps.MatchString(regurl) { - ps := strings.Split(regurl, "/") - for _, p := range ps { - url = strings.Replace(url, url_placeholder, p, 1) - } - return true, url + tourl(params) + } + if l.regexps.MatchString(regurl) { + ps := strings.Split(regurl, "/") + for _, p := range ps { + url = strings.Replace(url, urlPlaceholder, p, 1) } + return true, url + tourl(params) } } } @@ -607,7 +606,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) urlPath = r.URL.Path } // defined filter function - do_filter := func(pos int) (started bool) { + doFilter := func(pos int) (started bool) { if p.enableFilter { if l, ok := p.filters[pos]; ok { for _, filterR := range l { @@ -639,7 +638,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) } // filter for static file - if do_filter(BeforeStatic) { + if doFilter(BeforeStatic) { goto Admin } @@ -670,7 +669,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) context.Input.ParseFormOrMulitForm(MaxMemory) } - if do_filter(BeforeRouter) { + if doFilter(BeforeRouter) { goto Admin } @@ -681,17 +680,17 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) } if !findrouter { - http_method := r.Method + httpMethod := r.Method - if http_method == "POST" && context.Input.Query("_method") == "PUT" { - http_method = "PUT" + if httpMethod == "POST" && context.Input.Query("_method") == "PUT" { + httpMethod = "PUT" } - if http_method == "POST" && context.Input.Query("_method") == "DELETE" { - http_method = "DELETE" + if httpMethod == "POST" && context.Input.Query("_method") == "DELETE" { + httpMethod = "DELETE" } - if t, ok := p.routers[http_method]; ok { + if t, ok := p.routers[httpMethod]; ok { runObject, p := t.Match(urlPath) if r, ok := runObject.(*controllerInfo); ok { routerInfo = r @@ -718,7 +717,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) if findrouter { //execute middleware filters - if do_filter(BeforeExec) { + if doFilter(BeforeExec) { goto Admin } isRunable := false @@ -798,7 +797,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) execController.Options() default: if !execController.HandlerFunc(runMethod) { - in := make([]reflect.Value, 0) + var in []reflect.Value method := vc.MethodByName(runMethod) method.Call(in) } @@ -819,12 +818,12 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) } //execute middleware filters - if do_filter(AfterExec) { + if doFilter(AfterExec) { goto Admin } } - do_filter(FinishRouter) + doFilter(FinishRouter) Admin: timeend := time.Since(starttime) @@ -850,7 +849,7 @@ Admin: } else { devinfo = fmt.Sprintf("| % -10s | % -40s | % -16s | % -10s |", r.Method, r.URL.Path, timeend.String(), "notmatch") } - if DefaultLogFilter == nil || !DefaultLogFilter.Filter(context) { + if DefaultAccessLogFilter == nil || !DefaultAccessLogFilter.Filter(context) { Debug(devinfo) } } diff --git a/templatefunc.go b/templatefunc.go index 1106e4d0..6b77fda3 100644 --- a/templatefunc.go +++ b/templatefunc.go @@ -255,7 +255,7 @@ func Htmlunquote(src string) string { // // more detail http://beego.me/docs/mvc/controller/urlbuilding.md func URLFor(endpoint string, values ...interface{}) string { - return BeeApp.Handlers.UrlFor(endpoint, values...) + return BeeApp.Handlers.URLFor(endpoint, values...) } // returns script tag with src string. From b2048e8653545d5b9c0650e0723b95b49847986c Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 8 Sep 2015 22:05:38 +0800 Subject: [PATCH 196/436] make router test passed --- router_test.go | 56 +++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/router_test.go b/router_test.go index 093a1fad..c6ec9c92 100644 --- a/router_test.go +++ b/router_test.go @@ -52,17 +52,17 @@ func (tc *TestController) Myext() { tc.Ctx.Output.Body([]byte(tc.Ctx.Input.Param(":ext"))) } -func (tc *TestController) GetUrl() { +func (tc *TestController) GetURL() { tc.Ctx.Output.Body([]byte(tc.URLFor(".Myext"))) } -func (t *TestController) GetParams() { - t.Ctx.WriteString(t.Ctx.Input.Query(":last") + "+" + - t.Ctx.Input.Query(":first") + "+" + t.Ctx.Input.Query("learn")) +func (tc *TestController) GetParams() { + tc.Ctx.WriteString(tc.Ctx.Input.Query(":last") + "+" + + tc.Ctx.Input.Query(":first") + "+" + tc.Ctx.Input.Query("learn")) } -func (t *TestController) GetManyRouter() { - t.Ctx.WriteString(t.Ctx.Input.Query(":id") + t.Ctx.Input.Query(":page")) +func (tc *TestController) GetManyRouter() { + tc.Ctx.WriteString(tc.Ctx.Input.Query(":id") + tc.Ctx.Input.Query(":page")) } type ResStatus struct { @@ -70,29 +70,29 @@ type ResStatus struct { Msg string } -type JsonController struct { +type JSONController struct { Controller } -func (this *JsonController) Prepare() { - this.Data["json"] = "prepare" - this.ServeJSON(true) +func (jc *JSONController) Prepare() { + jc.Data["json"] = "prepare" + jc.ServeJSON(true) } -func (this *JsonController) Get() { - this.Data["Username"] = "astaxie" - this.Ctx.Output.Body([]byte("ok")) +func (jc *JSONController) Get() { + jc.Data["Username"] = "astaxie" + jc.Ctx.Output.Body([]byte("ok")) } func TestUrlFor(t *testing.T) { handler := NewControllerRegister() handler.Add("/api/list", &TestController{}, "*:List") handler.Add("/person/:last/:first", &TestController{}, "*:Param") - if a := handler.UrlFor("TestController.List"); a != "/api/list" { + if a := handler.URLFor("TestController.List"); a != "/api/list" { Info(a) t.Errorf("TestController.List must equal to /api/list") } - if a := handler.UrlFor("TestController.Param", ":last", "xie", ":first", "asta"); a != "/person/xie/asta" { + if a := handler.URLFor("TestController.Param", ":last", "xie", ":first", "asta"); a != "/person/xie/asta" { t.Errorf("TestController.Param must equal to /person/xie/asta, but get " + a) } } @@ -100,39 +100,39 @@ func TestUrlFor(t *testing.T) { func TestUrlFor3(t *testing.T) { handler := NewControllerRegister() handler.AddAuto(&TestController{}) - if a := handler.UrlFor("TestController.Myext"); a != "/test/myext" && a != "/Test/Myext" { + if a := handler.URLFor("TestController.Myext"); a != "/test/myext" && a != "/Test/Myext" { t.Errorf("TestController.Myext must equal to /test/myext, but get " + a) } - if a := handler.UrlFor("TestController.GetUrl"); a != "/test/geturl" && a != "/Test/GetUrl" { - t.Errorf("TestController.GetUrl must equal to /test/geturl, but get " + a) + if a := handler.URLFor("TestController.GetURL"); a != "/test/geturl" && a != "/Test/GetURL" { + t.Errorf("TestController.GetURL must equal to /test/geturl, but get " + a) } } func TestUrlFor2(t *testing.T) { handler := NewControllerRegister() handler.Add("/v1/:v/cms_:id(.+)_:page(.+).html", &TestController{}, "*:List") - handler.Add("/v1/:username/edit", &TestController{}, "get:GetUrl") + handler.Add("/v1/:username/edit", &TestController{}, "get:GetURL") handler.Add("/v1/:v(.+)_cms/ttt_:id(.+)_:page(.+).html", &TestController{}, "*:Param") handler.Add("/:year:int/:month:int/:title/:entid", &TestController{}) - if handler.UrlFor("TestController.GetUrl", ":username", "astaxie") != "/v1/astaxie/edit" { - Info(handler.UrlFor("TestController.GetUrl")) + if handler.URLFor("TestController.GetURL", ":username", "astaxie") != "/v1/astaxie/edit" { + Info(handler.URLFor("TestController.GetURL")) t.Errorf("TestController.List must equal to /v1/astaxie/edit") } - if handler.UrlFor("TestController.List", ":v", "za", ":id", "12", ":page", "123") != + if handler.URLFor("TestController.List", ":v", "za", ":id", "12", ":page", "123") != "/v1/za/cms_12_123.html" { - Info(handler.UrlFor("TestController.List")) + Info(handler.URLFor("TestController.List")) t.Errorf("TestController.List must equal to /v1/za/cms_12_123.html") } - if handler.UrlFor("TestController.Param", ":v", "za", ":id", "12", ":page", "123") != + if handler.URLFor("TestController.Param", ":v", "za", ":id", "12", ":page", "123") != "/v1/za_cms/ttt_12_123.html" { - Info(handler.UrlFor("TestController.Param")) + Info(handler.URLFor("TestController.Param")) t.Errorf("TestController.List must equal to /v1/za_cms/ttt_12_123.html") } - if handler.UrlFor("TestController.Get", ":year", "1111", ":month", "11", + if handler.URLFor("TestController.Get", ":year", "1111", ":month", "11", ":title", "aaaa", ":entid", "aaaa") != "/1111/11/aaaa/aaaa" { - Info(handler.UrlFor("TestController.Get")) + Info(handler.URLFor("TestController.Get")) t.Errorf("TestController.Get must equal to /1111/11/aaaa/aaaa") } } @@ -270,7 +270,7 @@ func TestPrepare(t *testing.T) { w := httptest.NewRecorder() handler := NewControllerRegister() - handler.Add("/json/list", &JsonController{}) + handler.Add("/json/list", &JSONController{}) handler.ServeHTTP(w, r) if w.Body.String() != `"prepare"` { t.Errorf(w.Body.String() + "user define func can't run") From 8615f875f82a40a66baf5cbcef3efcd8b5403a60 Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 8 Sep 2015 22:07:44 +0800 Subject: [PATCH 197/436] make golint happy staticfile.go --- staticfile.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/staticfile.go b/staticfile.go index 7c1ed98c..c85f17e0 100644 --- a/staticfile.go +++ b/staticfile.go @@ -40,15 +40,13 @@ func serverStaticRouter(ctx *context.Context) { if utils.FileExists(file) { http.ServeFile(ctx.ResponseWriter, ctx.Request, file) return - } else { - i++ - if i == len(StaticDir) { - http.NotFound(ctx.ResponseWriter, ctx.Request) - return - } else { - continue - } } + i++ + if i == len(StaticDir) { + http.NotFound(ctx.ResponseWriter, ctx.Request) + return + } + continue } if strings.HasPrefix(requestPath, prefix) { if len(requestPath) > len(prefix) && requestPath[len(prefix)] != '/' { From 44bd3beb5ed3eb270b7d832ac7a3411d3a8980e7 Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 8 Sep 2015 23:29:58 +0800 Subject: [PATCH 198/436] golint happy with template --- template.go | 32 ++++++++++++++------------------ template_test.go | 10 +++++----- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/template.go b/template.go index 9403c71f..6e196c0a 100644 --- a/template.go +++ b/template.go @@ -28,17 +28,14 @@ import ( ) var ( - beegoTplFuncMap template.FuncMap - // beego template caching map and supported template file extensions. - BeeTemplates map[string]*template.Template - BeeTemplateExt []string + beegoTplFuncMap = make(template.FuncMap) + // BeeTemplates caching map and supported template file extensions. + BeeTemplates = make(map[string]*template.Template) + // BeeTemplateExt stores the template extention which will build + BeeTemplateExt = []string{"tpl", "html"} ) func init() { - BeeTemplates = make(map[string]*template.Template) - beegoTplFuncMap = make(template.FuncMap) - BeeTemplateExt = make([]string, 0) - BeeTemplateExt = append(BeeTemplateExt, "tpl", "html") beegoTplFuncMap["dateformat"] = DateFormat beegoTplFuncMap["date"] = Date beegoTplFuncMap["compare"] = Compare @@ -79,7 +76,7 @@ type templatefile struct { files map[string][]string } -func (self *templatefile) visit(paths string, f os.FileInfo, err error) error { +func (tf *templatefile) visit(paths string, f os.FileInfo, err error) error { if f == nil { return err } @@ -92,21 +89,21 @@ func (self *templatefile) visit(paths string, f os.FileInfo, err error) error { replace := strings.NewReplacer("\\", "/") a := []byte(paths) - a = a[len([]byte(self.root)):] + a = a[len([]byte(tf.root)):] file := strings.TrimLeft(replace.Replace(string(a)), "/") subdir := filepath.Dir(file) - if _, ok := self.files[subdir]; ok { - self.files[subdir] = append(self.files[subdir], file) + if _, ok := tf.files[subdir]; ok { + tf.files[subdir] = append(tf.files[subdir], file) } else { m := make([]string, 1) m[0] = file - self.files[subdir] = m + tf.files[subdir] = m } return nil } -// return this path contains supported template extension of beego or not. +// HasTemplateExt return this path contains supported template extension of beego or not. func HasTemplateExt(paths string) bool { for _, v := range BeeTemplateExt { if strings.HasSuffix(paths, "."+v) { @@ -116,7 +113,7 @@ func HasTemplateExt(paths string) bool { return false } -// add new extension for template. +// AddTemplateExt add new extension for template. func AddTemplateExt(ext string) { for _, v := range BeeTemplateExt { if v == ext { @@ -126,15 +123,14 @@ func AddTemplateExt(ext string) { BeeTemplateExt = append(BeeTemplateExt, ext) } -// build all template files in a directory. +// BuildTemplate will build all template files in a directory. // it makes beego can render any template file in view directory. func BuildTemplate(dir string, files ...string) error { if _, err := os.Stat(dir); err != nil { if os.IsNotExist(err) { return nil - } else { - return errors.New("dir open err") } + return errors.New("dir open err") } self := &templatefile{ root: dir, diff --git a/template_test.go b/template_test.go index 79740f2b..2e222efc 100644 --- a/template_test.go +++ b/template_test.go @@ -20,11 +20,11 @@ import ( "testing" ) -var header string = `{{define "header"}} +var header = `{{define "header"}}

Hello, astaxie!

{{end}}` -var index string = ` +var index = ` beego welcome template @@ -37,7 +37,7 @@ var index string = ` ` -var block string = `{{define "block"}} +var block = `{{define "block"}}

Hello, blocks!

{{end}}` @@ -82,7 +82,7 @@ func TestTemplate(t *testing.T) { os.RemoveAll(dir) } -var menu string = `
+var menu = `
  • menu1
  • menu2
    • @@ -90,7 +90,7 @@ var menu string = `
` -var user string = ` +var user = ` beego welcome template From bcb1db256d2eba7a7ac082689e10f53bff24a53e Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 8 Sep 2015 23:41:41 +0800 Subject: [PATCH 199/436] golint templatefunc --- template.go | 4 ++-- templatefunc.go | 40 +++++++++++++++++++--------------------- templatefunc_test.go | 30 +++++++++++++++--------------- 3 files changed, 36 insertions(+), 38 deletions(-) diff --git a/template.go b/template.go index 6e196c0a..8822c514 100644 --- a/template.go +++ b/template.go @@ -43,13 +43,13 @@ func init() { beegoTplFuncMap["not_nil"] = NotNil beegoTplFuncMap["not_null"] = NotNil beegoTplFuncMap["substr"] = Substr - beegoTplFuncMap["html2str"] = Html2str + beegoTplFuncMap["html2str"] = HTML2str beegoTplFuncMap["str2html"] = Str2html beegoTplFuncMap["htmlquote"] = Htmlquote beegoTplFuncMap["htmlunquote"] = Htmlunquote beegoTplFuncMap["renderform"] = RenderForm beegoTplFuncMap["assets_js"] = AssetsJs - beegoTplFuncMap["assets_css"] = AssetsCss + beegoTplFuncMap["assets_css"] = AssetsCSS beegoTplFuncMap["config"] = Config beegoTplFuncMap["map_get"] = MapGet diff --git a/templatefunc.go b/templatefunc.go index 6b77fda3..62548659 100644 --- a/templatefunc.go +++ b/templatefunc.go @@ -44,8 +44,8 @@ func Substr(s string, start, length int) string { return string(bt[start:end]) } -// Html2str returns escaping text convert from html. -func Html2str(html string) string { +// HTML2str returns escaping text convert from html. +func HTML2str(html string) string { src := string(html) re, _ := regexp.Compile("\\<[\\S\\s]+?\\>") @@ -115,7 +115,7 @@ var datePatterns = []string{ "r", time.RFC1123Z, } -// Parse Date use PHP time format. +// DateParse Parse Date use PHP time format. func DateParse(dateString, format string) (time.Time, error) { replacer := strings.NewReplacer(datePatterns...) format = replacer.Replace(format) @@ -139,14 +139,17 @@ func Compare(a, b interface{}) (equal bool) { return } +// CompareNot !Compare func CompareNot(a, b interface{}) (equal bool) { return !Compare(a, b) } -func NotNil(a interface{}) (is_nil bool) { +// NotNil the same as CompareNot +func NotNil(a interface{}) (isNil bool) { return CompareNot(a, nil) } +// Config get the Appconfig func Config(returnType, key string, defaultVal interface{}) (value interface{}, err error) { switch returnType { case "String": @@ -162,12 +165,12 @@ func Config(returnType, key string, defaultVal interface{}) (value interface{}, case "DIY": value, err = AppConfig.DIY(key) default: - err = errors.New("Config keys must be of type String, Bool, Int, Int64, Float, or DIY!") + err = errors.New("Config keys must be of type String, Bool, Int, Int64, Float, or DIY") } if err != nil { if reflect.TypeOf(returnType) != reflect.TypeOf(defaultVal) { - err = errors.New("defaultVal type does not match returnType!") + err = errors.New("defaultVal type does not match returnType") } else { value, err = defaultVal, nil } @@ -184,7 +187,7 @@ func Config(returnType, key string, defaultVal interface{}) (value interface{}, return } -// Convert string to template.HTML type. +// Str2html Convert string to template.HTML type. func Str2html(raw string) template.HTML { return template.HTML(raw) } @@ -258,7 +261,7 @@ func URLFor(endpoint string, values ...interface{}) string { return BeeApp.Handlers.URLFor(endpoint, values...) } -// returns script tag with src string. +// AssetsJs returns script tag with src string. func AssetsJs(src string) template.HTML { text := string(src) @@ -267,8 +270,8 @@ func AssetsJs(src string) template.HTML { return template.HTML(text) } -// returns stylesheet link tag with src string. -func AssetsCss(src string) template.HTML { +// AssetsCSS returns stylesheet link tag with src string. +func AssetsCSS(src string) template.HTML { text := string(src) text = "" @@ -276,7 +279,7 @@ func AssetsCss(src string) template.HTML { return template.HTML(text) } -// parse form values to struct via tag. +// ParseForm will parse form values to struct via tag. func ParseForm(form url.Values, obj interface{}) error { objT := reflect.TypeOf(obj) objV := reflect.ValueOf(obj) @@ -398,7 +401,7 @@ var unKind = map[reflect.Kind]bool{ reflect.UnsafePointer: true, } -// render object to form html. +// RenderForm will render object to form html. // obj must be a struct pointer. func RenderForm(obj interface{}) template.HTML { objT := reflect.TypeOf(obj) @@ -651,9 +654,7 @@ func ge(arg1, arg2 interface{}) (bool, error) { return !lessThan, nil } -// go1.2 added template funcs. end - -// getting value from map by keys +// MapGet getting value from map by keys // usage: // Data["m"] = map[string]interface{} { // "a": 1, @@ -719,14 +720,11 @@ func MapGet(arg1 interface{}, arg2 ...interface{}) (interface{}, error) { // if there is more keys, handle this recursively if len(arg2) > 1 { return MapGet(result, arg2[1:]...) - } else { - return result, nil } - } else { - return nil, nil + return result, nil } - - } else { return nil, nil + } + return nil, nil } diff --git a/templatefunc_test.go b/templatefunc_test.go index cc467d95..98fbf7ab 100644 --- a/templatefunc_test.go +++ b/templatefunc_test.go @@ -40,7 +40,7 @@ func TestHtml2str(t *testing.T) { \n` - if Html2str(h) != "123\\n\n\\n" { + if HTML2str(h) != "123\\n\n\\n" { t.Error("should be equal") } } @@ -82,15 +82,15 @@ func TestCompareRelated(t *testing.T) { if !Compare("1", 1) { t.Error("should be equal") } - if CompareNot("abc", "abc") { - t.Error("should be equal") - } - if !CompareNot("abc", "aBc") { - t.Error("should be not equal") - } - if !NotNil("a string") { - t.Error("should not be nil") - } + if CompareNot("abc", "abc") { + t.Error("should be equal") + } + if !CompareNot("abc", "aBc") { + t.Error("should be not equal") + } + if !NotNil("a string") { + t.Error("should not be nil") + } } func TestHtmlquote(t *testing.T) { @@ -111,7 +111,7 @@ func TestHtmlunquote(t *testing.T) { func TestParseForm(t *testing.T) { type user struct { - Id int `form:"-"` + ID int `form:"-"` tag string `form:"tag"` Name interface{} `form:"username"` Age int `form:"age,text"` @@ -123,7 +123,7 @@ func TestParseForm(t *testing.T) { u := user{} form := url.Values{ - "Id": []string{"1"}, + "ID": []string{"1"}, "-": []string{"1"}, "tag": []string{"no"}, "username": []string{"test"}, @@ -139,8 +139,8 @@ func TestParseForm(t *testing.T) { if err := ParseForm(form, &u); err != nil { t.Fatal(err) } - if u.Id != 0 { - t.Errorf("Id should equal 0 but got %v", u.Id) + if u.ID != 0 { + t.Errorf("ID should equal 0 but got %v", u.ID) } if len(u.tag) != 0 { t.Errorf("tag's length should equal 0 but got %v", len(u.tag)) @@ -168,7 +168,7 @@ func TestParseForm(t *testing.T) { func TestRenderForm(t *testing.T) { type user struct { - Id int `form:"-"` + ID int `form:"-"` tag string `form:"tag"` Name interface{} `form:"username"` Age int `form:"age,text,年龄："` From 62e528ca4c996d25401c2754a2b6c84d45c7c18d Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 8 Sep 2015 23:49:24 +0800 Subject: [PATCH 200/436] golint tree.go --- tree.go | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/tree.go b/tree.go index e0d9c1c2..1902d331 100644 --- a/tree.go +++ b/tree.go @@ -22,6 +22,10 @@ import ( "github.com/astaxie/beego/utils" ) +// Tree has three elements: FixRouter/wildcard/leaves +// fixRouter sotres Fixed Router +// wildcard stores params +// leaves store the endpoint information type Tree struct { //search fix route first fixrouters map[string]*Tree @@ -33,13 +37,14 @@ type Tree struct { leaves []*leafInfo } +// NewTree return a new Tree func NewTree() *Tree { return &Tree{ fixrouters: make(map[string]*Tree), } } -// add Tree to the exist Tree +// AddTree will add tree to the exist Tree // prefix should has no params func (t *Tree) AddTree(prefix string, tree *Tree) { t.addtree(splitPath(prefix), tree, nil, "") @@ -187,7 +192,7 @@ func filterTreeWithPrefix(t *Tree, wildcards []string, reg string) { } } -// call addseg function +// AddRouter call addseg function func (t *Tree) AddRouter(pattern string, runObject interface{}) { t.addseg(splitPath(pattern), runObject, nil, "") } @@ -266,7 +271,7 @@ func (t *Tree) addseg(segments []string, route interface{}, wildcards []string, } } -// match router to runObject & params +// Match router to runObject & params func (t *Tree) Match(pattern string) (runObject interface{}, params map[string]string) { if len(pattern) == 0 || pattern[0] != '/' { return nil, nil @@ -349,7 +354,7 @@ func (leaf *leafInfo) match(wildcardValues []string) (ok bool, params map[string continue } params[v] = "" - j += 1 + j++ } return true, params } @@ -402,7 +407,7 @@ func (leaf *leafInfo) match(wildcardValues []string) (ok bool, params map[string return false, nil } params[v] = wildcardValues[j] - j += 1 + j++ } if len(params) != len(wildcardValues) { return false, nil @@ -453,9 +458,8 @@ func splitSegment(key string) (bool, []string, string) { if strings.HasPrefix(key, "*") { if key == "*.*" { return true, []string{".", ":path", ":ext"}, "" - } else { - return true, []string{":splat"}, "" } + return true, []string{":splat"}, "" } if strings.ContainsAny(key, ":") { var paramsNum int @@ -469,7 +473,7 @@ func splitSegment(key string) (bool, []string, string) { reg := regexp.MustCompile(`[a-zA-Z0-9_]+`) for i, v := range key { if skipnum > 0 { - skipnum -= 1 + skipnum-- continue } if start { @@ -483,7 +487,7 @@ func splitSegment(key string) (bool, []string, string) { startexp = false skipnum = 3 param = make([]rune, 0) - paramsNum += 1 + paramsNum++ continue } } @@ -491,7 +495,7 @@ func splitSegment(key string) (bool, []string, string) { if key[i+1:i+7] == "string" { out = append(out, []rune(`([\w]+)`)...) params = append(params, ":"+string(param)) - paramsNum += 1 + paramsNum++ start = false startexp = false skipnum = 6 @@ -509,7 +513,7 @@ func splitSegment(key string) (bool, []string, string) { out = append(out, []rune(`(.+)`)...) params = append(params, ":"+string(param)) param = make([]rune, 0) - paramsNum += 1 + paramsNum++ start = false startexp = false } @@ -527,7 +531,7 @@ func splitSegment(key string) (bool, []string, string) { startexp = true start = false params = append(params, ":"+string(param)) - paramsNum += 1 + paramsNum++ expt = make([]rune, 0) expt = append(expt, '(') } else if v == ')' { @@ -548,7 +552,6 @@ func splitSegment(key string) (bool, []string, string) { params = append(params, ":"+string(param)) } return true, params, string(out) - } else { - return false, nil, "" } + return false, nil, "" } From d7aaf2ebeb4775cf2d2b6d0323fe100acf52d52a Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 9 Sep 2015 00:15:03 +0800 Subject: [PATCH 201/436] golint cache package --- cache/cache.go | 3 +- cache/conv.go | 12 ++++---- cache/conv_test.go | 14 ++++----- cache/file.go | 45 +++++++++++++++-------------- cache/memcache/memcache.go | 59 +++++++++++++++++++------------------- cache/memory.go | 26 ++++++++--------- cache/redis/redis.go | 52 ++++++++++++++++----------------- 7 files changed, 106 insertions(+), 105 deletions(-) diff --git a/cache/cache.go b/cache/cache.go index 7ca87802..6413e210 100644 --- a/cache/cache.go +++ b/cache/cache.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +// Package cache provide a Cache interface and some implemetn engine // Usage: // // import( @@ -80,7 +81,7 @@ func Register(name string, adapter Cache) { adapters[name] = adapter } -// Create a new cache driver by adapter name and config string. +// NewCache Create a new cache driver by adapter name and config string. // config need to be correct JSON as string: {"interval":360}. // it will start gc automatically. func NewCache(adapterName, config string) (adapter Cache, err error) { diff --git a/cache/conv.go b/cache/conv.go index 724abfd2..16ef1106 100644 --- a/cache/conv.go +++ b/cache/conv.go @@ -19,7 +19,7 @@ import ( "strconv" ) -// convert interface to string. +// GetString convert interface to string. func GetString(v interface{}) string { switch result := v.(type) { case string: @@ -34,7 +34,7 @@ func GetString(v interface{}) string { return "" } -// convert interface to int. +// GetInt convert interface to int. func GetInt(v interface{}) int { switch result := v.(type) { case int: @@ -52,7 +52,7 @@ func GetInt(v interface{}) int { return 0 } -// convert interface to int64. +// GetInt64 convert interface to int64. func GetInt64(v interface{}) int64 { switch result := v.(type) { case int: @@ -71,7 +71,7 @@ func GetInt64(v interface{}) int64 { return 0 } -// convert interface to float64. +// GetFloat64 convert interface to float64. func GetFloat64(v interface{}) float64 { switch result := v.(type) { case float64: @@ -85,7 +85,7 @@ func GetFloat64(v interface{}) float64 { return 0 } -// convert interface to bool. +// GetBool convert interface to bool. func GetBool(v interface{}) bool { switch result := v.(type) { case bool: @@ -99,7 +99,7 @@ func GetBool(v interface{}) bool { return false } -// convert interface to byte slice. +// getByteArray convert interface to byte slice. func getByteArray(v interface{}) []byte { switch result := v.(type) { case []byte: diff --git a/cache/conv_test.go b/cache/conv_test.go index 267bb0c9..c87ffe84 100644 --- a/cache/conv_test.go +++ b/cache/conv_test.go @@ -27,7 +27,7 @@ func TestGetString(t *testing.T) { if "test2" != GetString(t2) { t.Error("get string from byte array error") } - var t3 int = 1 + var t3 = 1 if "1" != GetString(t3) { t.Error("get string from int error") } @@ -35,7 +35,7 @@ func TestGetString(t *testing.T) { if "1" != GetString(t4) { t.Error("get string from int64 error") } - var t5 float64 = 1.1 + var t5 = 1.1 if "1.1" != GetString(t5) { t.Error("get string from float64 error") } @@ -46,7 +46,7 @@ func TestGetString(t *testing.T) { } func TestGetInt(t *testing.T) { - var t1 int = 1 + var t1 = 1 if 1 != GetInt(t1) { t.Error("get int from int error") } @@ -69,7 +69,7 @@ func TestGetInt(t *testing.T) { func TestGetInt64(t *testing.T) { var i int64 = 1 - var t1 int = 1 + var t1 = 1 if i != GetInt64(t1) { t.Error("get int64 from int error") } @@ -91,12 +91,12 @@ func TestGetInt64(t *testing.T) { } func TestGetFloat64(t *testing.T) { - var f float64 = 1.11 + var f = 1.11 var t1 float32 = 1.11 if f != GetFloat64(t1) { t.Error("get float64 from float32 error") } - var t2 float64 = 1.11 + var t2 = 1.11 if f != GetFloat64(t2) { t.Error("get float64 from float64 error") } @@ -106,7 +106,7 @@ func TestGetFloat64(t *testing.T) { } var f2 float64 = 1 - var t4 int = 1 + var t4 = 1 if f2 != GetFloat64(t4) { t.Error("get float64 from int error") } diff --git a/cache/file.go b/cache/file.go index 65f114f3..9233a852 100644 --- a/cache/file.go +++ b/cache/file.go @@ -41,11 +41,12 @@ type FileCacheItem struct { Expired int64 } +// FileCache Config var ( - FileCachePath string = "cache" // cache directory - FileCacheFileSuffix string = ".bin" // cache file suffix - FileCacheDirectoryLevel int = 2 // cache file deep level if auto generated cache files. - FileCacheEmbedExpiry int64 = 0 // cache expire time, default is no expire forever. + FileCachePath = "cache" // cache directory + FileCacheFileSuffix = ".bin" // cache file suffix + FileCacheDirectoryLevel = 2 // cache file deep level if auto generated cache files. + FileCacheEmbedExpiry int64 // cache expire time, default is no expire forever. ) // FileCache is cache adapter for file storage. @@ -56,14 +57,14 @@ type FileCache struct { EmbedExpiry int } -// Create new file cache with no config. +// NewFileCache Create new file cache with no config. // the level and expiry need set in method StartAndGC as config string. func NewFileCache() *FileCache { // return &FileCache{CachePath:FileCachePath, FileSuffix:FileCacheFileSuffix} return &FileCache{} } -// Start and begin gc for file cache. +// StartAndGC will start and begin gc for file cache. // the config need to be like {CachePath:"/cache","FileSuffix":".bin","DirectoryLevel":2,"EmbedExpiry":0} func (fc *FileCache) StartAndGC(config string) error { @@ -120,12 +121,12 @@ func (fc *FileCache) getCacheFileName(key string) string { // Get value from file cache. // if non-exist or expired, return empty string. func (fc *FileCache) Get(key string) interface{} { - fileData, err := File_get_contents(fc.getCacheFileName(key)) + fileData, err := FileGetContents(fc.getCacheFileName(key)) if err != nil { return "" } var to FileCacheItem - Gob_decode(fileData, &to) + GobDecode(fileData, &to) if to.Expired < time.Now().Unix() { return "" } @@ -155,11 +156,11 @@ func (fc *FileCache) Put(key string, val interface{}, timeout int64) error { item.Expired = time.Now().Unix() + timeout } item.Lastaccess = time.Now().Unix() - data, err := Gob_encode(item) + data, err := GobEncode(item) if err != nil { return err } - return File_put_contents(fc.getCacheFileName(key), data) + return FilePutContents(fc.getCacheFileName(key), data) } // Delete file cache value. @@ -171,7 +172,7 @@ func (fc *FileCache) Delete(key string) error { return nil } -// Increase cached int value. +// Incr will increase cached int value. // fc value is saving forever unless Delete. func (fc *FileCache) Incr(key string) error { data := fc.Get(key) @@ -185,7 +186,7 @@ func (fc *FileCache) Incr(key string) error { return nil } -// Decrease cached int value. +// Decr will decrease cached int value. func (fc *FileCache) Decr(key string) error { data := fc.Get(key) var decr int @@ -198,13 +199,13 @@ func (fc *FileCache) Decr(key string) error { return nil } -// Check value is exist. +// IsExist check value is exist. func (fc *FileCache) IsExist(key string) bool { ret, _ := exists(fc.getCacheFileName(key)) return ret } -// Clean cached files. +// ClearAll will clean cached files. // not implemented. func (fc *FileCache) ClearAll() error { return nil @@ -222,9 +223,9 @@ func exists(path string) (bool, error) { return false, err } -// Get bytes to file. +// FileGetContents Get bytes to file. // if non-exist, create this file. -func File_get_contents(filename string) (data []byte, e error) { +func FileGetContents(filename string) (data []byte, e error) { f, e := os.OpenFile(filename, os.O_RDWR|os.O_CREATE, os.ModePerm) if e != nil { return @@ -242,9 +243,9 @@ func File_get_contents(filename string) (data []byte, e error) { return } -// Put bytes to file. +// FilePutContents Put bytes to file. // if non-exist, create this file. -func File_put_contents(filename string, content []byte) error { +func FilePutContents(filename string, content []byte) error { fp, err := os.OpenFile(filename, os.O_RDWR|os.O_CREATE, os.ModePerm) if err != nil { return err @@ -254,8 +255,8 @@ func File_put_contents(filename string, content []byte) error { return err } -// Gob encodes file cache item. -func Gob_encode(data interface{}) ([]byte, error) { +// GobEncode Gob encodes file cache item. +func GobEncode(data interface{}) ([]byte, error) { buf := bytes.NewBuffer(nil) enc := gob.NewEncoder(buf) err := enc.Encode(data) @@ -265,8 +266,8 @@ func Gob_encode(data interface{}) ([]byte, error) { return buf.Bytes(), err } -// Gob decodes file cache item. -func Gob_decode(data []byte, to *FileCacheItem) error { +// GobDecode Gob decodes file cache item. +func GobDecode(data []byte, to *FileCacheItem) error { buf := bytes.NewBuffer(data) dec := gob.NewDecoder(buf) return dec.Decode(&to) diff --git a/cache/memcache/memcache.go b/cache/memcache/memcache.go index c6829054..643fb130 100644 --- a/cache/memcache/memcache.go +++ b/cache/memcache/memcache.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// package memcahe for cache provider +// Package memcache for cache provider // // depend on github.com/bradfitz/gomemcache/memcache // @@ -39,19 +39,19 @@ import ( "github.com/astaxie/beego/cache" ) -// Memcache adapter. -type MemcacheCache struct { +// Cache Memcache adapter. +type Cache struct { conn *memcache.Client conninfo []string } -// create new memcache adapter. -func NewMemCache() *MemcacheCache { - return &MemcacheCache{} +// NewMemCache create new memcache adapter. +func NewMemCache() *Cache { + return &Cache{} } -// get value from memcache. -func (rc *MemcacheCache) Get(key string) interface{} { +// Get get value from memcache. +func (rc *Cache) Get(key string) interface{} { if rc.conn == nil { if err := rc.connectInit(); err != nil { return err @@ -63,8 +63,8 @@ func (rc *MemcacheCache) Get(key string) interface{} { return nil } -// get value from memcache. -func (rc *MemcacheCache) GetMulti(keys []string) []interface{} { +// GetMulti get value from memcache. +func (rc *Cache) GetMulti(keys []string) []interface{} { size := len(keys) var rv []interface{} if rc.conn == nil { @@ -81,16 +81,15 @@ func (rc *MemcacheCache) GetMulti(keys []string) []interface{} { rv = append(rv, string(v.Value)) } return rv - } else { - for i := 0; i < size; i++ { - rv = append(rv, err) - } - return rv } + for i := 0; i < size; i++ { + rv = append(rv, err) + } + return rv } -// put value to memcache. only support string. -func (rc *MemcacheCache) Put(key string, val interface{}, timeout int64) error { +// Put put value to memcache. only support string. +func (rc *Cache) Put(key string, val interface{}, timeout int64) error { if rc.conn == nil { if err := rc.connectInit(); err != nil { return err @@ -104,8 +103,8 @@ func (rc *MemcacheCache) Put(key string, val interface{}, timeout int64) error { return rc.conn.Set(&item) } -// delete value in memcache. -func (rc *MemcacheCache) Delete(key string) error { +// Delete delete value in memcache. +func (rc *Cache) Delete(key string) error { if rc.conn == nil { if err := rc.connectInit(); err != nil { return err @@ -114,8 +113,8 @@ func (rc *MemcacheCache) Delete(key string) error { return rc.conn.Delete(key) } -// increase counter. -func (rc *MemcacheCache) Incr(key string) error { +// Incr increase counter. +func (rc *Cache) Incr(key string) error { if rc.conn == nil { if err := rc.connectInit(); err != nil { return err @@ -125,8 +124,8 @@ func (rc *MemcacheCache) Incr(key string) error { return err } -// decrease counter. -func (rc *MemcacheCache) Decr(key string) error { +// Decr decrease counter. +func (rc *Cache) Decr(key string) error { if rc.conn == nil { if err := rc.connectInit(); err != nil { return err @@ -136,8 +135,8 @@ func (rc *MemcacheCache) Decr(key string) error { return err } -// check value exists in memcache. -func (rc *MemcacheCache) IsExist(key string) bool { +// IsExist check value exists in memcache. +func (rc *Cache) IsExist(key string) bool { if rc.conn == nil { if err := rc.connectInit(); err != nil { return false @@ -150,8 +149,8 @@ func (rc *MemcacheCache) IsExist(key string) bool { return true } -// clear all cached in memcache. -func (rc *MemcacheCache) ClearAll() error { +// ClearAll clear all cached in memcache. +func (rc *Cache) ClearAll() error { if rc.conn == nil { if err := rc.connectInit(); err != nil { return err @@ -160,10 +159,10 @@ func (rc *MemcacheCache) ClearAll() error { return rc.conn.FlushAll() } -// start memcache adapter. +// StartAndGC start memcache adapter. // config string is like {"conn":"connection info"}. // if connecting error, return. -func (rc *MemcacheCache) StartAndGC(config string) error { +func (rc *Cache) StartAndGC(config string) error { var cf map[string]string json.Unmarshal([]byte(config), &cf) if _, ok := cf["conn"]; !ok { @@ -179,7 +178,7 @@ func (rc *MemcacheCache) StartAndGC(config string) error { } // connect to memcache and keep the connection. -func (rc *MemcacheCache) connectInit() error { +func (rc *Cache) connectInit() error { rc.conn = memcache.New(rc.conninfo...) return nil } diff --git a/cache/memory.go b/cache/memory.go index b6657048..ce1afa5f 100644 --- a/cache/memory.go +++ b/cache/memory.go @@ -23,18 +23,18 @@ import ( ) var ( - // clock time of recycling the expired cache items in memory. - DefaultEvery int = 60 // 1 minute + // DefaultEvery means the clock time of recycling the expired cache items in memory. + DefaultEvery = 60 // 1 minute ) -// Memory cache item. +// MemoryItem store enery cache item. type MemoryItem struct { val interface{} Lastaccess time.Time expired int64 } -// Memory cache adapter. +// MemoryCache is Memory cache adapter. // it contains a RW locker for safe map storage. type MemoryCache struct { lock sync.RWMutex @@ -87,7 +87,7 @@ func (bc *MemoryCache) Put(name string, value interface{}, expired int64) error return nil } -/// Delete cache in memory. +// Delete cache in memory. func (bc *MemoryCache) Delete(name string) error { bc.lock.Lock() defer bc.lock.Unlock() @@ -101,7 +101,7 @@ func (bc *MemoryCache) Delete(name string) error { return nil } -// Increase cache counter in memory. +// Incr increase cache counter in memory. // it supports int,int64,int32,uint,uint64,uint32. func (bc *MemoryCache) Incr(key string) error { bc.lock.RLock() @@ -129,7 +129,7 @@ func (bc *MemoryCache) Incr(key string) error { return nil } -// Decrease counter in memory. +// Decr decrease counter in memory. func (bc *MemoryCache) Decr(key string) error { bc.lock.RLock() defer bc.lock.RUnlock() @@ -168,7 +168,7 @@ func (bc *MemoryCache) Decr(key string) error { return nil } -// check cache exist in memory. +// IsExist check cache exist in memory. func (bc *MemoryCache) IsExist(name string) bool { bc.lock.RLock() defer bc.lock.RUnlock() @@ -176,7 +176,7 @@ func (bc *MemoryCache) IsExist(name string) bool { return ok } -// delete all cache in memory. +// ClearAll will delete all cache in memory. func (bc *MemoryCache) ClearAll() error { bc.lock.Lock() defer bc.lock.Unlock() @@ -184,7 +184,7 @@ func (bc *MemoryCache) ClearAll() error { return nil } -// start memory cache. it will check expiration in every clock time. +// StartAndGC start memory cache. it will check expiration in every clock time. func (bc *MemoryCache) StartAndGC(config string) error { var cf map[string]int json.Unmarshal([]byte(config), &cf) @@ -213,13 +213,13 @@ func (bc *MemoryCache) vaccuum() { return } for name := range bc.items { - bc.item_expired(name) + bc.itemExpired(name) } } } -// item_expired returns true if an item is expired. -func (bc *MemoryCache) item_expired(name string) bool { +// itemExpired returns true if an item is expired. +func (bc *MemoryCache) itemExpired(name string) bool { bc.lock.Lock() defer bc.lock.Unlock() itm, ok := bc.items[name] diff --git a/cache/redis/redis.go b/cache/redis/redis.go index d14b1ada..ed12cf26 100644 --- a/cache/redis/redis.go +++ b/cache/redis/redis.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// package redis for cache provider +// Package redis for cache provider // // depend on github.com/garyburd/redigo/redis // @@ -41,12 +41,12 @@ import ( ) var ( - // the collection name of redis for cache adapter. - DefaultKey string = "beecacheRedis" + // DefaultKey the collection name of redis for cache adapter. + DefaultKey = "beecacheRedis" ) -// Redis cache adapter. -type RedisCache struct { +// Cache is Redis cache adapter. +type Cache struct { p *redis.Pool // redis connection pool conninfo string dbNum int @@ -54,13 +54,13 @@ type RedisCache struct { password string } -// create new redis cache with default collection name. -func NewRedisCache() *RedisCache { - return &RedisCache{key: DefaultKey} +// NewRedisCache create new redis cache with default collection name. +func NewRedisCache() *Cache { + return &Cache{key: DefaultKey} } // actually do the redis cmds -func (rc *RedisCache) do(commandName string, args ...interface{}) (reply interface{}, err error) { +func (rc *Cache) do(commandName string, args ...interface{}) (reply interface{}, err error) { c := rc.p.Get() defer c.Close() @@ -68,7 +68,7 @@ func (rc *RedisCache) do(commandName string, args ...interface{}) (reply interfa } // Get cache from redis. -func (rc *RedisCache) Get(key string) interface{} { +func (rc *Cache) Get(key string) interface{} { if v, err := rc.do("GET", key); err == nil { return v } @@ -76,7 +76,7 @@ func (rc *RedisCache) Get(key string) interface{} { } // GetMulti get cache from redis. -func (rc *RedisCache) GetMulti(keys []string) []interface{} { +func (rc *Cache) GetMulti(keys []string) []interface{} { size := len(keys) var rv []interface{} c := rc.p.Get() @@ -108,8 +108,8 @@ ERROR: return rv } -// put cache to redis. -func (rc *RedisCache) Put(key string, val interface{}, timeout int64) error { +// Put put cache to redis. +func (rc *Cache) Put(key string, val interface{}, timeout int64) error { var err error if _, err = rc.do("SETEX", key, timeout, val); err != nil { return err @@ -121,8 +121,8 @@ func (rc *RedisCache) Put(key string, val interface{}, timeout int64) error { return err } -// delete cache in redis. -func (rc *RedisCache) Delete(key string) error { +// Delete delete cache in redis. +func (rc *Cache) Delete(key string) error { var err error if _, err = rc.do("DEL", key); err != nil { return err @@ -131,8 +131,8 @@ func (rc *RedisCache) Delete(key string) error { return err } -// check cache's existence in redis. -func (rc *RedisCache) IsExist(key string) bool { +// IsExist check cache's existence in redis. +func (rc *Cache) IsExist(key string) bool { v, err := redis.Bool(rc.do("EXISTS", key)) if err != nil { return false @@ -145,20 +145,20 @@ func (rc *RedisCache) IsExist(key string) bool { return v } -// increase counter in redis. -func (rc *RedisCache) Incr(key string) error { +// Incr increase counter in redis. +func (rc *Cache) Incr(key string) error { _, err := redis.Bool(rc.do("INCRBY", key, 1)) return err } -// decrease counter in redis. -func (rc *RedisCache) Decr(key string) error { +// Decr decrease counter in redis. +func (rc *Cache) Decr(key string) error { _, err := redis.Bool(rc.do("INCRBY", key, -1)) return err } -// clean all cache in redis. delete this redis collection. -func (rc *RedisCache) ClearAll() error { +// ClearAll clean all cache in redis. delete this redis collection. +func (rc *Cache) ClearAll() error { cachedKeys, err := redis.Strings(rc.do("HKEYS", rc.key)) if err != nil { return err @@ -172,11 +172,11 @@ func (rc *RedisCache) ClearAll() error { return err } -// start redis cache adapter. +// StartAndGC start redis cache adapter. // config is like {"key":"collection key","conn":"connection info","dbNum":"0"} // the cache item in redis are stored forever, // so no gc operation. -func (rc *RedisCache) StartAndGC(config string) error { +func (rc *Cache) StartAndGC(config string) error { var cf map[string]string json.Unmarshal([]byte(config), &cf) @@ -206,7 +206,7 @@ func (rc *RedisCache) StartAndGC(config string) error { } // connect to redis. -func (rc *RedisCache) connectInit() { +func (rc *Cache) connectInit() { dialFunc := func() (c redis.Conn, err error) { c, err = redis.Dial("tcp", rc.conninfo) if err != nil { From bdd6a6ae40bf5ad0ea25fa1d4d08a5802ac3b54a Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 10 Sep 2015 14:53:19 +0800 Subject: [PATCH 202/436] golint config --- config/config.go | 19 ++++----- config/fake.go | 41 +++++++++---------- config/ini.go | 82 +++++++++++++++++++------------------- config/json.go | 50 +++++++++++------------ config/xml/xml.go | 95 ++++++++++++++++++++++---------------------- config/yaml/yaml.go | 97 +++++++++++++++++++++++---------------------- 6 files changed, 194 insertions(+), 190 deletions(-) diff --git a/config/config.go b/config/config.go index d0eca747..d0236003 100644 --- a/config/config.go +++ b/config/config.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +// Package config is used to parse config // Usage: // import( // "github.com/astaxie/beego/config" @@ -45,8 +46,8 @@ import ( "fmt" ) -// ConfigContainer defines how to get and set value from configuration raw data. -type ConfigContainer interface { +// Configer defines how to get and set value from configuration raw data. +type Configer interface { Set(key, val string) error // support section::key type in given key when using ini type. String(key string) string // support section::key type in key string when using ini and json type; Int,Int64,Bool,Float,DIY are same. Strings(key string) []string //get string slice @@ -65,10 +66,10 @@ type ConfigContainer interface { SaveConfigFile(filename string) error } -// Config is the adapter interface for parsing config file to get raw data to ConfigContainer. +// Config is the adapter interface for parsing config file to get raw data to Configer. type Config interface { - Parse(key string) (ConfigContainer, error) - ParseData(data []byte) (ConfigContainer, error) + Parse(key string) (Configer, error) + ParseData(data []byte) (Configer, error) } var adapters = make(map[string]Config) @@ -86,9 +87,9 @@ func Register(name string, adapter Config) { adapters[name] = adapter } -// adapterName is ini/json/xml/yaml. +// NewConfig adapterName is ini/json/xml/yaml. // filename is the config file path. -func NewConfig(adapterName, filename string) (ConfigContainer, error) { +func NewConfig(adapterName, filename string) (Configer, error) { adapter, ok := adapters[adapterName] if !ok { return nil, fmt.Errorf("config: unknown adaptername %q (forgotten import?)", adapterName) @@ -96,9 +97,9 @@ func NewConfig(adapterName, filename string) (ConfigContainer, error) { return adapter.Parse(filename) } -// adapterName is ini/json/xml/yaml. +// NewConfigData adapterName is ini/json/xml/yaml. // data is the config data. -func NewConfigData(adapterName string, data []byte) (ConfigContainer, error) { +func NewConfigData(adapterName string, data []byte) (Configer, error) { adapter, ok := adapters[adapterName] if !ok { return nil, fmt.Errorf("config: unknown adaptername %q (forgotten import?)", adapterName) diff --git a/config/fake.go b/config/fake.go index 54588e5e..50aa5d4a 100644 --- a/config/fake.go +++ b/config/fake.go @@ -38,11 +38,11 @@ func (c *fakeConfigContainer) String(key string) string { } func (c *fakeConfigContainer) DefaultString(key string, defaultval string) string { - if v := c.getData(key); v == "" { + v := c.getData(key) + if v == "" { return defaultval - } else { - return v } + return v } func (c *fakeConfigContainer) Strings(key string) []string { @@ -50,11 +50,11 @@ func (c *fakeConfigContainer) Strings(key string) []string { } func (c *fakeConfigContainer) DefaultStrings(key string, defaultval []string) []string { - if v := c.Strings(key); len(v) == 0 { + v := c.Strings(key) + if len(v) == 0 { return defaultval - } else { - return v } + return v } func (c *fakeConfigContainer) Int(key string) (int, error) { @@ -62,11 +62,11 @@ func (c *fakeConfigContainer) Int(key string) (int, error) { } func (c *fakeConfigContainer) DefaultInt(key string, defaultval int) int { - if v, err := c.Int(key); err != nil { + v, err := c.Int(key) + if err != nil { return defaultval - } else { - return v } + return v } func (c *fakeConfigContainer) Int64(key string) (int64, error) { @@ -74,11 +74,11 @@ func (c *fakeConfigContainer) Int64(key string) (int64, error) { } func (c *fakeConfigContainer) DefaultInt64(key string, defaultval int64) int64 { - if v, err := c.Int64(key); err != nil { + v, err := c.Int64(key) + if err != nil { return defaultval - } else { - return v } + return v } func (c *fakeConfigContainer) Bool(key string) (bool, error) { @@ -86,11 +86,11 @@ func (c *fakeConfigContainer) Bool(key string) (bool, error) { } func (c *fakeConfigContainer) DefaultBool(key string, defaultval bool) bool { - if v, err := c.Bool(key); err != nil { + v, err := c.Bool(key) + if err != nil { return defaultval - } else { - return v } + return v } func (c *fakeConfigContainer) Float(key string) (float64, error) { @@ -98,11 +98,11 @@ func (c *fakeConfigContainer) Float(key string) (float64, error) { } func (c *fakeConfigContainer) DefaultFloat(key string, defaultval float64) float64 { - if v, err := c.Float(key); err != nil { + v, err := c.Float(key) + if err != nil { return defaultval - } else { - return v } + return v } func (c *fakeConfigContainer) DIY(key string) (interface{}, error) { @@ -120,9 +120,10 @@ func (c *fakeConfigContainer) SaveConfigFile(filename string) error { return errors.New("not implement in the fakeConfigContainer") } -var _ ConfigContainer = new(fakeConfigContainer) +var _ Configer = new(fakeConfigContainer) -func NewFakeConfig() ConfigContainer { +// NewFakeConfig return a fake Congiger +func NewFakeConfig() Configer { return &fakeConfigContainer{ data: make(map[string]string), } diff --git a/config/ini.go b/config/ini.go index 31fe9b5f..59e84e1e 100644 --- a/config/ini.go +++ b/config/ini.go @@ -31,23 +31,23 @@ import ( ) var ( - DEFAULT_SECTION = "default" // default section means if some ini items not in a section, make them in default section, - bNumComment = []byte{'#'} // number signal - bSemComment = []byte{';'} // semicolon signal - bEmpty = []byte{} - bEqual = []byte{'='} // equal signal - bDQuote = []byte{'"'} // quote signal - sectionStart = []byte{'['} // section start signal - sectionEnd = []byte{']'} // section end signal - lineBreak = "\n" + defaultSection = "default" // default section means if some ini items not in a section, make them in default section, + bNumComment = []byte{'#'} // number signal + bSemComment = []byte{';'} // semicolon signal + bEmpty = []byte{} + bEqual = []byte{'='} // equal signal + bDQuote = []byte{'"'} // quote signal + sectionStart = []byte{'['} // section start signal + sectionEnd = []byte{']'} // section end signal + lineBreak = "\n" ) // IniConfig implements Config to parse ini file. type IniConfig struct { } -// ParseFile creates a new Config and parses the file configuration from the named file. -func (ini *IniConfig) Parse(name string) (ConfigContainer, error) { +// Parse creates a new Config and parses the file configuration from the named file. +func (ini *IniConfig) Parse(name string) (Configer, error) { return ini.parseFile(name) } @@ -77,7 +77,7 @@ func (ini *IniConfig) parseFile(name string) (*IniConfigContainer, error) { buf.ReadByte() } } - section := DEFAULT_SECTION + section := defaultSection for { line, _, err := buf.ReadLine() if err == io.EOF { @@ -171,7 +171,8 @@ func (ini *IniConfig) parseFile(name string) (*IniConfigContainer, error) { return cfg, nil } -func (ini *IniConfig) ParseData(data []byte) (ConfigContainer, error) { +// ParseData parse ini the data +func (ini *IniConfig) ParseData(data []byte) (Configer, error) { // Save memory data to temporary file tmpName := path.Join(os.TempDir(), "beego", fmt.Sprintf("%d", time.Now().Nanosecond())) os.MkdirAll(path.Dir(tmpName), os.ModePerm) @@ -181,7 +182,7 @@ func (ini *IniConfig) ParseData(data []byte) (ConfigContainer, error) { return ini.Parse(tmpName) } -// A Config represents the ini configuration. +// IniConfigContainer A Config represents the ini configuration. // When set and get value, support key as section:name type. type IniConfigContainer struct { filename string @@ -199,11 +200,11 @@ func (c *IniConfigContainer) Bool(key string) (bool, error) { // DefaultBool returns the boolean value for a given key. // if err != nil return defaltval func (c *IniConfigContainer) DefaultBool(key string, defaultval bool) bool { - if v, err := c.Bool(key); err != nil { + v, err := c.Bool(key) + if err != nil { return defaultval - } else { - return v } + return v } // Int returns the integer value for a given key. @@ -214,11 +215,11 @@ func (c *IniConfigContainer) Int(key string) (int, error) { // DefaultInt returns the integer value for a given key. // if err != nil return defaltval func (c *IniConfigContainer) DefaultInt(key string, defaultval int) int { - if v, err := c.Int(key); err != nil { + v, err := c.Int(key) + if err != nil { return defaultval - } else { - return v } + return v } // Int64 returns the int64 value for a given key. @@ -229,11 +230,11 @@ func (c *IniConfigContainer) Int64(key string) (int64, error) { // DefaultInt64 returns the int64 value for a given key. // if err != nil return defaltval func (c *IniConfigContainer) DefaultInt64(key string, defaultval int64) int64 { - if v, err := c.Int64(key); err != nil { + v, err := c.Int64(key) + if err != nil { return defaultval - } else { - return v } + return v } // Float returns the float value for a given key. @@ -244,11 +245,11 @@ func (c *IniConfigContainer) Float(key string) (float64, error) { // DefaultFloat returns the float64 value for a given key. // if err != nil return defaltval func (c *IniConfigContainer) DefaultFloat(key string, defaultval float64) float64 { - if v, err := c.Float(key); err != nil { + v, err := c.Float(key) + if err != nil { return defaultval - } else { - return v } + return v } // String returns the string value for a given key. @@ -259,11 +260,11 @@ func (c *IniConfigContainer) String(key string) string { // DefaultString returns the string value for a given key. // if err != nil return defaltval func (c *IniConfigContainer) DefaultString(key string, defaultval string) string { - if v := c.String(key); v == "" { + v := c.String(key) + if v == "" { return defaultval - } else { - return v } + return v } // Strings returns the []string value for a given key. @@ -274,20 +275,19 @@ func (c *IniConfigContainer) Strings(key string) []string { // DefaultStrings returns the []string value for a given key. // if err != nil return defaltval func (c *IniConfigContainer) DefaultStrings(key string, defaultval []string) []string { - if v := c.Strings(key); len(v) == 0 { + v := c.Strings(key) + if len(v) == 0 { return defaultval - } else { - return v } + return v } // GetSection returns map for the given section func (c *IniConfigContainer) GetSection(section string) (map[string]string, error) { if v, ok := c.data[section]; ok { return v, nil - } else { - return nil, errors.New("not exist setction") } + return nil, errors.New("not exist setction") } // SaveConfigFile save the config into file @@ -301,7 +301,7 @@ func (c *IniConfigContainer) SaveConfigFile(filename string) (err error) { buf := bytes.NewBuffer(nil) // Save default section at first place - if dt, ok := c.data[DEFAULT_SECTION]; ok { + if dt, ok := c.data[defaultSection]; ok { for key, val := range dt { if key != " " { // Write key comments. @@ -325,7 +325,7 @@ func (c *IniConfigContainer) SaveConfigFile(filename string) (err error) { } // Save named sections for section, dt := range c.data { - if section != DEFAULT_SECTION { + if section != defaultSection { // Write section comments. if v, ok := c.sectionComment[section]; ok { if _, err = buf.WriteString(string(bNumComment) + v + lineBreak); err != nil { @@ -367,7 +367,7 @@ func (c *IniConfigContainer) SaveConfigFile(filename string) (err error) { return nil } -// WriteValue writes a new value for key. +// Set writes a new value for key. // if write to one section, the key need be "section::key". // if the section is not existed, it panics. func (c *IniConfigContainer) Set(key, value string) error { @@ -379,14 +379,14 @@ func (c *IniConfigContainer) Set(key, value string) error { var ( section, k string - sectionKey []string = strings.Split(key, "::") + sectionKey = strings.Split(key, "::") ) if len(sectionKey) >= 2 { section = sectionKey[0] k = sectionKey[1] } else { - section = DEFAULT_SECTION + section = defaultSection k = sectionKey[0] } @@ -415,13 +415,13 @@ func (c *IniConfigContainer) getdata(key string) string { var ( section, k string - sectionKey []string = strings.Split(strings.ToLower(key), "::") + sectionKey = strings.Split(strings.ToLower(key), "::") ) if len(sectionKey) >= 2 { section = sectionKey[0] k = sectionKey[1] } else { - section = DEFAULT_SECTION + section = defaultSection k = sectionKey[0] } if v, ok := c.data[section]; ok { diff --git a/config/json.go b/config/json.go index e2b53793..6929baad 100644 --- a/config/json.go +++ b/config/json.go @@ -23,12 +23,12 @@ import ( "sync" ) -// JsonConfig is a json config parser and implements Config interface. -type JsonConfig struct { +// JSONConfig is a json config parser and implements Config interface. +type JSONConfig struct { } // Parse returns a ConfigContainer with parsed json config map. -func (js *JsonConfig) Parse(filename string) (ConfigContainer, error) { +func (js *JSONConfig) Parse(filename string) (Configer, error) { file, err := os.Open(filename) if err != nil { return nil, err @@ -43,8 +43,8 @@ func (js *JsonConfig) Parse(filename string) (ConfigContainer, error) { } // ParseData returns a ConfigContainer with json string -func (js *JsonConfig) ParseData(data []byte) (ConfigContainer, error) { - x := &JsonConfigContainer{ +func (js *JSONConfig) ParseData(data []byte) (Configer, error) { + x := &JSONConfigContainer{ data: make(map[string]interface{}), } err := json.Unmarshal(data, &x.data) @@ -59,15 +59,15 @@ func (js *JsonConfig) ParseData(data []byte) (ConfigContainer, error) { return x, nil } -// A Config represents the json configuration. +// JSONConfigContainer A Config represents the json configuration. // Only when get value, support key as section:name type. -type JsonConfigContainer struct { +type JSONConfigContainer struct { data map[string]interface{} sync.RWMutex } // Bool returns the boolean value for a given key. -func (c *JsonConfigContainer) Bool(key string) (bool, error) { +func (c *JSONConfigContainer) Bool(key string) (bool, error) { val := c.getData(key) if val != nil { if v, ok := val.(bool); ok { @@ -80,7 +80,7 @@ func (c *JsonConfigContainer) Bool(key string) (bool, error) { // DefaultBool return the bool value if has no error // otherwise return the defaultval -func (c *JsonConfigContainer) DefaultBool(key string, defaultval bool) bool { +func (c *JSONConfigContainer) DefaultBool(key string, defaultval bool) bool { if v, err := c.Bool(key); err == nil { return v } @@ -88,7 +88,7 @@ func (c *JsonConfigContainer) DefaultBool(key string, defaultval bool) bool { } // Int returns the integer value for a given key. -func (c *JsonConfigContainer) Int(key string) (int, error) { +func (c *JSONConfigContainer) Int(key string) (int, error) { val := c.getData(key) if val != nil { if v, ok := val.(float64); ok { @@ -101,7 +101,7 @@ func (c *JsonConfigContainer) Int(key string) (int, error) { // DefaultInt returns the integer value for a given key. // if err != nil return defaltval -func (c *JsonConfigContainer) DefaultInt(key string, defaultval int) int { +func (c *JSONConfigContainer) DefaultInt(key string, defaultval int) int { if v, err := c.Int(key); err == nil { return v } @@ -109,7 +109,7 @@ func (c *JsonConfigContainer) DefaultInt(key string, defaultval int) int { } // Int64 returns the int64 value for a given key. -func (c *JsonConfigContainer) Int64(key string) (int64, error) { +func (c *JSONConfigContainer) Int64(key string) (int64, error) { val := c.getData(key) if val != nil { if v, ok := val.(float64); ok { @@ -122,7 +122,7 @@ func (c *JsonConfigContainer) Int64(key string) (int64, error) { // DefaultInt64 returns the int64 value for a given key. // if err != nil return defaltval -func (c *JsonConfigContainer) DefaultInt64(key string, defaultval int64) int64 { +func (c *JSONConfigContainer) DefaultInt64(key string, defaultval int64) int64 { if v, err := c.Int64(key); err == nil { return v } @@ -130,7 +130,7 @@ func (c *JsonConfigContainer) DefaultInt64(key string, defaultval int64) int64 { } // Float returns the float value for a given key. -func (c *JsonConfigContainer) Float(key string) (float64, error) { +func (c *JSONConfigContainer) Float(key string) (float64, error) { val := c.getData(key) if val != nil { if v, ok := val.(float64); ok { @@ -143,7 +143,7 @@ func (c *JsonConfigContainer) Float(key string) (float64, error) { // DefaultFloat returns the float64 value for a given key. // if err != nil return defaltval -func (c *JsonConfigContainer) DefaultFloat(key string, defaultval float64) float64 { +func (c *JSONConfigContainer) DefaultFloat(key string, defaultval float64) float64 { if v, err := c.Float(key); err == nil { return v } @@ -151,7 +151,7 @@ func (c *JsonConfigContainer) DefaultFloat(key string, defaultval float64) float } // String returns the string value for a given key. -func (c *JsonConfigContainer) String(key string) string { +func (c *JSONConfigContainer) String(key string) string { val := c.getData(key) if val != nil { if v, ok := val.(string); ok { @@ -163,7 +163,7 @@ func (c *JsonConfigContainer) String(key string) string { // DefaultString returns the string value for a given key. // if err != nil return defaltval -func (c *JsonConfigContainer) DefaultString(key string, defaultval string) string { +func (c *JSONConfigContainer) DefaultString(key string, defaultval string) string { // TODO FIXME should not use "" to replace non existance if v := c.String(key); v != "" { return v @@ -172,7 +172,7 @@ func (c *JsonConfigContainer) DefaultString(key string, defaultval string) strin } // Strings returns the []string value for a given key. -func (c *JsonConfigContainer) Strings(key string) []string { +func (c *JSONConfigContainer) Strings(key string) []string { stringVal := c.String(key) if stringVal == "" { return []string{} @@ -182,7 +182,7 @@ func (c *JsonConfigContainer) Strings(key string) []string { // DefaultStrings returns the []string value for a given key. // if err != nil return defaltval -func (c *JsonConfigContainer) DefaultStrings(key string, defaultval []string) []string { +func (c *JSONConfigContainer) DefaultStrings(key string, defaultval []string) []string { if v := c.Strings(key); len(v) > 0 { return v } @@ -190,7 +190,7 @@ func (c *JsonConfigContainer) DefaultStrings(key string, defaultval []string) [] } // GetSection returns map for the given section -func (c *JsonConfigContainer) GetSection(section string) (map[string]string, error) { +func (c *JSONConfigContainer) GetSection(section string) (map[string]string, error) { if v, ok := c.data[section]; ok { return v.(map[string]string), nil } @@ -198,7 +198,7 @@ func (c *JsonConfigContainer) GetSection(section string) (map[string]string, err } // SaveConfigFile save the config into file -func (c *JsonConfigContainer) SaveConfigFile(filename string) (err error) { +func (c *JSONConfigContainer) SaveConfigFile(filename string) (err error) { // Write configuration file by filename. f, err := os.Create(filename) if err != nil { @@ -214,7 +214,7 @@ func (c *JsonConfigContainer) SaveConfigFile(filename string) (err error) { } // Set writes a new value for key. -func (c *JsonConfigContainer) Set(key, val string) error { +func (c *JSONConfigContainer) Set(key, val string) error { c.Lock() defer c.Unlock() c.data[key] = val @@ -222,7 +222,7 @@ func (c *JsonConfigContainer) Set(key, val string) error { } // DIY returns the raw value by a given key. -func (c *JsonConfigContainer) DIY(key string) (v interface{}, err error) { +func (c *JSONConfigContainer) DIY(key string) (v interface{}, err error) { val := c.getData(key) if val != nil { return val, nil @@ -231,7 +231,7 @@ func (c *JsonConfigContainer) DIY(key string) (v interface{}, err error) { } // section.key or key -func (c *JsonConfigContainer) getData(key string) interface{} { +func (c *JSONConfigContainer) getData(key string) interface{} { if len(key) == 0 { return nil } @@ -261,5 +261,5 @@ func (c *JsonConfigContainer) getData(key string) interface{} { } func init() { - Register("json", &JsonConfig{}) + Register("json", &JSONConfig{}) } diff --git a/config/xml/xml.go b/config/xml/xml.go index a1d9fcdb..4d48f7d2 100644 --- a/config/xml/xml.go +++ b/config/xml/xml.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// package xml for config provider +// Package xml for config provider // // depend on github.com/beego/x2j // @@ -45,20 +45,20 @@ import ( "github.com/beego/x2j" ) -// XmlConfig is a xml config parser and implements Config interface. +// Config is a xml config parser and implements Config interface. // xml configurations should be included in tag. // only support key/value pair as value as each item. -type XMLConfig struct{} +type Config struct{} // Parse returns a ConfigContainer with parsed xml config map. -func (xc *XMLConfig) Parse(filename string) (config.ConfigContainer, error) { +func (xc *Config) Parse(filename string) (config.Configer, error) { file, err := os.Open(filename) if err != nil { return nil, err } defer file.Close() - x := &XMLConfigContainer{data: make(map[string]interface{})} + x := &ConfigContainer{data: make(map[string]interface{})} content, err := ioutil.ReadAll(file) if err != nil { return nil, err @@ -73,84 +73,86 @@ func (xc *XMLConfig) Parse(filename string) (config.ConfigContainer, error) { return x, nil } -func (x *XMLConfig) ParseData(data []byte) (config.ConfigContainer, error) { +// ParseData xml data +func (xc *Config) ParseData(data []byte) (config.Configer, error) { // Save memory data to temporary file tmpName := path.Join(os.TempDir(), "beego", fmt.Sprintf("%d", time.Now().Nanosecond())) os.MkdirAll(path.Dir(tmpName), os.ModePerm) if err := ioutil.WriteFile(tmpName, data, 0655); err != nil { return nil, err } - return x.Parse(tmpName) + return xc.Parse(tmpName) } -// A Config represents the xml configuration. -type XMLConfigContainer struct { +// ConfigContainer A Config represents the xml configuration. +type ConfigContainer struct { data map[string]interface{} sync.Mutex } // Bool returns the boolean value for a given key. -func (c *XMLConfigContainer) Bool(key string) (bool, error) { +func (c *ConfigContainer) Bool(key string) (bool, error) { return strconv.ParseBool(c.data[key].(string)) } // DefaultBool return the bool value if has no error // otherwise return the defaultval -func (c *XMLConfigContainer) DefaultBool(key string, defaultval bool) bool { - if v, err := c.Bool(key); err != nil { +func (c *ConfigContainer) DefaultBool(key string, defaultval bool) bool { + v, err := c.Bool(key) + if err != nil { return defaultval - } else { - return v } + return v } // Int returns the integer value for a given key. -func (c *XMLConfigContainer) Int(key string) (int, error) { +func (c *ConfigContainer) Int(key string) (int, error) { return strconv.Atoi(c.data[key].(string)) } // DefaultInt returns the integer value for a given key. // if err != nil return defaltval -func (c *XMLConfigContainer) DefaultInt(key string, defaultval int) int { - if v, err := c.Int(key); err != nil { +func (c *ConfigContainer) DefaultInt(key string, defaultval int) int { + v, err := c.Int(key) + if err != nil { return defaultval - } else { - return v } + return v } // Int64 returns the int64 value for a given key. -func (c *XMLConfigContainer) Int64(key string) (int64, error) { +func (c *ConfigContainer) Int64(key string) (int64, error) { return strconv.ParseInt(c.data[key].(string), 10, 64) } // DefaultInt64 returns the int64 value for a given key. // if err != nil return defaltval -func (c *XMLConfigContainer) DefaultInt64(key string, defaultval int64) int64 { - if v, err := c.Int64(key); err != nil { +func (c *ConfigContainer) DefaultInt64(key string, defaultval int64) int64 { + v, err := c.Int64(key) + if err != nil { return defaultval - } else { - return v } + return v + } // Float returns the float value for a given key. -func (c *XMLConfigContainer) Float(key string) (float64, error) { +func (c *ConfigContainer) Float(key string) (float64, error) { return strconv.ParseFloat(c.data[key].(string), 64) } // DefaultFloat returns the float64 value for a given key. // if err != nil return defaltval -func (c *XMLConfigContainer) DefaultFloat(key string, defaultval float64) float64 { - if v, err := c.Float(key); err != nil { +func (c *ConfigContainer) DefaultFloat(key string, defaultval float64) float64 { + v, err := c.Float(key) + if err != nil { return defaultval - } else { - return v } + return v } // String returns the string value for a given key. -func (c *XMLConfigContainer) String(key string) string { +func (c *ConfigContainer) String(key string) string { if v, ok := c.data[key].(string); ok { return v } @@ -159,40 +161,39 @@ func (c *XMLConfigContainer) String(key string) string { // DefaultString returns the string value for a given key. // if err != nil return defaltval -func (c *XMLConfigContainer) DefaultString(key string, defaultval string) string { - if v := c.String(key); v == "" { +func (c *ConfigContainer) DefaultString(key string, defaultval string) string { + v := c.String(key) + if v == "" { return defaultval - } else { - return v } + return v } // Strings returns the []string value for a given key. -func (c *XMLConfigContainer) Strings(key string) []string { +func (c *ConfigContainer) Strings(key string) []string { return strings.Split(c.String(key), ";") } // DefaultStrings returns the []string value for a given key. // if err != nil return defaltval -func (c *XMLConfigContainer) DefaultStrings(key string, defaultval []string) []string { - if v := c.Strings(key); len(v) == 0 { +func (c *ConfigContainer) DefaultStrings(key string, defaultval []string) []string { + v := c.Strings(key) + if len(v) == 0 { return defaultval - } else { - return v } + return v } // GetSection returns map for the given section -func (c *XMLConfigContainer) GetSection(section string) (map[string]string, error) { +func (c *ConfigContainer) GetSection(section string) (map[string]string, error) { if v, ok := c.data[section]; ok { return v.(map[string]string), nil - } else { - return nil, errors.New("not exist setction") } + return nil, errors.New("not exist setction") } // SaveConfigFile save the config into file -func (c *XMLConfigContainer) SaveConfigFile(filename string) (err error) { +func (c *ConfigContainer) SaveConfigFile(filename string) (err error) { // Write configuration file by filename. f, err := os.Create(filename) if err != nil { @@ -207,8 +208,8 @@ func (c *XMLConfigContainer) SaveConfigFile(filename string) (err error) { return err } -// WriteValue writes a new value for key. -func (c *XMLConfigContainer) Set(key, val string) error { +// Set writes a new value for key. +func (c *ConfigContainer) Set(key, val string) error { c.Lock() defer c.Unlock() c.data[key] = val @@ -216,7 +217,7 @@ func (c *XMLConfigContainer) Set(key, val string) error { } // DIY returns the raw value by a given key. -func (c *XMLConfigContainer) DIY(key string) (v interface{}, err error) { +func (c *ConfigContainer) DIY(key string) (v interface{}, err error) { if v, ok := c.data[key]; ok { return v, nil } @@ -224,5 +225,5 @@ func (c *XMLConfigContainer) DIY(key string) (v interface{}, err error) { } func init() { - config.Register("xml", &XMLConfig{}) + config.Register("xml", &Config{}) } diff --git a/config/yaml/yaml.go b/config/yaml/yaml.go index c5be44a9..f034d3ba 100644 --- a/config/yaml/yaml.go +++ b/config/yaml/yaml.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// package yaml for config provider +// Package yaml for config provider // // depend on github.com/beego/goyaml2 // @@ -46,22 +46,23 @@ import ( "github.com/beego/goyaml2" ) -// YAMLConfig is a yaml config parser and implements Config interface. -type YAMLConfig struct{} +// Config is a yaml config parser and implements Config interface. +type Config struct{} // Parse returns a ConfigContainer with parsed yaml config map. -func (yaml *YAMLConfig) Parse(filename string) (y config.ConfigContainer, err error) { +func (yaml *Config) Parse(filename string) (y config.Configer, err error) { cnf, err := ReadYmlReader(filename) if err != nil { return } - y = &YAMLConfigContainer{ + y = &ConfigContainer{ data: cnf, } return } -func (yaml *YAMLConfig) ParseData(data []byte) (config.ConfigContainer, error) { +// ParseData parse yaml data +func (yaml *Config) ParseData(data []byte) (config.Configer, error) { // Save memory data to temporary file tmpName := path.Join(os.TempDir(), "beego", fmt.Sprintf("%d", time.Now().Nanosecond())) os.MkdirAll(path.Dir(tmpName), os.ModePerm) @@ -71,7 +72,7 @@ func (yaml *YAMLConfig) ParseData(data []byte) (config.ConfigContainer, error) { return yaml.Parse(tmpName) } -// Read yaml file to map. +// ReadYmlReader Read yaml file to map. // if json like, use json package, unless goyaml2 package. func ReadYmlReader(path string) (cnf map[string]interface{}, err error) { f, err := os.Open(path) @@ -112,14 +113,14 @@ func ReadYmlReader(path string) (cnf map[string]interface{}, err error) { return } -// A Config represents the yaml configuration. -type YAMLConfigContainer struct { +// ConfigContainer A Config represents the yaml configuration. +type ConfigContainer struct { data map[string]interface{} sync.Mutex } // Bool returns the boolean value for a given key. -func (c *YAMLConfigContainer) Bool(key string) (bool, error) { +func (c *ConfigContainer) Bool(key string) (bool, error) { if v, ok := c.data[key].(bool); ok { return v, nil } @@ -128,16 +129,16 @@ func (c *YAMLConfigContainer) Bool(key string) (bool, error) { // DefaultBool return the bool value if has no error // otherwise return the defaultval -func (c *YAMLConfigContainer) DefaultBool(key string, defaultval bool) bool { - if v, err := c.Bool(key); err != nil { +func (c *ConfigContainer) DefaultBool(key string, defaultval bool) bool { + v, err := c.Bool(key) + if err != nil { return defaultval - } else { - return v } + return v } // Int returns the integer value for a given key. -func (c *YAMLConfigContainer) Int(key string) (int, error) { +func (c *ConfigContainer) Int(key string) (int, error) { if v, ok := c.data[key].(int64); ok { return int(v), nil } @@ -146,16 +147,16 @@ func (c *YAMLConfigContainer) Int(key string) (int, error) { // DefaultInt returns the integer value for a given key. // if err != nil return defaltval -func (c *YAMLConfigContainer) DefaultInt(key string, defaultval int) int { - if v, err := c.Int(key); err != nil { +func (c *ConfigContainer) DefaultInt(key string, defaultval int) int { + v, err := c.Int(key) + if err != nil { return defaultval - } else { - return v } + return v } // Int64 returns the int64 value for a given key. -func (c *YAMLConfigContainer) Int64(key string) (int64, error) { +func (c *ConfigContainer) Int64(key string) (int64, error) { if v, ok := c.data[key].(int64); ok { return v, nil } @@ -164,16 +165,16 @@ func (c *YAMLConfigContainer) Int64(key string) (int64, error) { // DefaultInt64 returns the int64 value for a given key. // if err != nil return defaltval -func (c *YAMLConfigContainer) DefaultInt64(key string, defaultval int64) int64 { - if v, err := c.Int64(key); err != nil { +func (c *ConfigContainer) DefaultInt64(key string, defaultval int64) int64 { + v, err := c.Int64(key) + if err != nil { return defaultval - } else { - return v } + return v } // Float returns the float value for a given key. -func (c *YAMLConfigContainer) Float(key string) (float64, error) { +func (c *ConfigContainer) Float(key string) (float64, error) { if v, ok := c.data[key].(float64); ok { return v, nil } @@ -182,16 +183,16 @@ func (c *YAMLConfigContainer) Float(key string) (float64, error) { // DefaultFloat returns the float64 value for a given key. // if err != nil return defaltval -func (c *YAMLConfigContainer) DefaultFloat(key string, defaultval float64) float64 { - if v, err := c.Float(key); err != nil { +func (c *ConfigContainer) DefaultFloat(key string, defaultval float64) float64 { + v, err := c.Float(key) + if err != nil { return defaultval - } else { - return v } + return v } // String returns the string value for a given key. -func (c *YAMLConfigContainer) String(key string) string { +func (c *ConfigContainer) String(key string) string { if v, ok := c.data[key].(string); ok { return v } @@ -200,40 +201,40 @@ func (c *YAMLConfigContainer) String(key string) string { // DefaultString returns the string value for a given key. // if err != nil return defaltval -func (c *YAMLConfigContainer) DefaultString(key string, defaultval string) string { - if v := c.String(key); v == "" { +func (c *ConfigContainer) DefaultString(key string, defaultval string) string { + v := c.String(key) + if v == "" { return defaultval - } else { - return v } + return v } // Strings returns the []string value for a given key. -func (c *YAMLConfigContainer) Strings(key string) []string { +func (c *ConfigContainer) Strings(key string) []string { return strings.Split(c.String(key), ";") } // DefaultStrings returns the []string value for a given key. // if err != nil return defaltval -func (c *YAMLConfigContainer) DefaultStrings(key string, defaultval []string) []string { - if v := c.Strings(key); len(v) == 0 { +func (c *ConfigContainer) DefaultStrings(key string, defaultval []string) []string { + v := c.Strings(key) + if len(v) == 0 { return defaultval - } else { - return v } + return v } // GetSection returns map for the given section -func (c *YAMLConfigContainer) GetSection(section string) (map[string]string, error) { - if v, ok := c.data[section]; ok { +func (c *ConfigContainer) GetSection(section string) (map[string]string, error) { + v, ok := c.data[section] + if ok { return v.(map[string]string), nil - } else { - return nil, errors.New("not exist setction") } + return nil, errors.New("not exist setction") } // SaveConfigFile save the config into file -func (c *YAMLConfigContainer) SaveConfigFile(filename string) (err error) { +func (c *ConfigContainer) SaveConfigFile(filename string) (err error) { // Write configuration file by filename. f, err := os.Create(filename) if err != nil { @@ -244,8 +245,8 @@ func (c *YAMLConfigContainer) SaveConfigFile(filename string) (err error) { return err } -// WriteValue writes a new value for key. -func (c *YAMLConfigContainer) Set(key, val string) error { +// Set writes a new value for key. +func (c *ConfigContainer) Set(key, val string) error { c.Lock() defer c.Unlock() c.data[key] = val @@ -253,7 +254,7 @@ func (c *YAMLConfigContainer) Set(key, val string) error { } // DIY returns the raw value by a given key. -func (c *YAMLConfigContainer) DIY(key string) (v interface{}, err error) { +func (c *ConfigContainer) DIY(key string) (v interface{}, err error) { if v, ok := c.data[key]; ok { return v, nil } @@ -261,5 +262,5 @@ func (c *YAMLConfigContainer) DIY(key string) (v interface{}, err error) { } func init() { - config.Register("yaml", &YAMLConfig{}) + config.Register("yaml", &Config{}) } From ff5b09fc195fdeeee660504c78a31de02277d840 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 10 Sep 2015 15:31:09 +0800 Subject: [PATCH 203/436] golint context --- config.go | 2 +- context/context.go | 31 ++++++++-------- context/input.go | 48 ++++++++++++------------- context/output.go | 90 +++++++++++++++++++++++----------------------- controller.go | 10 +++--- error.go | 2 +- router.go | 2 +- 7 files changed, 93 insertions(+), 92 deletions(-) diff --git a/config.go b/config.go index ae334cd7..6f87fed1 100644 --- a/config.go +++ b/config.go @@ -141,7 +141,7 @@ var ( ) type beegoAppConfig struct { - innerConfig config.ConfigContainer + innerConfig config.Configer } func newAppConfig(AppConfigProvider, AppConfigPath string) (*beegoAppConfig, error) { diff --git a/context/context.go b/context/context.go index f6aa85d6..fb9c6d96 100644 --- a/context/context.go +++ b/context/context.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +// Package context provide the context utils // Usage: // // import "github.com/astaxie/beego/context" @@ -34,14 +35,14 @@ import ( "github.com/astaxie/beego/utils" ) -// Http request context struct including BeegoInput, BeegoOutput, http.Request and http.ResponseWriter. +// Context Http request context struct including BeegoInput, BeegoOutput, http.Request and http.ResponseWriter. // BeegoInput and BeegoOutput provides some api to operate request and response more easily. type Context struct { Input *BeegoInput Output *BeegoOutput Request *http.Request ResponseWriter http.ResponseWriter - _xsrf_token string + _xsrfToken string } // Redirect does redirection to localurl with http header status code. @@ -58,25 +59,25 @@ func (ctx *Context) Abort(status int, body string) { panic(body) } -// Write string to response body. +// WriteString Write string to response body. // it sends response body. func (ctx *Context) WriteString(content string) { ctx.ResponseWriter.Write([]byte(content)) } -// Get cookie from request by a given key. +// GetCookie Get cookie from request by a given key. // It's alias of BeegoInput.Cookie. func (ctx *Context) GetCookie(key string) string { return ctx.Input.Cookie(key) } -// Set cookie for response. +// SetCookie Set cookie for response. // It's alias of BeegoOutput.Cookie. func (ctx *Context) SetCookie(name string, value string, others ...interface{}) { ctx.Output.Cookie(name, value, others...) } -// Get secure cookie from request by a given key. +// GetSecureCookie Get secure cookie from request by a given key. func (ctx *Context) GetSecureCookie(Secret, key string) (string, bool) { val := ctx.Input.Cookie(key) if val == "" { @@ -103,7 +104,7 @@ func (ctx *Context) GetSecureCookie(Secret, key string) (string, bool) { return string(res), true } -// Set Secure cookie for response. +// SetSecureCookie Set Secure cookie for response. func (ctx *Context) SetSecureCookie(Secret, name, value string, others ...interface{}) { vs := base64.URLEncoding.EncodeToString([]byte(value)) timestamp := strconv.FormatInt(time.Now().UnixNano(), 10) @@ -114,23 +115,23 @@ func (ctx *Context) SetSecureCookie(Secret, name, value string, others ...interf ctx.Output.Cookie(name, cookie, others...) } -// XsrfToken creates a xsrf token string and returns. -func (ctx *Context) XsrfToken(key string, expire int64) string { - if ctx._xsrf_token == "" { +// XSRFToken creates a xsrf token string and returns. +func (ctx *Context) XSRFToken(key string, expire int64) string { + if ctx._xsrfToken == "" { token, ok := ctx.GetSecureCookie(key, "_xsrf") if !ok { token = string(utils.RandomCreateBytes(32)) ctx.SetSecureCookie(key, "_xsrf", token, expire) } - ctx._xsrf_token = token + ctx._xsrfToken = token } - return ctx._xsrf_token + return ctx._xsrfToken } -// CheckXsrfCookie checks xsrf token in this request is valid or not. +// CheckXSRFCookie checks xsrf token in this request is valid or not. // the token can provided in request header "X-Xsrftoken" and "X-CsrfToken" // or in form field value named as "_xsrf". -func (ctx *Context) CheckXsrfCookie() bool { +func (ctx *Context) CheckXSRFCookie() bool { token := ctx.Input.Query("_xsrf") if token == "" { token = ctx.Request.Header.Get("X-Xsrftoken") @@ -142,7 +143,7 @@ func (ctx *Context) CheckXsrfCookie() bool { ctx.Abort(403, "'_xsrf' argument missing from POST") return false } - if ctx._xsrf_token != token { + if ctx._xsrfToken != token { ctx.Abort(403, "XSRF cookie does not match POST argument") return false } diff --git a/context/input.go b/context/input.go index c8a8aaa9..2cf3235f 100644 --- a/context/input.go +++ b/context/input.go @@ -31,9 +31,9 @@ import ( // Regexes for checking the accept headers // TODO make sure these are correct var ( - acceptsHtmlRegex = regexp.MustCompile(`(text/html|application/xhtml\+xml)(?:,|$)`) - acceptsXmlRegex = regexp.MustCompile(`(application/xml|text/xml)(?:,|$)`) - acceptsJsonRegex = regexp.MustCompile(`(application/json)(?:,|$)`) + acceptsHTMLRegex = regexp.MustCompile(`(text/html|application/xhtml\+xml)(?:,|$)`) + acceptsXMLRegex = regexp.MustCompile(`(application/xml|text/xml)(?:,|$)`) + acceptsJSONRegex = regexp.MustCompile(`(application/json)(?:,|$)`) ) // BeegoInput operates the http request header, data, cookie and body. @@ -62,13 +62,13 @@ func (input *BeegoInput) Protocol() string { return input.Request.Proto } -// Uri returns full request url with query string, fragment. -func (input *BeegoInput) Uri() string { +// URI returns full request url with query string, fragment. +func (input *BeegoInput) URI() string { return input.Request.RequestURI } -// Url returns request url path (without query string, fragment). -func (input *BeegoInput) Url() string { +// URL returns request url path (without query string, fragment). +func (input *BeegoInput) URL() string { return input.Request.URL.Path } @@ -117,37 +117,37 @@ func (input *BeegoInput) Is(method string) bool { return input.Method() == method } -// Is this a GET method request? +// IsGet Is this a GET method request? func (input *BeegoInput) IsGet() bool { return input.Is("GET") } -// Is this a POST method request? +// IsPost Is this a POST method request? func (input *BeegoInput) IsPost() bool { return input.Is("POST") } -// Is this a Head method request? +// IsHead Is this a Head method request? func (input *BeegoInput) IsHead() bool { return input.Is("HEAD") } -// Is this a OPTIONS method request? +// IsOptions Is this a OPTIONS method request? func (input *BeegoInput) IsOptions() bool { return input.Is("OPTIONS") } -// Is this a PUT method request? +// IsPut Is this a PUT method request? func (input *BeegoInput) IsPut() bool { return input.Is("PUT") } -// Is this a DELETE method request? +// IsDelete Is this a DELETE method request? func (input *BeegoInput) IsDelete() bool { return input.Is("DELETE") } -// Is this a PATCH method request? +// IsPatch Is this a PATCH method request? func (input *BeegoInput) IsPatch() bool { return input.Is("PATCH") } @@ -172,19 +172,19 @@ func (input *BeegoInput) IsUpload() bool { return strings.Contains(input.Header("Content-Type"), "multipart/form-data") } -// Checks if request accepts html response -func (input *BeegoInput) AcceptsHtml() bool { - return acceptsHtmlRegex.MatchString(input.Header("Accept")) +// AcceptsHTML Checks if request accepts html response +func (input *BeegoInput) AcceptsHTML() bool { + return acceptsHTMLRegex.MatchString(input.Header("Accept")) } -// Checks if request accepts xml response -func (input *BeegoInput) AcceptsXml() bool { - return acceptsXmlRegex.MatchString(input.Header("Accept")) +// AcceptsXML Checks if request accepts xml response +func (input *BeegoInput) AcceptsXML() bool { + return acceptsXMLRegex.MatchString(input.Header("Accept")) } -// Checks if request accepts json response -func (input *BeegoInput) AcceptsJson() bool { - return acceptsJsonRegex.MatchString(input.Header("Accept")) +// AcceptsJSON Checks if request accepts json response +func (input *BeegoInput) AcceptsJSON() bool { + return acceptsJSONRegex.MatchString(input.Header("Accept")) } // IP returns request client ip. @@ -314,7 +314,7 @@ func (input *BeegoInput) SetData(key, val interface{}) { input.Data[key] = val } -// parseForm or parseMultiForm based on Content-type +// ParseFormOrMulitForm parseForm or parseMultiForm based on Content-type func (input *BeegoInput) ParseFormOrMulitForm(maxMemory int64) error { // Parse the body depending on the content type. if strings.Contains(input.Header("Content-Type"), "multipart/form-data") { diff --git a/context/output.go b/context/output.go index 7edde552..743beb96 100644 --- a/context/output.go +++ b/context/output.go @@ -54,7 +54,7 @@ func (output *BeegoOutput) Header(key, val string) { // if EnableGzip, compress content string. // it sends out response body directly. func (output *BeegoOutput) Body(content []byte) { - output_writer := output.Context.ResponseWriter.(io.Writer) + outputWriter := output.Context.ResponseWriter.(io.Writer) if output.EnableGzip == true && output.Context.Input.Header("Accept-Encoding") != "" { splitted := strings.SplitN(output.Context.Input.Header("Accept-Encoding"), ",", -1) encodings := make([]string, len(splitted)) @@ -65,12 +65,12 @@ func (output *BeegoOutput) Body(content []byte) { for _, val := range encodings { if val == "gzip" { output.Header("Content-Encoding", "gzip") - output_writer, _ = gzip.NewWriterLevel(output.Context.ResponseWriter, gzip.BestSpeed) + outputWriter, _ = gzip.NewWriterLevel(output.Context.ResponseWriter, gzip.BestSpeed) break } else if val == "deflate" { output.Header("Content-Encoding", "deflate") - output_writer, _ = flate.NewWriter(output.Context.ResponseWriter, flate.BestSpeed) + outputWriter, _ = flate.NewWriter(output.Context.ResponseWriter, flate.BestSpeed) break } } @@ -85,12 +85,12 @@ func (output *BeegoOutput) Body(content []byte) { output.Status = 0 } - output_writer.Write(content) - switch output_writer.(type) { + outputWriter.Write(content) + switch outputWriter.(type) { case *gzip.Writer: - output_writer.(*gzip.Writer).Close() + outputWriter.(*gzip.Writer).Close() case *flate.Writer: - output_writer.(*flate.Writer).Close() + outputWriter.(*flate.Writer).Close() } } @@ -100,29 +100,29 @@ func (output *BeegoOutput) Cookie(name string, value string, others ...interface var b bytes.Buffer fmt.Fprintf(&b, "%s=%s", sanitizeName(name), sanitizeValue(value)) - //fix cookie not work in IE - if len(others) > 0 { - switch v := others[0].(type) { - case int: - if v > 0 { - fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v) * time.Second).UTC().Format(time.RFC1123), v) - } else if v < 0 { - fmt.Fprintf(&b, "; Max-Age=0") - } - case int64: - if v > 0 { - fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v) * time.Second).UTC().Format(time.RFC1123), v) - } else if v < 0 { - fmt.Fprintf(&b, "; Max-Age=0") - } - case int32: - if v > 0 { - fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v) * time.Second).UTC().Format(time.RFC1123), v) - } else if v < 0 { - fmt.Fprintf(&b, "; Max-Age=0") - } - } - } + //fix cookie not work in IE + if len(others) > 0 { + switch v := others[0].(type) { + case int: + if v > 0 { + fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v)*time.Second).UTC().Format(time.RFC1123), v) + } else if v < 0 { + fmt.Fprintf(&b, "; Max-Age=0") + } + case int64: + if v > 0 { + fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v)*time.Second).UTC().Format(time.RFC1123), v) + } else if v < 0 { + fmt.Fprintf(&b, "; Max-Age=0") + } + case int32: + if v > 0 { + fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v)*time.Second).UTC().Format(time.RFC1123), v) + } else if v < 0 { + fmt.Fprintf(&b, "; Max-Age=0") + } + } + } // the settings below // Path, Domain, Secure, HttpOnly @@ -188,9 +188,9 @@ func sanitizeValue(v string) string { return cookieValueSanitizer.Replace(v) } -// Json writes json to response body. +// JSON writes json to response body. // if coding is true, it converts utf-8 to \u0000 type. -func (output *BeegoOutput) Json(data interface{}, hasIndent bool, coding bool) error { +func (output *BeegoOutput) JSON(data interface{}, hasIndent bool, coding bool) error { output.Header("Content-Type", "application/json; charset=utf-8") var content []byte var err error @@ -204,14 +204,14 @@ func (output *BeegoOutput) Json(data interface{}, hasIndent bool, coding bool) e return err } if coding { - content = []byte(stringsToJson(string(content))) + content = []byte(stringsToJSON(string(content))) } output.Body(content) return nil } -// Jsonp writes jsonp to response body. -func (output *BeegoOutput) Jsonp(data interface{}, hasIndent bool) error { +// JSONP writes jsonp to response body. +func (output *BeegoOutput) JSONP(data interface{}, hasIndent bool) error { output.Header("Content-Type", "application/javascript; charset=utf-8") var content []byte var err error @@ -228,16 +228,16 @@ func (output *BeegoOutput) Jsonp(data interface{}, hasIndent bool) error { if callback == "" { return errors.New(`"callback" parameter required`) } - callback_content := bytes.NewBufferString(" " + template.JSEscapeString(callback)) - callback_content.WriteString("(") - callback_content.Write(content) - callback_content.WriteString(");\r\n") - output.Body(callback_content.Bytes()) + callbackContent := bytes.NewBufferString(" " + template.JSEscapeString(callback)) + callbackContent.WriteString("(") + callbackContent.Write(content) + callbackContent.WriteString(");\r\n") + output.Body(callbackContent.Bytes()) return nil } -// Xml writes xml string to response body. -func (output *BeegoOutput) Xml(data interface{}, hasIndent bool) error { +// XML writes xml string to response body. +func (output *BeegoOutput) XML(data interface{}, hasIndent bool) error { output.Header("Content-Type", "application/xml; charset=utf-8") var content []byte var err error @@ -331,7 +331,7 @@ func (output *BeegoOutput) IsNotFound(status int) bool { return output.Status == 404 } -// IsClient returns boolean of this request client sends error data. +// IsClientError returns boolean of this request client sends error data. // HTTP 4xx means forbidden. func (output *BeegoOutput) IsClientError(status int) bool { return output.Status >= 400 && output.Status < 500 @@ -343,7 +343,7 @@ func (output *BeegoOutput) IsServerError(status int) bool { return output.Status >= 500 && output.Status < 600 } -func stringsToJson(str string) string { +func stringsToJSON(str string) string { rs := []rune(str) jsons := "" for _, r := range rs { @@ -357,7 +357,7 @@ func stringsToJson(str string) string { return jsons } -// Sessions sets session item value with given key. +// Session sets session item value with given key. func (output *BeegoOutput) Session(name interface{}, value interface{}) { output.Context.Input.CruSession.Set(name, value) } diff --git a/controller.go b/controller.go index b225df03..39a7c91b 100644 --- a/controller.go +++ b/controller.go @@ -327,7 +327,7 @@ func (c *Controller) ServeJSON(encoding ...bool) { if len(encoding) > 0 && encoding[0] == true { hasencoding = true } - c.Ctx.Output.Json(c.Data["json"], hasIndent, hasencoding) + c.Ctx.Output.JSON(c.Data["json"], hasIndent, hasencoding) } // ServeJSONP sends a jsonp response. @@ -338,7 +338,7 @@ func (c *Controller) ServeJSONP() { } else { hasIndent = true } - c.Ctx.Output.Jsonp(c.Data["jsonp"], hasIndent) + c.Ctx.Output.JSONP(c.Data["jsonp"], hasIndent) } // ServeXML sends xml response. @@ -349,7 +349,7 @@ func (c *Controller) ServeXML() { } else { hasIndent = true } - c.Ctx.Output.Xml(c.Data["xml"], hasIndent) + c.Ctx.Output.XML(c.Data["xml"], hasIndent) } // ServeFormatted serve Xml OR Json, depending on the value of the Accept header @@ -630,7 +630,7 @@ func (c *Controller) XSRFToken() string { } else { expire = int64(XSRFExpire) } - c._xsrfToken = c.Ctx.XsrfToken(XSRFKEY, expire) + c._xsrfToken = c.Ctx.XSRFToken(XSRFKEY, expire) } return c._xsrfToken } @@ -642,7 +642,7 @@ func (c *Controller) CheckXSRFCookie() bool { if !c.EnableXSRF { return true } - return c.Ctx.CheckXsrfCookie() + return c.Ctx.CheckXSRFCookie() } // XSRFFormHTML writes an input field contains xsrf token value. diff --git a/error.go b/error.go index b4708b30..e1d6dfae 100644 --- a/error.go +++ b/error.go @@ -87,7 +87,7 @@ func showErr(err interface{}, ctx *context.Context, Stack string) { data := make(map[string]string) data["AppError"] = AppName + ":" + fmt.Sprint(err) data["RequestMethod"] = ctx.Input.Method() - data["RequestURL"] = ctx.Input.Uri() + data["RequestURL"] = ctx.Input.URI() data["RemoteAddr"] = ctx.Input.IP() data["Stack"] = Stack data["BeegoVersion"] = VERSION diff --git a/router.go b/router.go index 12b5f6ae..efb1a1f3 100644 --- a/router.go +++ b/router.go @@ -875,7 +875,7 @@ func (p *ControllerRegister) recoverPanic(context *beecontext.Context) { } } var stack string - Critical("the request url is ", context.Input.Url()) + Critical("the request url is ", context.Input.URL()) Critical("Handler crashed with error", err) for i := 1; ; i++ { _, file, line, ok := runtime.Caller(i) From 01a5e5426409e47d277ed7c798fb63a0009b90c6 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 10 Sep 2015 15:40:46 +0800 Subject: [PATCH 204/436] delete example from the source code --- example/beeapi/conf/app.conf | 5 - example/beeapi/controllers/default.go | 63 --------- example/beeapi/main.go | 30 ----- example/beeapi/models/object.go | 58 --------- example/chat/conf/app.conf | 3 - example/chat/controllers/default.go | 20 --- example/chat/controllers/ws.go | 180 -------------------------- example/chat/main.go | 17 --- example/chat/views/index.tpl | 92 ------------- 9 files changed, 468 deletions(-) delete mode 100644 example/beeapi/conf/app.conf delete mode 100644 example/beeapi/controllers/default.go delete mode 100644 example/beeapi/main.go delete mode 100644 example/beeapi/models/object.go delete mode 100644 example/chat/conf/app.conf delete mode 100644 example/chat/controllers/default.go delete mode 100644 example/chat/controllers/ws.go delete mode 100644 example/chat/main.go delete mode 100644 example/chat/views/index.tpl diff --git a/example/beeapi/conf/app.conf b/example/beeapi/conf/app.conf deleted file mode 100644 index fd1681a2..00000000 --- a/example/beeapi/conf/app.conf +++ /dev/null @@ -1,5 +0,0 @@ -appname = beeapi -httpport = 8080 -runmode = dev -autorender = false -copyrequestbody = true diff --git a/example/beeapi/controllers/default.go b/example/beeapi/controllers/default.go deleted file mode 100644 index a2184075..00000000 --- a/example/beeapi/controllers/default.go +++ /dev/null @@ -1,63 +0,0 @@ -// Beego (http://beego.me/) -// @description beego is an open-source, high-performance web framework for the Go programming language. -// @link http://github.com/astaxie/beego for the canonical source repository -// @license http://github.com/astaxie/beego/blob/master/LICENSE -// @authors astaxie - -package controllers - -import ( - "encoding/json" - - "github.com/astaxie/beego" - "github.com/astaxie/beego/example/beeapi/models" -) - -type ObjectController struct { - beego.Controller -} - -func (o *ObjectController) Post() { - var ob models.Object - json.Unmarshal(o.Ctx.Input.RequestBody, &ob) - objectid := models.AddOne(ob) - o.Data["json"] = map[string]string{"ObjectId": objectid} - o.ServeJson() -} - -func (o *ObjectController) Get() { - objectId := o.Ctx.Input.Params[":objectId"] - if objectId != "" { - ob, err := models.GetOne(objectId) - if err != nil { - o.Data["json"] = err - } else { - o.Data["json"] = ob - } - } else { - obs := models.GetAll() - o.Data["json"] = obs - } - o.ServeJson() -} - -func (o *ObjectController) Put() { - objectId := o.Ctx.Input.Params[":objectId"] - var ob models.Object - json.Unmarshal(o.Ctx.Input.RequestBody, &ob) - - err := models.Update(objectId, ob.Score) - if err != nil { - o.Data["json"] = err - } else { - o.Data["json"] = "update success!" - } - o.ServeJson() -} - -func (o *ObjectController) Delete() { - objectId := o.Ctx.Input.Params[":objectId"] - models.Delete(objectId) - o.Data["json"] = "delete success!" - o.ServeJson() -} diff --git a/example/beeapi/main.go b/example/beeapi/main.go deleted file mode 100644 index c1250e03..00000000 --- a/example/beeapi/main.go +++ /dev/null @@ -1,30 +0,0 @@ -// Beego (http://beego.me/) - -// @description beego is an open-source, high-performance web framework for the Go programming language. - -// @link http://github.com/astaxie/beego for the canonical source repository - -// @license http://github.com/astaxie/beego/blob/master/LICENSE - -// @authors astaxie - -package main - -import ( - "github.com/astaxie/beego" - "github.com/astaxie/beego/example/beeapi/controllers" -) - -// Objects - -// URL HTTP Verb Functionality -// /object POST Creating Objects -// /object/ GET Retrieving Objects -// /object/ PUT Updating Objects -// /object GET Queries -// /object/ DELETE Deleting Objects - -func main() { - beego.RESTRouter("/object", &controllers.ObjectController{}) - beego.Run() -} diff --git a/example/beeapi/models/object.go b/example/beeapi/models/object.go deleted file mode 100644 index 46109c50..00000000 --- a/example/beeapi/models/object.go +++ /dev/null @@ -1,58 +0,0 @@ -// Beego (http://beego.me/) -// @description beego is an open-source, high-performance web framework for the Go programming language. -// @link http://github.com/astaxie/beego for the canonical source repository -// @license http://github.com/astaxie/beego/blob/master/LICENSE -// @authors astaxie - -package models - -import ( - "errors" - "strconv" - "time" -) - -var ( - Objects map[string]*Object -) - -type Object struct { - ObjectId string - Score int64 - PlayerName string -} - -func init() { - Objects = make(map[string]*Object) - Objects["hjkhsbnmn123"] = &Object{"hjkhsbnmn123", 100, "astaxie"} - Objects["mjjkxsxsaa23"] = &Object{"mjjkxsxsaa23", 101, "someone"} -} - -func AddOne(object Object) (ObjectId string) { - object.ObjectId = "astaxie" + strconv.FormatInt(time.Now().UnixNano(), 10) - Objects[object.ObjectId] = &object - return object.ObjectId -} - -func GetOne(ObjectId string) (object *Object, err error) { - if v, ok := Objects[ObjectId]; ok { - return v, nil - } - return nil, errors.New("ObjectId Not Exist") -} - -func GetAll() map[string]*Object { - return Objects -} - -func Update(ObjectId string, Score int64) (err error) { - if v, ok := Objects[ObjectId]; ok { - v.Score = Score - return nil - } - return errors.New("ObjectId Not Exist") -} - -func Delete(ObjectId string) { - delete(Objects, ObjectId) -} diff --git a/example/chat/conf/app.conf b/example/chat/conf/app.conf deleted file mode 100644 index 9d5a823f..00000000 --- a/example/chat/conf/app.conf +++ /dev/null @@ -1,3 +0,0 @@ -appname = chat -httpport = 8080 -runmode = dev diff --git a/example/chat/controllers/default.go b/example/chat/controllers/default.go deleted file mode 100644 index 95ef8a9b..00000000 --- a/example/chat/controllers/default.go +++ /dev/null @@ -1,20 +0,0 @@ -// Beego (http://beego.me/) -// @description beego is an open-source, high-performance web framework for the Go programming language. -// @link http://github.com/astaxie/beego for the canonical source repository -// @license http://github.com/astaxie/beego/blob/master/LICENSE -// @authors Unknwon - -package controllers - -import ( - "github.com/astaxie/beego" -) - -type MainController struct { - beego.Controller -} - -func (m *MainController) Get() { - m.Data["host"] = m.Ctx.Request.Host - m.TplNames = "index.tpl" -} diff --git a/example/chat/controllers/ws.go b/example/chat/controllers/ws.go deleted file mode 100644 index 9e405513..00000000 --- a/example/chat/controllers/ws.go +++ /dev/null @@ -1,180 +0,0 @@ -// Beego (http://beego.me/) -// @description beego is an open-source, high-performance web framework for the Go programming language. -// @link http://github.com/astaxie/beego for the canonical source repository -// @license http://github.com/astaxie/beego/blob/master/LICENSE -// @authors Unknwon - -package controllers - -import ( - "io/ioutil" - "math/rand" - "net/http" - "time" - - "github.com/astaxie/beego" - "github.com/gorilla/websocket" -) - -const ( - // Time allowed to write a message to the client. - writeWait = 10 * time.Second - - // Time allowed to read the next message from the client. - readWait = 60 * time.Second - - // Send pings to client with this period. Must be less than readWait. - pingPeriod = (readWait * 9) / 10 - - // Maximum message size allowed from client. - maxMessageSize = 512 -) - -func init() { - rand.Seed(time.Now().UTC().UnixNano()) - go h.run() -} - -// connection is an middleman between the websocket connection and the hub. -type connection struct { - username string - - // The websocket connection. - ws *websocket.Conn - - // Buffered channel of outbound messages. - send chan []byte -} - -// readPump pumps messages from the websocket connection to the hub. -func (c *connection) readPump() { - defer func() { - h.unregister <- c - c.ws.Close() - }() - c.ws.SetReadLimit(maxMessageSize) - c.ws.SetReadDeadline(time.Now().Add(readWait)) - c.ws.SetPongHandler(func(string) error { c.ws.SetReadDeadline(time.Now().Add(readWait)); return nil }) - for { - op, r, err := c.ws.NextReader() - if err != nil { - break - } - switch op { - case websocket.TextMessage: - message, err := ioutil.ReadAll(r) - if err != nil { - break - } - h.broadcast <- []byte(c.username + "_" + time.Now().Format("15:04:05") + ":" + string(message)) - } - } -} - -// write writes a message with the given opCode and payload. -func (c *connection) write(opCode int, payload []byte) error { - c.ws.SetWriteDeadline(time.Now().Add(writeWait)) - return c.ws.WriteMessage(opCode, payload) -} - -// writePump pumps messages from the hub to the websocket connection. -func (c *connection) writePump() { - ticker := time.NewTicker(pingPeriod) - defer func() { - ticker.Stop() - c.ws.Close() - }() - for { - select { - case message, ok := <-c.send: - if !ok { - c.write(websocket.CloseMessage, []byte{}) - return - } - if err := c.write(websocket.TextMessage, message); err != nil { - return - } - case <-ticker.C: - if err := c.write(websocket.PingMessage, []byte{}); err != nil { - return - } - } - } -} - -type hub struct { - // Registered connections. - connections map[*connection]bool - - // Inbound messages from the connections. - broadcast chan []byte - - // Register requests from the connections. - register chan *connection - - // Unregister requests from connections. - unregister chan *connection -} - -var h = &hub{ - broadcast: make(chan []byte, maxMessageSize), - register: make(chan *connection, 1), - unregister: make(chan *connection, 1), - connections: make(map[*connection]bool), -} - -func (h *hub) run() { - for { - select { - case c := <-h.register: - h.connections[c] = true - case c := <-h.unregister: - delete(h.connections, c) - close(c.send) - case m := <-h.broadcast: - for c := range h.connections { - select { - case c.send <- m: - default: - close(c.send) - delete(h.connections, c) - } - } - } - } -} - -type WSController struct { - beego.Controller -} - -var upgrader = websocket.Upgrader{ - ReadBufferSize: 1024, - WriteBufferSize: 1024, -} - -func (w *WSController) Get() { - ws, err := upgrader.Upgrade(w.Ctx.ResponseWriter, w.Ctx.Request, nil) - if _, ok := err.(websocket.HandshakeError); ok { - http.Error(w.Ctx.ResponseWriter, "Not a websocket handshake", 400) - return - } else if err != nil { - return - } - c := &connection{send: make(chan []byte, 256), ws: ws, username: randomString(10)} - h.register <- c - go c.writePump() - c.readPump() -} - -func randomString(l int) string { - bytes := make([]byte, l) - for i := 0; i < l; i++ { - bytes[i] = byte(randInt(65, 90)) - } - return string(bytes) -} - -func randInt(min int, max int) int { - return min + rand.Intn(max-min) -} diff --git a/example/chat/main.go b/example/chat/main.go deleted file mode 100644 index be055b25..00000000 --- a/example/chat/main.go +++ /dev/null @@ -1,17 +0,0 @@ -// Beego (http://beego.me/) -// @description beego is an open-source, high-performance web framework for the Go programming language. -// @link http://github.com/astaxie/beego for the canonical source repository -// @license http://github.com/astaxie/beego/blob/master/LICENSE -// @authors Unknwon -package main - -import ( - "github.com/astaxie/beego" - "github.com/astaxie/beego/example/chat/controllers" -) - -func main() { - beego.Router("/", &controllers.MainController{}) - beego.Router("/ws", &controllers.WSController{}) - beego.Run() -} diff --git a/example/chat/views/index.tpl b/example/chat/views/index.tpl deleted file mode 100644 index 3a9d8838..00000000 --- a/example/chat/views/index.tpl +++ /dev/null @@ -1,92 +0,0 @@ - - - -Chat Example - - - - - -
-
- - -
- - \ No newline at end of file From 65fb7ce39133055a60ba3b28f17028c4d00c9c89 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 10 Sep 2015 16:35:40 +0800 Subject: [PATCH 205/436] golint grace --- grace/conn.go | 2 +- grace/grace.go | 47 +++++++++++++++++++++++++++++------------------ grace/listener.go | 16 ++++++++-------- grace/server.go | 39 ++++++++++++++++++++------------------- 4 files changed, 58 insertions(+), 46 deletions(-) diff --git a/grace/conn.go b/grace/conn.go index 2cf3a93d..c7b35b80 100644 --- a/grace/conn.go +++ b/grace/conn.go @@ -4,7 +4,7 @@ import "net" type graceConn struct { net.Conn - server *graceServer + server *Server } func (c graceConn) Close() error { diff --git a/grace/grace.go b/grace/grace.go index 33bf196c..b066a639 100644 --- a/grace/grace.go +++ b/grace/grace.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +// Package grace use to hot reload // Description: http://grisha.org/blog/2014/06/03/graceful-restart-in-golang/ // // Usage: @@ -52,26 +53,36 @@ import ( ) const ( - PRE_SIGNAL = iota - POST_SIGNAL + // PreSignal is the position to add filter before signal + PreSignal = iota + // PostSignal is the position to add filter after signal + PostSignal - STATE_INIT - STATE_RUNNING - STATE_SHUTTING_DOWN - STATE_TERMINATE + // StateInit represent the application inited + StateInit + // StateRunning represent the application is running + StateRunning + // StateShuttingDown represent the application is shutting down + StateShuttingDown + // StateTerminate represent the application is killed + StateTerminate ) var ( regLock *sync.Mutex - runningServers map[string]*graceServer + runningServers map[string]*Server runningServersOrder []string socketPtrOffsetMap map[string]uint runningServersForked bool - DefaultReadTimeOut time.Duration - DefaultWriteTimeOut time.Duration + // DefaultReadTimeOut is the HTTP read timeout + DefaultReadTimeOut time.Duration + // DefaultWriteTimeOut is the HTTP Write timeout + DefaultWriteTimeOut time.Duration + // DefaultMaxHeaderBytes is the Max HTTP Herder size, default is 0, no limit DefaultMaxHeaderBytes int - DefaultTimeout time.Duration + // DefaultTimeout is the shutdown server's timeout. default is 60s + DefaultTimeout time.Duration isChild bool socketOrder string @@ -81,7 +92,7 @@ func init() { regLock = &sync.Mutex{} flag.BoolVar(&isChild, "graceful", false, "listen on open fd (after forking)") flag.StringVar(&socketOrder, "socketorder", "", "previous initialization order - used when more than one listener was started") - runningServers = make(map[string]*graceServer) + runningServers = make(map[string]*Server) runningServersOrder = []string{} socketPtrOffsetMap = make(map[string]uint) @@ -91,7 +102,7 @@ func init() { } // NewServer returns a new graceServer. -func NewServer(addr string, handler http.Handler) (srv *graceServer) { +func NewServer(addr string, handler http.Handler) (srv *Server) { regLock.Lock() defer regLock.Unlock() if !flag.Parsed() { @@ -105,23 +116,23 @@ func NewServer(addr string, handler http.Handler) (srv *graceServer) { socketPtrOffsetMap[addr] = uint(len(runningServersOrder)) } - srv = &graceServer{ + srv = &Server{ wg: sync.WaitGroup{}, sigChan: make(chan os.Signal), isChild: isChild, SignalHooks: map[int]map[os.Signal][]func(){ - PRE_SIGNAL: map[os.Signal][]func(){ + PreSignal: map[os.Signal][]func(){ syscall.SIGHUP: []func(){}, syscall.SIGINT: []func(){}, syscall.SIGTERM: []func(){}, }, - POST_SIGNAL: map[os.Signal][]func(){ + PostSignal: map[os.Signal][]func(){ syscall.SIGHUP: []func(){}, syscall.SIGINT: []func(){}, syscall.SIGTERM: []func(){}, }, }, - state: STATE_INIT, + state: StateInit, Network: "tcp", } srv.Server = &http.Server{} @@ -137,13 +148,13 @@ func NewServer(addr string, handler http.Handler) (srv *graceServer) { return } -// refer http.ListenAndServe +// ListenAndServe refer http.ListenAndServe func ListenAndServe(addr string, handler http.Handler) error { server := NewServer(addr, handler) return server.ListenAndServe() } -// refer http.ListenAndServeTLS +// ListenAndServeTLS refer http.ListenAndServeTLS func ListenAndServeTLS(addr string, certFile string, keyFile string, handler http.Handler) error { server := NewServer(addr, handler) return server.ListenAndServeTLS(certFile, keyFile) diff --git a/grace/listener.go b/grace/listener.go index 8c5d4f9b..5439d0b2 100644 --- a/grace/listener.go +++ b/grace/listener.go @@ -11,10 +11,10 @@ type graceListener struct { net.Listener stop chan error stopped bool - server *graceServer + server *Server } -func newGraceListener(l net.Listener, srv *graceServer) (el *graceListener) { +func newGraceListener(l net.Listener, srv *Server) (el *graceListener) { el = &graceListener{ Listener: l, stop: make(chan error), @@ -46,17 +46,17 @@ func (gl *graceListener) Accept() (c net.Conn, err error) { return } -func (el *graceListener) Close() error { - if el.stopped { +func (gl *graceListener) Close() error { + if gl.stopped { return syscall.EINVAL } - el.stop <- nil - return <-el.stop + gl.stop <- nil + return <-gl.stop } -func (el *graceListener) File() *os.File { +func (gl *graceListener) File() *os.File { // returns a dup(2) - FD_CLOEXEC flag *not* set - tl := el.Listener.(*net.TCPListener) + tl := gl.Listener.(*net.TCPListener) fl, _ := tl.File() return fl } diff --git a/grace/server.go b/grace/server.go index aea8d7d3..f4512ded 100644 --- a/grace/server.go +++ b/grace/server.go @@ -15,7 +15,8 @@ import ( "time" ) -type graceServer struct { +// Server embedded http.Server +type Server struct { *http.Server GraceListener net.Listener SignalHooks map[int]map[os.Signal][]func() @@ -30,19 +31,19 @@ type graceServer struct { // Serve accepts incoming connections on the Listener l, // creating a new service goroutine for each. // The service goroutines read requests and then call srv.Handler to reply to them. -func (srv *graceServer) Serve() (err error) { - srv.state = STATE_RUNNING +func (srv *Server) Serve() (err error) { + srv.state = StateRunning err = srv.Server.Serve(srv.GraceListener) log.Println(syscall.Getpid(), "Waiting for connections to finish...") srv.wg.Wait() - srv.state = STATE_TERMINATE + srv.state = StateTerminate return } // ListenAndServe listens on the TCP network address srv.Addr and then calls Serve // to handle requests on incoming connections. If srv.Addr is blank, ":http" is // used. -func (srv *graceServer) ListenAndServe() (err error) { +func (srv *Server) ListenAndServe() (err error) { addr := srv.Addr if addr == "" { addr = ":http" @@ -83,7 +84,7 @@ func (srv *graceServer) ListenAndServe() (err error) { // CA's certificate. // // If srv.Addr is blank, ":https" is used. -func (srv *graceServer) ListenAndServeTLS(certFile, keyFile string) (err error) { +func (srv *Server) ListenAndServeTLS(certFile, keyFile string) (err error) { addr := srv.Addr if addr == "" { addr = ":https" @@ -131,9 +132,9 @@ func (srv *graceServer) ListenAndServeTLS(certFile, keyFile string) (err error) // getListener either opens a new socket to listen on, or takes the acceptor socket // it got passed when restarted. -func (srv *graceServer) getListener(laddr string) (l net.Listener, err error) { +func (srv *Server) getListener(laddr string) (l net.Listener, err error) { if srv.isChild { - var ptrOffset uint = 0 + var ptrOffset uint if len(socketPtrOffsetMap) > 0 { ptrOffset = socketPtrOffsetMap[laddr] log.Println("laddr", laddr, "ptr offset", socketPtrOffsetMap[laddr]) @@ -157,7 +158,7 @@ func (srv *graceServer) getListener(laddr string) (l net.Listener, err error) { // handleSignals listens for os Signals and calls any hooked in function that the // user had registered with the signal. -func (srv *graceServer) handleSignals() { +func (srv *Server) handleSignals() { var sig os.Signal signal.Notify( @@ -170,7 +171,7 @@ func (srv *graceServer) handleSignals() { pid := syscall.Getpid() for { sig = <-srv.sigChan - srv.signalHooks(PRE_SIGNAL, sig) + srv.signalHooks(PreSignal, sig) switch sig { case syscall.SIGHUP: log.Println(pid, "Received SIGHUP. forking.") @@ -187,11 +188,11 @@ func (srv *graceServer) handleSignals() { default: log.Printf("Received %v: nothing i care about...\n", sig) } - srv.signalHooks(POST_SIGNAL, sig) + srv.signalHooks(PostSignal, sig) } } -func (srv *graceServer) signalHooks(ppFlag int, sig os.Signal) { +func (srv *Server) signalHooks(ppFlag int, sig os.Signal) { if _, notSet := srv.SignalHooks[ppFlag][sig]; !notSet { return } @@ -204,12 +205,12 @@ func (srv *graceServer) signalHooks(ppFlag int, sig os.Signal) { // shutdown closes the listener so that no new connections are accepted. it also // starts a goroutine that will serverTimeout (stop all running requests) the server // after DefaultTimeout. -func (srv *graceServer) shutdown() { - if srv.state != STATE_RUNNING { +func (srv *Server) shutdown() { + if srv.state != StateRunning { return } - srv.state = STATE_SHUTTING_DOWN + srv.state = StateShuttingDown if DefaultTimeout >= 0 { go srv.serverTimeout(DefaultTimeout) } @@ -224,26 +225,26 @@ func (srv *graceServer) shutdown() { // serverTimeout forces the server to shutdown in a given timeout - whether it // finished outstanding requests or not. if Read/WriteTimeout are not set or the // max header size is very big a connection could hang -func (srv *graceServer) serverTimeout(d time.Duration) { +func (srv *Server) serverTimeout(d time.Duration) { defer func() { if r := recover(); r != nil { log.Println("WaitGroup at 0", r) } }() - if srv.state != STATE_SHUTTING_DOWN { + if srv.state != StateShuttingDown { return } time.Sleep(d) log.Println("[STOP - Hammer Time] Forcefully shutting down parent") for { - if srv.state == STATE_TERMINATE { + if srv.state == StateTerminate { break } srv.wg.Done() } } -func (srv *graceServer) fork() (err error) { +func (srv *Server) fork() (err error) { regLock.Lock() defer regLock.Unlock() if runningServersForked { From f6d46291036881a5a924d2532bff3df6aaca213e Mon Sep 17 00:00:00 2001 From: "David V. Wallin" Date: Thu, 10 Sep 2015 11:35:57 +0200 Subject: [PATCH 206/436] added a check to parser to not panic --- parser.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/parser.go b/parser.go index cf8dee22..7d55ffe3 100644 --- a/parser.go +++ b/parser.go @@ -77,7 +77,10 @@ func parserPkg(pkgRealpath, pkgpath string) error { switch specDecl := d.(type) { case *ast.FuncDecl: if specDecl.Recv != nil { - parserComments(specDecl.Doc, specDecl.Name.String(), fmt.Sprint(specDecl.Recv.List[0].Type.(*ast.StarExpr).X), pkgpath) + exp, ok := specDecl.Recv.List[0].Type.(*ast.StarExpr) // Check that the type is correct first beforing throwing to parser + if ok { + parserComments(specDecl.Doc, specDecl.Name.String(), fmt.Sprint(exp.X), pkgpath) + } } } } From 657995092a9772426b0a0fc90ee098e1957f7ea5 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 11 Sep 2015 22:28:28 +0800 Subject: [PATCH 207/436] golint httplib --- httplib/httplib.go | 129 ++++++++++++++++++++-------------------- httplib/httplib_test.go | 8 +-- 2 files changed, 70 insertions(+), 67 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index 72f7a625..dd59c18a 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +// Package httplib is used as http.Client // Usage: // // import "github.com/astaxie/beego/httplib" @@ -51,7 +52,7 @@ import ( "time" ) -var defaultSetting = BeegoHttpSettings{ +var defaultSetting = BeegoHTTPSettings{ UserAgent: "beegoServer", ConnectTimeout: 60 * time.Second, ReadWriteTimeout: 60 * time.Second, @@ -69,15 +70,15 @@ func createDefaultCookie() { defaultCookieJar, _ = cookiejar.New(nil) } -// Overwrite default settings -func SetDefaultSetting(setting BeegoHttpSettings) { +// SetDefaultSetting Overwrite default settings +func SetDefaultSetting(setting BeegoHTTPSettings) { settingMutex.Lock() defer settingMutex.Unlock() defaultSetting = setting } -// return *BeegoHttpRequest with specific method -func NewBeegoRequest(rawurl, method string) *BeegoHttpRequest { +// NewBeegoRequest return *BeegoHttpRequest with specific method +func NewBeegoRequest(rawurl, method string) *BeegoHTTPRequest { var resp http.Response u, err := url.Parse(rawurl) if err != nil { @@ -91,7 +92,7 @@ func NewBeegoRequest(rawurl, method string) *BeegoHttpRequest { ProtoMajor: 1, ProtoMinor: 1, } - return &BeegoHttpRequest{ + return &BeegoHTTPRequest{ url: rawurl, req: &req, params: map[string][]string{}, @@ -102,37 +103,37 @@ func NewBeegoRequest(rawurl, method string) *BeegoHttpRequest { } // Get returns *BeegoHttpRequest with GET method. -func Get(url string) *BeegoHttpRequest { +func Get(url string) *BeegoHTTPRequest { return NewBeegoRequest(url, "GET") } // Post returns *BeegoHttpRequest with POST method. -func Post(url string) *BeegoHttpRequest { +func Post(url string) *BeegoHTTPRequest { return NewBeegoRequest(url, "POST") } // Put returns *BeegoHttpRequest with PUT method. -func Put(url string) *BeegoHttpRequest { +func Put(url string) *BeegoHTTPRequest { return NewBeegoRequest(url, "PUT") } // Delete returns *BeegoHttpRequest DELETE method. -func Delete(url string) *BeegoHttpRequest { +func Delete(url string) *BeegoHTTPRequest { return NewBeegoRequest(url, "DELETE") } // Head returns *BeegoHttpRequest with HEAD method. -func Head(url string) *BeegoHttpRequest { +func Head(url string) *BeegoHTTPRequest { return NewBeegoRequest(url, "HEAD") } -// BeegoHttpSettings -type BeegoHttpSettings struct { +// BeegoHTTPSettings is the http.Client setting +type BeegoHTTPSettings struct { ShowDebug bool UserAgent string ConnectTimeout time.Duration ReadWriteTimeout time.Duration - TlsClientConfig *tls.Config + TLSClientConfig *tls.Config Proxy func(*http.Request) (*url.URL, error) Transport http.RoundTripper EnableCookie bool @@ -140,92 +141,92 @@ type BeegoHttpSettings struct { DumpBody bool } -// BeegoHttpRequest provides more useful methods for requesting one url than http.Request. -type BeegoHttpRequest struct { +// BeegoHTTPRequest provides more useful methods for requesting one url than http.Request. +type BeegoHTTPRequest struct { url string req *http.Request params map[string][]string files map[string]string - setting BeegoHttpSettings + setting BeegoHTTPSettings resp *http.Response body []byte dump []byte } -// get request -func (b *BeegoHttpRequest) GetRequest() *http.Request { +// GetRequest return the request object +func (b *BeegoHTTPRequest) GetRequest() *http.Request { return b.req } -// Change request settings -func (b *BeegoHttpRequest) Setting(setting BeegoHttpSettings) *BeegoHttpRequest { +// Setting Change request settings +func (b *BeegoHTTPRequest) Setting(setting BeegoHTTPSettings) *BeegoHTTPRequest { b.setting = setting return b } // SetBasicAuth sets the request's Authorization header to use HTTP Basic Authentication with the provided username and password. -func (b *BeegoHttpRequest) SetBasicAuth(username, password string) *BeegoHttpRequest { +func (b *BeegoHTTPRequest) SetBasicAuth(username, password string) *BeegoHTTPRequest { b.req.SetBasicAuth(username, password) return b } // SetEnableCookie sets enable/disable cookiejar -func (b *BeegoHttpRequest) SetEnableCookie(enable bool) *BeegoHttpRequest { +func (b *BeegoHTTPRequest) SetEnableCookie(enable bool) *BeegoHTTPRequest { b.setting.EnableCookie = enable return b } // SetUserAgent sets User-Agent header field -func (b *BeegoHttpRequest) SetUserAgent(useragent string) *BeegoHttpRequest { +func (b *BeegoHTTPRequest) SetUserAgent(useragent string) *BeegoHTTPRequest { b.setting.UserAgent = useragent return b } // Debug sets show debug or not when executing request. -func (b *BeegoHttpRequest) Debug(isdebug bool) *BeegoHttpRequest { +func (b *BeegoHTTPRequest) Debug(isdebug bool) *BeegoHTTPRequest { b.setting.ShowDebug = isdebug return b } -// Dump Body. -func (b *BeegoHttpRequest) DumpBody(isdump bool) *BeegoHttpRequest { +// DumpBody setting whether need to Dump the Body. +func (b *BeegoHTTPRequest) DumpBody(isdump bool) *BeegoHTTPRequest { b.setting.DumpBody = isdump return b } -// return the DumpRequest -func (b *BeegoHttpRequest) DumpRequest() []byte { +// DumpRequest return the DumpRequest +func (b *BeegoHTTPRequest) DumpRequest() []byte { return b.dump } // SetTimeout sets connect time out and read-write time out for BeegoRequest. -func (b *BeegoHttpRequest) SetTimeout(connectTimeout, readWriteTimeout time.Duration) *BeegoHttpRequest { +func (b *BeegoHTTPRequest) SetTimeout(connectTimeout, readWriteTimeout time.Duration) *BeegoHTTPRequest { b.setting.ConnectTimeout = connectTimeout b.setting.ReadWriteTimeout = readWriteTimeout return b } // SetTLSClientConfig sets tls connection configurations if visiting https url. -func (b *BeegoHttpRequest) SetTLSClientConfig(config *tls.Config) *BeegoHttpRequest { - b.setting.TlsClientConfig = config +func (b *BeegoHTTPRequest) SetTLSClientConfig(config *tls.Config) *BeegoHTTPRequest { + b.setting.TLSClientConfig = config return b } // Header add header item string in request. -func (b *BeegoHttpRequest) Header(key, value string) *BeegoHttpRequest { +func (b *BeegoHTTPRequest) Header(key, value string) *BeegoHTTPRequest { b.req.Header.Set(key, value) return b } -// Set HOST -func (b *BeegoHttpRequest) SetHost(host string) *BeegoHttpRequest { +// SetHost set the request host +func (b *BeegoHTTPRequest) SetHost(host string) *BeegoHTTPRequest { b.req.Host = host return b } -// Set the protocol version for incoming requests. +// SetProtocolVersion Set the protocol version for incoming requests. // Client requests always use HTTP/1.1. -func (b *BeegoHttpRequest) SetProtocolVersion(vers string) *BeegoHttpRequest { +func (b *BeegoHTTPRequest) SetProtocolVersion(vers string) *BeegoHTTPRequest { if len(vers) == 0 { vers = "HTTP/1.1" } @@ -241,32 +242,32 @@ func (b *BeegoHttpRequest) SetProtocolVersion(vers string) *BeegoHttpRequest { } // SetCookie add cookie into request. -func (b *BeegoHttpRequest) SetCookie(cookie *http.Cookie) *BeegoHttpRequest { +func (b *BeegoHTTPRequest) SetCookie(cookie *http.Cookie) *BeegoHTTPRequest { b.req.Header.Add("Cookie", cookie.String()) return b } -// Set transport to -func (b *BeegoHttpRequest) SetTransport(transport http.RoundTripper) *BeegoHttpRequest { +// SetTransport set the setting transport +func (b *BeegoHTTPRequest) SetTransport(transport http.RoundTripper) *BeegoHTTPRequest { b.setting.Transport = transport return b } -// Set http proxy +// SetProxy set the http proxy // example: // // func(req *http.Request) (*url.URL, error) { // u, _ := url.ParseRequestURI("http://127.0.0.1:8118") // return u, nil // } -func (b *BeegoHttpRequest) SetProxy(proxy func(*http.Request) (*url.URL, error)) *BeegoHttpRequest { +func (b *BeegoHTTPRequest) SetProxy(proxy func(*http.Request) (*url.URL, error)) *BeegoHTTPRequest { b.setting.Proxy = proxy return b } // Param adds query param in to request. // params build query string as ?key1=value1&key2=value2... -func (b *BeegoHttpRequest) Param(key, value string) *BeegoHttpRequest { +func (b *BeegoHTTPRequest) Param(key, value string) *BeegoHTTPRequest { if param, ok := b.params[key]; ok { b.params[key] = append(param, value) } else { @@ -275,14 +276,15 @@ func (b *BeegoHttpRequest) Param(key, value string) *BeegoHttpRequest { return b } -func (b *BeegoHttpRequest) PostFile(formname, filename string) *BeegoHttpRequest { +// PostFile add a post file to the request +func (b *BeegoHTTPRequest) PostFile(formname, filename string) *BeegoHTTPRequest { b.files[formname] = filename return b } // Body adds request raw body. // it supports string and []byte. -func (b *BeegoHttpRequest) Body(data interface{}) *BeegoHttpRequest { +func (b *BeegoHTTPRequest) Body(data interface{}) *BeegoHTTPRequest { switch t := data.(type) { case string: bf := bytes.NewBufferString(t) @@ -296,8 +298,8 @@ func (b *BeegoHttpRequest) Body(data interface{}) *BeegoHttpRequest { return b } -// JsonBody adds request raw body encoding by JSON. -func (b *BeegoHttpRequest) JsonBody(obj interface{}) (*BeegoHttpRequest, error) { +// JSONBody adds request raw body encoding by JSON. +func (b *BeegoHTTPRequest) JSONBody(obj interface{}) (*BeegoHTTPRequest, error) { if b.req.Body == nil && obj != nil { buf := bytes.NewBuffer(nil) enc := json.NewEncoder(buf) @@ -311,7 +313,7 @@ func (b *BeegoHttpRequest) JsonBody(obj interface{}) (*BeegoHttpRequest, error) return b, nil } -func (b *BeegoHttpRequest) buildUrl(paramBody string) { +func (b *BeegoHTTPRequest) buildURL(paramBody string) { // build GET url with query string if b.req.Method == "GET" && len(paramBody) > 0 { if strings.Index(b.url, "?") != -1 { @@ -366,11 +368,11 @@ func (b *BeegoHttpRequest) buildUrl(paramBody string) { } } -func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { +func (b *BeegoHTTPRequest) getResponse() (*http.Response, error) { if b.resp.StatusCode != 0 { return b.resp, nil } - resp, err := b.SendOut() + resp, err := b.DoRequest() if err != nil { return nil, err } @@ -378,7 +380,8 @@ func (b *BeegoHttpRequest) getResponse() (*http.Response, error) { return resp, nil } -func (b *BeegoHttpRequest) SendOut() (*http.Response, error) { +// DoRequest will do the client.Do +func (b *BeegoHTTPRequest) DoRequest() (*http.Response, error) { var paramBody string if len(b.params) > 0 { var buf bytes.Buffer @@ -394,7 +397,7 @@ func (b *BeegoHttpRequest) SendOut() (*http.Response, error) { paramBody = paramBody[0 : len(paramBody)-1] } - b.buildUrl(paramBody) + b.buildURL(paramBody) url, err := url.Parse(b.url) if err != nil { return nil, err @@ -407,7 +410,7 @@ func (b *BeegoHttpRequest) SendOut() (*http.Response, error) { if trans == nil { // create default transport trans = &http.Transport{ - TLSClientConfig: b.setting.TlsClientConfig, + TLSClientConfig: b.setting.TLSClientConfig, Proxy: b.setting.Proxy, Dial: TimeoutDialer(b.setting.ConnectTimeout, b.setting.ReadWriteTimeout), } @@ -415,7 +418,7 @@ func (b *BeegoHttpRequest) SendOut() (*http.Response, error) { // if b.transport is *http.Transport then set the settings. if t, ok := trans.(*http.Transport); ok { if t.TLSClientConfig == nil { - t.TLSClientConfig = b.setting.TlsClientConfig + t.TLSClientConfig = b.setting.TLSClientConfig } if t.Proxy == nil { t.Proxy = b.setting.Proxy @@ -426,7 +429,7 @@ func (b *BeegoHttpRequest) SendOut() (*http.Response, error) { } } - var jar http.CookieJar = nil + var jar http.CookieJar if b.setting.EnableCookie { if defaultCookieJar == nil { createDefaultCookie() @@ -455,7 +458,7 @@ func (b *BeegoHttpRequest) SendOut() (*http.Response, error) { // String returns the body string in response. // it calls Response inner. -func (b *BeegoHttpRequest) String() (string, error) { +func (b *BeegoHTTPRequest) String() (string, error) { data, err := b.Bytes() if err != nil { return "", err @@ -466,7 +469,7 @@ func (b *BeegoHttpRequest) String() (string, error) { // Bytes returns the body []byte in response. // it calls Response inner. -func (b *BeegoHttpRequest) Bytes() ([]byte, error) { +func (b *BeegoHTTPRequest) Bytes() ([]byte, error) { if b.body != nil { return b.body, nil } @@ -492,7 +495,7 @@ func (b *BeegoHttpRequest) Bytes() ([]byte, error) { // ToFile saves the body data in response to one file. // it calls Response inner. -func (b *BeegoHttpRequest) ToFile(filename string) error { +func (b *BeegoHTTPRequest) ToFile(filename string) error { f, err := os.Create(filename) if err != nil { return err @@ -511,9 +514,9 @@ func (b *BeegoHttpRequest) ToFile(filename string) error { return err } -// ToJson returns the map that marshals from the body bytes as json in response . +// ToJSON returns the map that marshals from the body bytes as json in response . // it calls Response inner. -func (b *BeegoHttpRequest) ToJson(v interface{}) error { +func (b *BeegoHTTPRequest) ToJSON(v interface{}) error { data, err := b.Bytes() if err != nil { return err @@ -521,9 +524,9 @@ func (b *BeegoHttpRequest) ToJson(v interface{}) error { return json.Unmarshal(data, v) } -// ToXml returns the map that marshals from the body bytes as xml in response . +// ToXML returns the map that marshals from the body bytes as xml in response . // it calls Response inner. -func (b *BeegoHttpRequest) ToXml(v interface{}) error { +func (b *BeegoHTTPRequest) ToXML(v interface{}) error { data, err := b.Bytes() if err != nil { return err @@ -532,7 +535,7 @@ func (b *BeegoHttpRequest) ToXml(v interface{}) error { } // Response executes request client gets response mannually. -func (b *BeegoHttpRequest) Response() (*http.Response, error) { +func (b *BeegoHTTPRequest) Response() (*http.Response, error) { return b.getResponse() } diff --git a/httplib/httplib_test.go b/httplib/httplib_test.go index 0b6b5779..05815054 100644 --- a/httplib/httplib_test.go +++ b/httplib/httplib_test.go @@ -150,7 +150,7 @@ func TestWithUserAgent(t *testing.T) { func TestWithSetting(t *testing.T) { v := "beego" - var setting BeegoHttpSettings + var setting BeegoHTTPSettings setting.EnableCookie = true setting.UserAgent = v setting.Transport = nil @@ -178,11 +178,11 @@ func TestToJson(t *testing.T) { t.Log(resp) // httpbin will return http remote addr - type Ip struct { + type IP struct { Origin string `json:"origin"` } - var ip Ip - err = req.ToJson(&ip) + var ip IP + err = req.ToJSON(&ip) if err != nil { t.Fatal(err) } From 34877c52a9d4d209791dd6a1c0eb6503fd5b3cb5 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 11 Sep 2015 23:08:24 +0800 Subject: [PATCH 208/436] golint logs --- logs/conn.go | 30 +++++++++---------- logs/console.go | 50 ++++++++++++++++---------------- logs/es/es.go | 6 +++- logs/file.go | 76 ++++++++++++++++++++++++------------------------- logs/log.go | 52 ++++++++++++++++----------------- logs/smtp.go | 43 +++++++++++++--------------- 6 files changed, 129 insertions(+), 128 deletions(-) diff --git a/logs/conn.go b/logs/conn.go index 2240eece..3655bf51 100644 --- a/logs/conn.go +++ b/logs/conn.go @@ -21,9 +21,9 @@ import ( "net" ) -// ConnWriter implements LoggerInterface. +// connWriter implements LoggerInterface. // it writes messages in keep-live tcp connection. -type ConnWriter struct { +type connWriter struct { lg *log.Logger innerWriter io.WriteCloser ReconnectOnMsg bool `json:"reconnectOnMsg"` @@ -33,22 +33,22 @@ type ConnWriter struct { Level int `json:"level"` } -// create new ConnWrite returning as LoggerInterface. -func NewConn() LoggerInterface { - conn := new(ConnWriter) +// NewConn create new ConnWrite returning as LoggerInterface. +func NewConn() Logger { + conn := new(connWriter) conn.Level = LevelTrace return conn } -// init connection writer with json config. +// Init init connection writer with json config. // json config only need key "level". -func (c *ConnWriter) Init(jsonconfig string) error { +func (c *connWriter) Init(jsonconfig string) error { return json.Unmarshal([]byte(jsonconfig), c) } -// write message in connection. +// WriteMsg write message in connection. // if connection is down, try to re-connect. -func (c *ConnWriter) WriteMsg(msg string, level int) error { +func (c *connWriter) WriteMsg(msg string, level int) error { if level > c.Level { return nil } @@ -66,19 +66,19 @@ func (c *ConnWriter) WriteMsg(msg string, level int) error { return nil } -// implementing method. empty. -func (c *ConnWriter) Flush() { +// Flush implementing method. empty. +func (c *connWriter) Flush() { } -// destroy connection writer and close tcp listener. -func (c *ConnWriter) Destroy() { +// Destroy destroy connection writer and close tcp listener. +func (c *connWriter) Destroy() { if c.innerWriter != nil { c.innerWriter.Close() } } -func (c *ConnWriter) connect() error { +func (c *connWriter) connect() error { if c.innerWriter != nil { c.innerWriter.Close() c.innerWriter = nil @@ -98,7 +98,7 @@ func (c *ConnWriter) connect() error { return nil } -func (c *ConnWriter) neddedConnectOnMsg() bool { +func (c *connWriter) neddedConnectOnMsg() bool { if c.Reconnect { c.Reconnect = false return true diff --git a/logs/console.go b/logs/console.go index ce7ecd54..23e8ebca 100644 --- a/logs/console.go +++ b/logs/console.go @@ -21,9 +21,11 @@ import ( "runtime" ) -type Brush func(string) string +// brush is a color join function +type brush func(string) string -func NewBrush(color string) Brush { +// newBrush return a fix color Brush +func newBrush(color string) brush { pre := "\033[" reset := "\033[0m" return func(text string) string { @@ -31,43 +33,43 @@ func NewBrush(color string) Brush { } } -var colors = []Brush{ - NewBrush("1;37"), // Emergency white - NewBrush("1;36"), // Alert cyan - NewBrush("1;35"), // Critical magenta - NewBrush("1;31"), // Error red - NewBrush("1;33"), // Warning yellow - NewBrush("1;32"), // Notice green - NewBrush("1;34"), // Informational blue - NewBrush("1;34"), // Debug blue +var colors = []brush{ + newBrush("1;37"), // Emergency white + newBrush("1;36"), // Alert cyan + newBrush("1;35"), // Critical magenta + newBrush("1;31"), // Error red + newBrush("1;33"), // Warning yellow + newBrush("1;32"), // Notice green + newBrush("1;34"), // Informational blue + newBrush("1;34"), // Debug blue } -// ConsoleWriter implements LoggerInterface and writes messages to terminal. -type ConsoleWriter struct { +// consoleWriter implements LoggerInterface and writes messages to terminal. +type consoleWriter struct { lg *log.Logger Level int `json:"level"` } -// create ConsoleWriter returning as LoggerInterface. -func NewConsole() LoggerInterface { - cw := &ConsoleWriter{ +// NewConsole create ConsoleWriter returning as LoggerInterface. +func NewConsole() Logger { + cw := &consoleWriter{ lg: log.New(os.Stdout, "", log.Ldate|log.Ltime), Level: LevelDebug, } return cw } -// init console logger. +// Init init console logger. // jsonconfig like '{"level":LevelTrace}'. -func (c *ConsoleWriter) Init(jsonconfig string) error { +func (c *consoleWriter) Init(jsonconfig string) error { if len(jsonconfig) == 0 { return nil } return json.Unmarshal([]byte(jsonconfig), c) } -// write message in console. -func (c *ConsoleWriter) WriteMsg(msg string, level int) error { +// WriteMsg write message in console. +func (c *consoleWriter) WriteMsg(msg string, level int) error { if level > c.Level { return nil } @@ -80,13 +82,13 @@ func (c *ConsoleWriter) WriteMsg(msg string, level int) error { return nil } -// implementing method. empty. -func (c *ConsoleWriter) Destroy() { +// Destroy implementing method. empty. +func (c *consoleWriter) Destroy() { } -// implementing method. empty. -func (c *ConsoleWriter) Flush() { +// Flush implementing method. empty. +func (c *consoleWriter) Flush() { } diff --git a/logs/es/es.go b/logs/es/es.go index 3a73d4dd..f8dc5f65 100644 --- a/logs/es/es.go +++ b/logs/es/es.go @@ -12,7 +12,8 @@ import ( "github.com/belogik/goes" ) -func NewES() logs.LoggerInterface { +// NewES return a LoggerInterface +func NewES() logs.Logger { cw := &esLogger{ Level: logs.LevelDebug, } @@ -46,6 +47,7 @@ func (el *esLogger) Init(jsonconfig string) error { return nil } +// WriteMsg will write the msg and level into es func (el *esLogger) WriteMsg(msg string, level int) error { if level > el.Level { return nil @@ -63,10 +65,12 @@ func (el *esLogger) WriteMsg(msg string, level int) error { return err } +// Destroy is a empty method func (el *esLogger) Destroy() { } +// Flush is a empty method func (el *esLogger) Flush() { } diff --git a/logs/file.go b/logs/file.go index 84a8c4f3..f201caf9 100644 --- a/logs/file.go +++ b/logs/file.go @@ -28,25 +28,25 @@ import ( "time" ) -// FileLogWriter implements LoggerInterface. +// fileLogWriter implements LoggerInterface. // It writes messages by lines limit, file size limit, or time frequency. -type FileLogWriter struct { +type fileLogWriter struct { *log.Logger mw *MuxWriter // The opened file Filename string `json:"filename"` - Maxlines int `json:"maxlines"` - maxlines_curlines int + Maxlines int `json:"maxlines"` + maxlinesCurlines int // Rotate at size - Maxsize int `json:"maxsize"` - maxsize_cursize int + Maxsize int `json:"maxsize"` + maxsizeCursize int // Rotate daily - Daily bool `json:"daily"` - Maxdays int64 `json:"maxdays"` - daily_opendate int + Daily bool `json:"daily"` + Maxdays int64 `json:"maxdays"` + dailyOpendate int Rotate bool `json:"rotate"` @@ -55,7 +55,7 @@ type FileLogWriter struct { Level int `json:"level"` } -// an *os.File writer with locker. +// MuxWriter is an *os.File writer with locker. type MuxWriter struct { sync.Mutex fd *os.File @@ -68,7 +68,7 @@ func (l *MuxWriter) Write(b []byte) (int, error) { return l.fd.Write(b) } -// set os.File in writer. +// SetFd set os.File in writer. func (l *MuxWriter) SetFd(fd *os.File) { if l.fd != nil { l.fd.Close() @@ -76,9 +76,9 @@ func (l *MuxWriter) SetFd(fd *os.File) { l.fd = fd } -// create a FileLogWriter returning as LoggerInterface. -func NewFileWriter() LoggerInterface { - w := &FileLogWriter{ +// NewFileWriter create a FileLogWriter returning as LoggerInterface. +func newFileWriter() Logger { + w := &fileLogWriter{ Filename: "", Maxlines: 1000000, Maxsize: 1 << 28, //256 MB @@ -104,7 +104,7 @@ func NewFileWriter() LoggerInterface { // "maxdays":15, // "rotate":true // } -func (w *FileLogWriter) Init(jsonconfig string) error { +func (w *fileLogWriter) Init(jsonconfig string) error { err := json.Unmarshal([]byte(jsonconfig), w) if err != nil { return err @@ -117,7 +117,7 @@ func (w *FileLogWriter) Init(jsonconfig string) error { } // start file logger. create log file and set to locker-inside file writer. -func (w *FileLogWriter) startLogger() error { +func (w *fileLogWriter) startLogger() error { fd, err := w.createLogFile() if err != nil { return err @@ -126,23 +126,23 @@ func (w *FileLogWriter) startLogger() error { return w.initFd() } -func (w *FileLogWriter) docheck(size int) { +func (w *fileLogWriter) docheck(size int) { w.startLock.Lock() defer w.startLock.Unlock() - if w.Rotate && ((w.Maxlines > 0 && w.maxlines_curlines >= w.Maxlines) || - (w.Maxsize > 0 && w.maxsize_cursize >= w.Maxsize) || - (w.Daily && time.Now().Day() != w.daily_opendate)) { + if w.Rotate && ((w.Maxlines > 0 && w.maxlinesCurlines >= w.Maxlines) || + (w.Maxsize > 0 && w.maxsizeCursize >= w.Maxsize) || + (w.Daily && time.Now().Day() != w.dailyOpendate)) { if err := w.DoRotate(); err != nil { fmt.Fprintf(os.Stderr, "FileLogWriter(%q): %s\n", w.Filename, err) return } } - w.maxlines_curlines++ - w.maxsize_cursize += size + w.maxlinesCurlines++ + w.maxsizeCursize += size } -// write logger message into file. -func (w *FileLogWriter) WriteMsg(msg string, level int) error { +// WriteMsg write logger message into file. +func (w *fileLogWriter) WriteMsg(msg string, level int) error { if level > w.Level { return nil } @@ -152,32 +152,32 @@ func (w *FileLogWriter) WriteMsg(msg string, level int) error { return nil } -func (w *FileLogWriter) createLogFile() (*os.File, error) { +func (w *fileLogWriter) createLogFile() (*os.File, error) { // Open the log file fd, err := os.OpenFile(w.Filename, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0660) return fd, err } -func (w *FileLogWriter) initFd() error { +func (w *fileLogWriter) initFd() error { fd := w.mw.fd finfo, err := fd.Stat() if err != nil { return fmt.Errorf("get stat err: %s\n", err) } - w.maxsize_cursize = int(finfo.Size()) - w.daily_opendate = time.Now().Day() - w.maxlines_curlines = 0 + w.maxsizeCursize = int(finfo.Size()) + w.dailyOpendate = time.Now().Day() + w.maxlinesCurlines = 0 if finfo.Size() > 0 { count, err := w.lines() if err != nil { return err } - w.maxlines_curlines = count + w.maxlinesCurlines = count } return nil } -func (w *FileLogWriter) lines() (int, error) { +func (w *fileLogWriter) lines() (int, error) { fd, err := os.Open(w.Filename) if err != nil { return 0, err @@ -206,7 +206,7 @@ func (w *FileLogWriter) lines() (int, error) { // DoRotate means it need to write file in new file. // new file name like xx.2013-01-01.2.log -func (w *FileLogWriter) DoRotate() error { +func (w *fileLogWriter) DoRotate() error { _, err := os.Lstat(w.Filename) if err == nil { // file exists // Find the next available number @@ -252,7 +252,7 @@ func (w *FileLogWriter) DoRotate() error { return nil } -func (w *FileLogWriter) deleteOldLog() { +func (w *fileLogWriter) deleteOldLog() { dir := filepath.Dir(w.Filename) filepath.Walk(dir, func(path string, info os.FileInfo, err error) (returnErr error) { defer func() { @@ -271,18 +271,18 @@ func (w *FileLogWriter) deleteOldLog() { }) } -// destroy file logger, close file writer. -func (w *FileLogWriter) Destroy() { +// Destroy close the file desciption, close file writer. +func (w *fileLogWriter) Destroy() { w.mw.fd.Close() } -// flush file logger. +// Flush flush file logger. // there are no buffering messages in file logger in memory. // flush file means sync file from disk. -func (w *FileLogWriter) Flush() { +func (w *fileLogWriter) Flush() { w.mw.fd.Sync() } func init() { - Register("file", NewFileWriter) + Register("file", newFileWriter) } diff --git a/logs/log.go b/logs/log.go index cebbc737..28b5937c 100644 --- a/logs/log.go +++ b/logs/log.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +// Package logs provide a general log interface // Usage: // // import "github.com/astaxie/beego/logs" @@ -60,10 +61,10 @@ const ( LevelWarn = LevelWarning ) -type loggerType func() LoggerInterface +type loggerType func() Logger -// LoggerInterface defines the behavior of a log provider. -type LoggerInterface interface { +// Logger defines the behavior of a log provider. +type Logger interface { Init(config string) error WriteMsg(msg string, level int) error Destroy() @@ -94,7 +95,7 @@ type BeeLogger struct { loggerFuncCallDepth int asynchronous bool msg chan *logMsg - outputs map[string]LoggerInterface + outputs map[string]Logger } type logMsg struct { @@ -110,10 +111,11 @@ func NewLogger(channellen int64) *BeeLogger { bl.level = LevelDebug bl.loggerFuncCallDepth = 2 bl.msg = make(chan *logMsg, channellen) - bl.outputs = make(map[string]LoggerInterface) + bl.outputs = make(map[string]Logger) return bl } +// Async set the log to asynchronous and start the goroutine func (bl *BeeLogger) Async() *BeeLogger { bl.asynchronous = true go bl.startLogger() @@ -139,7 +141,7 @@ func (bl *BeeLogger) SetLogger(adaptername string, config string) error { return nil } -// remove a logger adapter in BeeLogger. +// DelLogger remove a logger adapter in BeeLogger. func (bl *BeeLogger) DelLogger(adaptername string) error { bl.lock.Lock() defer bl.lock.Unlock() @@ -147,9 +149,8 @@ func (bl *BeeLogger) DelLogger(adaptername string) error { lg.Destroy() delete(bl.outputs, adaptername) return nil - } else { - return fmt.Errorf("logs: unknown adaptername %q (forgotten Register?)", adaptername) } + return fmt.Errorf("logs: unknown adaptername %q (forgotten Register?)", adaptername) } func (bl *BeeLogger) writerMsg(loglevel int, msg string) error { @@ -180,25 +181,24 @@ func (bl *BeeLogger) writerMsg(loglevel int, msg string) error { return nil } -// Set log message level. -// +// SetLevel Set log message level. // If message level (such as LevelDebug) is higher than logger level (such as LevelWarning), // log providers will not even be sent the message. func (bl *BeeLogger) SetLevel(l int) { bl.level = l } -// set log funcCallDepth +// SetLogFuncCallDepth set log funcCallDepth func (bl *BeeLogger) SetLogFuncCallDepth(d int) { bl.loggerFuncCallDepth = d } -// get log funcCallDepth for wrapper +// GetLogFuncCallDepth return log funcCallDepth for wrapper func (bl *BeeLogger) GetLogFuncCallDepth() int { return bl.loggerFuncCallDepth } -// enable log funcCallDepth +// EnableFuncCallDepth enable log funcCallDepth func (bl *BeeLogger) EnableFuncCallDepth(b bool) { bl.enableFuncCallDepth = b } @@ -219,7 +219,7 @@ func (bl *BeeLogger) startLogger() { } } -// Log EMERGENCY level message. +// Emergency Log EMERGENCY level message. func (bl *BeeLogger) Emergency(format string, v ...interface{}) { if LevelEmergency > bl.level { return @@ -228,7 +228,7 @@ func (bl *BeeLogger) Emergency(format string, v ...interface{}) { bl.writerMsg(LevelEmergency, msg) } -// Log ALERT level message. +// Alert Log ALERT level message. func (bl *BeeLogger) Alert(format string, v ...interface{}) { if LevelAlert > bl.level { return @@ -237,7 +237,7 @@ func (bl *BeeLogger) Alert(format string, v ...interface{}) { bl.writerMsg(LevelAlert, msg) } -// Log CRITICAL level message. +// Critical Log CRITICAL level message. func (bl *BeeLogger) Critical(format string, v ...interface{}) { if LevelCritical > bl.level { return @@ -246,7 +246,7 @@ func (bl *BeeLogger) Critical(format string, v ...interface{}) { bl.writerMsg(LevelCritical, msg) } -// Log ERROR level message. +// Error Log ERROR level message. func (bl *BeeLogger) Error(format string, v ...interface{}) { if LevelError > bl.level { return @@ -255,7 +255,7 @@ func (bl *BeeLogger) Error(format string, v ...interface{}) { bl.writerMsg(LevelError, msg) } -// Log WARNING level message. +// Warning Log WARNING level message. func (bl *BeeLogger) Warning(format string, v ...interface{}) { if LevelWarning > bl.level { return @@ -264,7 +264,7 @@ func (bl *BeeLogger) Warning(format string, v ...interface{}) { bl.writerMsg(LevelWarning, msg) } -// Log NOTICE level message. +// Notice Log NOTICE level message. func (bl *BeeLogger) Notice(format string, v ...interface{}) { if LevelNotice > bl.level { return @@ -273,7 +273,7 @@ func (bl *BeeLogger) Notice(format string, v ...interface{}) { bl.writerMsg(LevelNotice, msg) } -// Log INFORMATIONAL level message. +// Informational Log INFORMATIONAL level message. func (bl *BeeLogger) Informational(format string, v ...interface{}) { if LevelInformational > bl.level { return @@ -282,7 +282,7 @@ func (bl *BeeLogger) Informational(format string, v ...interface{}) { bl.writerMsg(LevelInformational, msg) } -// Log DEBUG level message. +// Debug Log DEBUG level message. func (bl *BeeLogger) Debug(format string, v ...interface{}) { if LevelDebug > bl.level { return @@ -291,7 +291,7 @@ func (bl *BeeLogger) Debug(format string, v ...interface{}) { bl.writerMsg(LevelDebug, msg) } -// Log WARN level message. +// Warn Log WARN level message. // compatibility alias for Warning() func (bl *BeeLogger) Warn(format string, v ...interface{}) { if LevelWarning > bl.level { @@ -301,7 +301,7 @@ func (bl *BeeLogger) Warn(format string, v ...interface{}) { bl.writerMsg(LevelWarning, msg) } -// Log INFO level message. +// Info Log INFO level message. // compatibility alias for Informational() func (bl *BeeLogger) Info(format string, v ...interface{}) { if LevelInformational > bl.level { @@ -311,7 +311,7 @@ func (bl *BeeLogger) Info(format string, v ...interface{}) { bl.writerMsg(LevelInformational, msg) } -// Log TRACE level message. +// Trace Log TRACE level message. // compatibility alias for Debug() func (bl *BeeLogger) Trace(format string, v ...interface{}) { if LevelDebug > bl.level { @@ -321,14 +321,14 @@ func (bl *BeeLogger) Trace(format string, v ...interface{}) { bl.writerMsg(LevelDebug, msg) } -// flush all chan data. +// Flush flush all chan data. func (bl *BeeLogger) Flush() { for _, l := range bl.outputs { l.Flush() } } -// close logger, flush all chan data and destroy all adapters in BeeLogger. +// Close close logger, flush all chan data and destroy all adapters in BeeLogger. func (bl *BeeLogger) Close() { for { if len(bl.msg) > 0 { diff --git a/logs/smtp.go b/logs/smtp.go index f9b292b7..aabb4581 100644 --- a/logs/smtp.go +++ b/logs/smtp.go @@ -24,13 +24,8 @@ import ( "time" ) -const ( -// no usage -// subjectPhrase = "Diagnostic message from server" -) - -// smtpWriter implements LoggerInterface and is used to send emails via given SMTP-server. -type SmtpWriter struct { +// SMTPWriter implements LoggerInterface and is used to send emails via given SMTP-server. +type SMTPWriter struct { Username string `json:"username"` Password string `json:"password"` Host string `json:"host"` @@ -40,12 +35,12 @@ type SmtpWriter struct { Level int `json:"level"` } -// create smtp writer. -func NewSmtpWriter() LoggerInterface { - return &SmtpWriter{Level: LevelTrace} +// NewSMTPWriter create smtp writer. +func newSMTPWriter() Logger { + return &SMTPWriter{Level: LevelTrace} } -// init smtp writer with json config. +// Init smtp writer with json config. // config like: // { // "Username":"example@gmail.com", @@ -56,7 +51,7 @@ func NewSmtpWriter() LoggerInterface { // "sendTos":["email1","email2"], // "level":LevelError // } -func (s *SmtpWriter) Init(jsonconfig string) error { +func (s *SMTPWriter) Init(jsonconfig string) error { err := json.Unmarshal([]byte(jsonconfig), s) if err != nil { return err @@ -64,7 +59,7 @@ func (s *SmtpWriter) Init(jsonconfig string) error { return nil } -func (s *SmtpWriter) GetSmtpAuth(host string) smtp.Auth { +func (s *SMTPWriter) getSMTPAuth(host string) smtp.Auth { if len(strings.Trim(s.Username, " ")) == 0 && len(strings.Trim(s.Password, " ")) == 0 { return nil } @@ -76,7 +71,7 @@ func (s *SmtpWriter) GetSmtpAuth(host string) smtp.Auth { ) } -func (s *SmtpWriter) sendMail(hostAddressWithPort string, auth smtp.Auth, fromAddress string, recipients []string, msgContent []byte) error { +func (s *SMTPWriter) sendMail(hostAddressWithPort string, auth smtp.Auth, fromAddress string, recipients []string, msgContent []byte) error { client, err := smtp.Dial(hostAddressWithPort) if err != nil { return err @@ -129,9 +124,9 @@ func (s *SmtpWriter) sendMail(hostAddressWithPort string, auth smtp.Auth, fromAd return nil } -// write message in smtp writer. +// WriteMsg write message in smtp writer. // it will send an email with subject and only this message. -func (s *SmtpWriter) WriteMsg(msg string, level int) error { +func (s *SMTPWriter) WriteMsg(msg string, level int) error { if level > s.Level { return nil } @@ -139,27 +134,27 @@ func (s *SmtpWriter) WriteMsg(msg string, level int) error { hp := strings.Split(s.Host, ":") // Set up authentication information. - auth := s.GetSmtpAuth(hp[0]) + auth := s.getSMTPAuth(hp[0]) // Connect to the server, authenticate, set the sender and recipient, // and send the email all in one step. - content_type := "Content-Type: text/plain" + "; charset=UTF-8" + contentType := "Content-Type: text/plain" + "; charset=UTF-8" mailmsg := []byte("To: " + strings.Join(s.RecipientAddresses, ";") + "\r\nFrom: " + s.FromAddress + "<" + s.FromAddress + - ">\r\nSubject: " + s.Subject + "\r\n" + content_type + "\r\n\r\n" + fmt.Sprintf(".%s", time.Now().Format("2006-01-02 15:04:05")) + msg) + ">\r\nSubject: " + s.Subject + "\r\n" + contentType + "\r\n\r\n" + fmt.Sprintf(".%s", time.Now().Format("2006-01-02 15:04:05")) + msg) return s.sendMail(s.Host, auth, s.FromAddress, s.RecipientAddresses, mailmsg) } -// implementing method. empty. -func (s *SmtpWriter) Flush() { +// Flush implementing method. empty. +func (s *SMTPWriter) Flush() { return } -// implementing method. empty. -func (s *SmtpWriter) Destroy() { +// Destroy implementing method. empty. +func (s *SMTPWriter) Destroy() { return } func init() { - Register("smtp", NewSmtpWriter) + Register("smtp", newSMTPWriter) } From 0a5fa0406271ec9614ea34e8a30a6b4d4f2ba20f Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 11 Sep 2015 23:09:37 +0800 Subject: [PATCH 209/436] remove i18n.go --- middleware/i18n.go | 71 ---------------------------------------------- 1 file changed, 71 deletions(-) delete mode 100644 middleware/i18n.go diff --git a/middleware/i18n.go b/middleware/i18n.go deleted file mode 100644 index f54b4bb5..00000000 --- a/middleware/i18n.go +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright 2014 beego Author. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Usage: -// -// import "github.com/astaxie/beego/middleware" -// -// I18N = middleware.NewLocale("conf/i18n.conf", beego.AppConfig.String("language")) -// -// more docs: http://beego.me/docs/module/i18n.md -package middleware - -import ( - "encoding/json" - "io/ioutil" - "os" -) - -type Translation struct { - filepath string - CurrentLocal string - Locales map[string]map[string]string -} - -func NewLocale(filepath string, defaultlocal string) *Translation { - file, err := os.Open(filepath) - if err != nil { - panic("open " + filepath + " err :" + err.Error()) - } - data, err := ioutil.ReadAll(file) - if err != nil { - panic("read " + filepath + " err :" + err.Error()) - } - - i18n := make(map[string]map[string]string) - if err = json.Unmarshal(data, &i18n); err != nil { - panic("json.Unmarshal " + filepath + " err :" + err.Error()) - } - return &Translation{ - filepath: filepath, - CurrentLocal: defaultlocal, - Locales: i18n, - } -} - -func (t *Translation) SetLocale(local string) { - t.CurrentLocal = local -} - -func (t *Translation) Translate(key string, local string) string { - if local == "" { - local = t.CurrentLocal - } - if ct, ok := t.Locales[key]; ok { - if v, o := ct[local]; o { - return v - } - } - return key -} From 542e143e558f73fd6536ce1548c631e950fdc7a4 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 11 Sep 2015 23:16:05 +0800 Subject: [PATCH 210/436] golint migration --- migration/ddl.go | 7 ++++++ migration/migration.go | 56 ++++++++++++++++++++---------------------- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/migration/ddl.go b/migration/ddl.go index f9b60117..51243337 100644 --- a/migration/ddl.go +++ b/migration/ddl.go @@ -14,33 +14,40 @@ package migration +// Table store the tablename and Column type Table struct { TableName string Columns []*Column } +// Create return the create sql func (t *Table) Create() string { return "" } +// Drop return the drop sql func (t *Table) Drop() string { return "" } +// Column define the columns name type and Default type Column struct { Name string Type string Default interface{} } +// Create return create sql with the provided tbname and columns func Create(tbname string, columns ...Column) string { return "" } +// Drop return the drop sql with the provided tbname and columns func Drop(tbname string, columns ...Column) string { return "" } +// TableDDL is still in think func TableDDL(tbname string, columns ...Column) string { return "" } diff --git a/migration/migration.go b/migration/migration.go index d64d60d3..2206569c 100644 --- a/migration/migration.go +++ b/migration/migration.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// migration package for migration +// Package migration is used for migration // // The table structure is as follow: // @@ -39,8 +39,8 @@ import ( // const the data format for the bee generate migration datatype const ( - M_DATE_FORMAT = "20060102_150405" - M_DB_DATE_FORMAT = "2006-01-02 15:04:05" + DateFormat = "20060102_150405" + DBDateFormat = "2006-01-02 15:04:05" ) // Migrationer is an interface for all Migration struct @@ -60,24 +60,24 @@ func init() { migrationMap = make(map[string]Migrationer) } -// the basic type which will implement the basic type +// Migration the basic type which will implement the basic type type Migration struct { sqls []string Created string } -// implement in the Inheritance struct for upgrade +// Up implement in the Inheritance struct for upgrade func (m *Migration) Up() { } -// implement in the Inheritance struct for down +// Down implement in the Inheritance struct for down func (m *Migration) Down() { } -// add sql want to execute -func (m *Migration) Sql(sql string) { +// SQL add sql want to execute +func (m *Migration) SQL(sql string) { m.sqls = append(m.sqls, sql) } @@ -86,7 +86,7 @@ func (m *Migration) Reset() { m.sqls = make([]string, 0) } -// execute the sql already add in the sql +// Exec execute the sql already add in the sql func (m *Migration) Exec(name, status string) error { o := orm.NewOrm() for _, s := range m.sqls { @@ -108,29 +108,28 @@ func (m *Migration) addOrUpdateRecord(name, status string) error { if err != nil { return nil } - _, err = p.Exec(status, strings.Join(m.sqls, "; "), time.Now().Format(M_DB_DATE_FORMAT), name) - return err - } else { - status = "update" - p, err := o.Raw("insert into migrations(`name`, `created_at`, `statements`, `status`) values(?,?,?,?)").Prepare() - if err != nil { - return err - } - _, err = p.Exec(name, time.Now().Format(M_DB_DATE_FORMAT), strings.Join(m.sqls, "; "), status) + _, err = p.Exec(status, strings.Join(m.sqls, "; "), time.Now().Format(DBDateFormat), name) return err } + status = "update" + p, err := o.Raw("insert into migrations(`name`, `created_at`, `statements`, `status`) values(?,?,?,?)").Prepare() + if err != nil { + return err + } + _, err = p.Exec(name, time.Now().Format(DBDateFormat), strings.Join(m.sqls, "; "), status) + return err } -// get the unixtime from the Created +// GetCreated get the unixtime from the Created func (m *Migration) GetCreated() int64 { - t, err := time.Parse(M_DATE_FORMAT, m.Created) + t, err := time.Parse(DateFormat, m.Created) if err != nil { return 0 } return t.Unix() } -// register the Migration in the map +// Register register the Migration in the map func Register(name string, m Migrationer) error { if _, ok := migrationMap[name]; ok { return errors.New("already exist name:" + name) @@ -139,7 +138,7 @@ func Register(name string, m Migrationer) error { return nil } -// upgrate the migration from lasttime +// Upgrade upgrate the migration from lasttime func Upgrade(lasttime int64) error { sm := sortMap(migrationMap) i := 0 @@ -163,7 +162,7 @@ func Upgrade(lasttime int64) error { return nil } -//rollback the migration by the name +// Rollback rollback the migration by the name func Rollback(name string) error { if v, ok := migrationMap[name]; ok { beego.Info("start rollback") @@ -178,14 +177,13 @@ func Rollback(name string) error { beego.Info("end rollback") time.Sleep(2 * time.Second) return nil - } else { - beego.Error("not exist the migrationMap name:" + name) - time.Sleep(2 * time.Second) - return errors.New("not exist the migrationMap name:" + name) } + beego.Error("not exist the migrationMap name:" + name) + time.Sleep(2 * time.Second) + return errors.New("not exist the migrationMap name:" + name) } -// reset all migration +// Reset reset all migration // run all migration's down function func Reset() error { sm := sortMap(migrationMap) @@ -214,7 +212,7 @@ func Reset() error { return nil } -// first Reset, then Upgrade +// Refresh first Reset, then Upgrade func Refresh() error { err := Reset() if err != nil { From 68ec133aa82a84e8b15f271fad890dc8fdd5c615 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sat, 12 Sep 2015 21:46:43 +0800 Subject: [PATCH 211/436] golint orm --- orm/cmd.go | 24 +++---- orm/cmd_utils.go | 37 +++++----- orm/db.go | 168 +++++++++++++++++++------------------------ orm/db_alias.go | 52 +++++++------- orm/db_mysql.go | 2 +- orm/db_postgres.go | 6 +- orm/db_sqlite.go | 2 +- orm/db_tables.go | 24 +++---- orm/db_utils.go | 15 ++-- orm/models.go | 10 +-- orm/models_boot.go | 23 +++--- orm/models_fields.go | 160 ++++++++++++++++++++++++++++------------- orm/models_info_f.go | 16 ++--- orm/models_info_m.go | 5 +- orm/models_test.go | 66 ++++++++--------- orm/orm.go | 15 ++-- orm/orm_conds.go | 21 +++--- orm/orm_log.go | 5 +- orm/orm_queryset.go | 41 +++++------ orm/orm_raw.go | 118 +++++++++++++++--------------- orm/orm_test.go | 148 +++++++++++++++++++------------------- orm/qb.go | 8 ++- orm/qb_mysql.go | 48 ++++++++++--- orm/types.go | 22 +++--- orm/utils.go | 39 +++++----- 25 files changed, 574 insertions(+), 501 deletions(-) diff --git a/orm/cmd.go b/orm/cmd.go index 2358ef3c..3638a75c 100644 --- a/orm/cmd.go +++ b/orm/cmd.go @@ -46,7 +46,7 @@ func printHelp(errs ...string) { os.Exit(2) } -// listen for orm command and then run it if command arguments passed. +// RunCommand listen for orm command and then run it if command arguments passed. func RunCommand() { if len(os.Args) < 2 || os.Args[1] != "orm" { return @@ -100,7 +100,7 @@ func (d *commandSyncDb) Parse(args []string) { func (d *commandSyncDb) Run() error { var drops []string if d.force { - drops = getDbDropSql(d.al) + drops = getDbDropSQL(d.al) } db := d.al.DB @@ -124,7 +124,7 @@ func (d *commandSyncDb) Run() error { } } - sqls, indexes := getDbCreateSql(d.al) + sqls, indexes := getDbCreateSQL(d.al) tables, err := d.al.DbBaser.GetTables(db) if err != nil { @@ -180,7 +180,7 @@ func (d *commandSyncDb) Run() error { fmt.Printf("create index `%s` for table `%s`\n", idx.Name, idx.Table) } - query := idx.Sql + query := idx.SQL _, err := db.Exec(query) if d.verbose { fmt.Printf(" %s\n", query) @@ -203,7 +203,7 @@ func (d *commandSyncDb) Run() error { queries := []string{sqls[i]} for _, idx := range indexes[mi.table] { - queries = append(queries, idx.Sql) + queries = append(queries, idx.SQL) } for _, query := range queries { @@ -228,12 +228,12 @@ func (d *commandSyncDb) Run() error { } // database creation commander interface implement. -type commandSqlAll struct { +type commandSQLAll struct { al *alias } // parse orm command line arguments. -func (d *commandSqlAll) Parse(args []string) { +func (d *commandSQLAll) Parse(args []string) { var name string flagSet := flag.NewFlagSet("orm command: sqlall", flag.ExitOnError) @@ -244,13 +244,13 @@ func (d *commandSqlAll) Parse(args []string) { } // run orm line command. -func (d *commandSqlAll) Run() error { - sqls, indexes := getDbCreateSql(d.al) +func (d *commandSQLAll) Run() error { + sqls, indexes := getDbCreateSQL(d.al) var all []string for i, mi := range modelCache.allOrdered() { queries := []string{sqls[i]} for _, idx := range indexes[mi.table] { - queries = append(queries, idx.Sql) + queries = append(queries, idx.SQL) } sql := strings.Join(queries, "\n") all = append(all, sql) @@ -262,10 +262,10 @@ func (d *commandSqlAll) Run() error { func init() { commands["syncdb"] = new(commandSyncDb) - commands["sqlall"] = new(commandSqlAll) + commands["sqlall"] = new(commandSQLAll) } -// run syncdb command line. +// RunSyncdb run syncdb command line. // name means table's alias name. default is "default". // force means run next sql if the current is error. // verbose means show all info when running command or not. diff --git a/orm/cmd_utils.go b/orm/cmd_utils.go index ea105624..5b40fd07 100644 --- a/orm/cmd_utils.go +++ b/orm/cmd_utils.go @@ -23,11 +23,11 @@ import ( type dbIndex struct { Table string Name string - Sql string + SQL string } // create database drop sql. -func getDbDropSql(al *alias) (sqls []string) { +func getDbDropSQL(al *alias) (sqls []string) { if len(modelCache.cache) == 0 { fmt.Println("no Model found, need register your model") os.Exit(2) @@ -65,7 +65,7 @@ checkColumn: case TypeIntegerField: col = T["int32"] case TypeBigIntegerField: - if al.Driver == DR_Sqlite { + if al.Driver == DRSqlite { fieldType = TypeIntegerField goto checkColumn } @@ -104,15 +104,15 @@ func getColumnAddQuery(al *alias, fi *fieldInfo) string { typ += " " + "NOT NULL" } - return fmt.Sprintf("ALTER TABLE %s%s%s ADD COLUMN %s%s%s %s %s", - Q, fi.mi.table, Q, - Q, fi.column, Q, + return fmt.Sprintf("ALTER TABLE %s%s%s ADD COLUMN %s%s%s %s %s", + Q, fi.mi.table, Q, + Q, fi.column, Q, typ, getColumnDefault(fi), ) } // create database creation string. -func getDbCreateSql(al *alias) (sqls []string, tableIndexes map[string][]dbIndex) { +func getDbCreateSQL(al *alias) (sqls []string, tableIndexes map[string][]dbIndex) { if len(modelCache.cache) == 0 { fmt.Println("no Model found, need register your model") os.Exit(2) @@ -142,7 +142,7 @@ func getDbCreateSql(al *alias) (sqls []string, tableIndexes map[string][]dbIndex if fi.auto { switch al.Driver { - case DR_Sqlite, DR_Postgres: + case DRSqlite, DRPostgres: column += T["auto"] default: column += col + " " + T["auto"] @@ -159,7 +159,7 @@ func getDbCreateSql(al *alias) (sqls []string, tableIndexes map[string][]dbIndex //if fi.initial.String() != "" { // column += " DEFAULT " + fi.initial.String() //} - + // Append attribute DEFAULT column += getColumnDefault(fi) @@ -201,7 +201,7 @@ func getDbCreateSql(al *alias) (sqls []string, tableIndexes map[string][]dbIndex sql += strings.Join(columns, ",\n") sql += "\n)" - if al.Driver == DR_MySQL { + if al.Driver == DRMySQL { var engine string if mi.model != nil { engine = getTableEngine(mi.addrField) @@ -237,7 +237,7 @@ func getDbCreateSql(al *alias) (sqls []string, tableIndexes map[string][]dbIndex index := dbIndex{} index.Table = mi.table index.Name = name - index.Sql = sql + index.SQL = sql tableIndexes[mi.table] = append(tableIndexes[mi.table], index) } @@ -247,7 +247,6 @@ func getDbCreateSql(al *alias) (sqls []string, tableIndexes map[string][]dbIndex return } - // Get string value for the attribute "DEFAULT" for the CREATE, ALTER commands func getColumnDefault(fi *fieldInfo) string { var ( @@ -263,16 +262,16 @@ func getColumnDefault(fi *fieldInfo) string { // These defaults will be useful if there no config value orm:"default" and NOT NULL is on switch fi.fieldType { - case TypeDateField, TypeDateTimeField: - return v; - - case TypeBooleanField, TypeBitField, TypeSmallIntegerField, TypeIntegerField, - TypeBigIntegerField, TypePositiveBitField, TypePositiveSmallIntegerField, + case TypeDateField, TypeDateTimeField: + return v + + case TypeBooleanField, TypeBitField, TypeSmallIntegerField, TypeIntegerField, + TypeBigIntegerField, TypePositiveBitField, TypePositiveSmallIntegerField, TypePositiveIntegerField, TypePositiveBigIntegerField, TypeFloatField, TypeDecimalField: - d = "0" + d = "0" } - + if fi.colDefault { if !fi.initial.Exist() { v = fmt.Sprintf(t, "") diff --git a/orm/db.go b/orm/db.go index 1803db4f..2f2c52da 100644 --- a/orm/db.go +++ b/orm/db.go @@ -24,12 +24,13 @@ import ( ) const ( - format_Date = "2006-01-02" - format_DateTime = "2006-01-02 15:04:05" + formatDate = "2006-01-02" + formatDateTime = "2006-01-02 15:04:05" ) var ( - ErrMissPK = errors.New("missed pk value") // missing pk error + // ErrMissPK missing pk error + ErrMissPK = errors.New("missed pk value") ) var ( @@ -216,14 +217,14 @@ func (d *dbBase) collectFieldValue(mi *modelInfo, fi *fieldInfo, ind reflect.Val } } if fi.null == false && value == nil { - return nil, errors.New(fmt.Sprintf("field `%s` cannot be NULL", fi.fullName)) + return nil, fmt.Errorf("field `%s` cannot be NULL", fi.fullName) } } } } switch fi.fieldType { case TypeDateField, TypeDateTimeField: - if fi.auto_now || fi.auto_now_add && insert { + if fi.autoNow || fi.autoNowAdd && insert { if insert { if t, ok := value.(time.Time); ok && !t.IsZero() { break @@ -282,13 +283,12 @@ func (d *dbBase) InsertStmt(stmt stmtQuerier, mi *modelInfo, ind reflect.Value, var id int64 err := row.Scan(&id) return id, err - } else { - if res, err := stmt.Exec(values...); err == nil { - return res.LastInsertId() - } else { - return 0, err - } } + res, err := stmt.Exec(values...) + if err == nil { + return res.LastInsertId() + } + return 0, err } // query sql ,read records and persist in dbBaser. @@ -339,15 +339,11 @@ func (d *dbBase) Read(q dbQuerier, mi *modelInfo, ind reflect.Value, tz *time.Lo return ErrNoRows } return err - } else { - elm := reflect.New(mi.addrField.Elem().Type()) - mind := reflect.Indirect(elm) - - d.setColsValues(mi, &mind, mi.fields.dbcols, refs, tz) - - ind.Set(mind) } - + elm := reflect.New(mi.addrField.Elem().Type()) + mind := reflect.Indirect(elm) + d.setColsValues(mi, &mind, mi.fields.dbcols, refs, tz) + ind.Set(mind) return nil } @@ -444,20 +440,19 @@ func (d *dbBase) InsertValue(q dbQuerier, mi *modelInfo, isMulti bool, names []s d.ins.ReplaceMarks(&query) if isMulti || !d.ins.HasReturningID(mi, &query) { - if res, err := q.Exec(query, values...); err == nil { + res, err := q.Exec(query, values...) + if err == nil { if isMulti { return res.RowsAffected() } return res.LastInsertId() - } else { - return 0, err } - } else { - row := q.QueryRow(query, values...) - var id int64 - err := row.Scan(&id) - return id, err + return 0, err } + row := q.QueryRow(query, values...) + var id int64 + err := row.Scan(&id) + return id, err } // execute update sql dbQuerier with given struct reflect.Value. @@ -495,9 +490,8 @@ func (d *dbBase) Update(q dbQuerier, mi *modelInfo, ind reflect.Value, tz *time. if res, err := q.Exec(query, setValues...); err == nil { return res.RowsAffected() - } else { - return 0, err } + return 0, err } // execute delete sql dbQuerier with given struct reflect.Value. @@ -513,14 +507,12 @@ func (d *dbBase) Delete(q dbQuerier, mi *modelInfo, ind reflect.Value, tz *time. query := fmt.Sprintf("DELETE FROM %s%s%s WHERE %s%s%s = ?", Q, mi.table, Q, Q, pkName, Q) d.ins.ReplaceMarks(&query) - - if res, err := q.Exec(query, pkValue); err == nil { - + res, err := q.Exec(query, pkValue) + if err == nil { num, err := res.RowsAffected() if err != nil { return 0, err } - if num > 0 { if mi.fields.pk.auto { if mi.fields.pk.fieldType&IsPostiveIntegerField > 0 { @@ -529,17 +521,14 @@ func (d *dbBase) Delete(q dbQuerier, mi *modelInfo, ind reflect.Value, tz *time. ind.Field(mi.fields.pk.fieldIndex).SetInt(0) } } - err := d.deleteRels(q, mi, []interface{}{pkValue}, tz) if err != nil { return num, err } } - return num, err - } else { - return 0, err } + return 0, err } // update table-related record by querySet. @@ -565,11 +554,11 @@ func (d *dbBase) UpdateBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Con tables.parseRelated(qs.related, qs.relDepth) } - where, args := tables.getCondSql(cond, false, tz) + where, args := tables.getCondSQL(cond, false, tz) values = append(values, args...) - join := tables.getJoinSql() + join := tables.getJoinSQL() var query, T string @@ -585,13 +574,13 @@ func (d *dbBase) UpdateBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Con col := fmt.Sprintf("%s%s%s%s", T, Q, v, Q) if c, ok := values[i].(colValue); ok { switch c.opt { - case Col_Add: + case ColAdd: cols = append(cols, col+" = "+col+" + ?") - case Col_Minus: + case ColMinus: cols = append(cols, col+" = "+col+" - ?") - case Col_Multiply: + case ColMultiply: cols = append(cols, col+" = "+col+" * ?") - case Col_Except: + case ColExcept: cols = append(cols, col+" = "+col+" / ?") } values[i] = c.value @@ -610,12 +599,11 @@ func (d *dbBase) UpdateBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Con } d.ins.ReplaceMarks(&query) - - if res, err := q.Exec(query, values...); err == nil { + res, err := q.Exec(query, values...) + if err == nil { return res.RowsAffected() - } else { - return 0, err } + return 0, err } // delete related records. @@ -624,23 +612,23 @@ func (d *dbBase) deleteRels(q dbQuerier, mi *modelInfo, args []interface{}, tz * for _, fi := range mi.fields.fieldsReverse { fi = fi.reverseFieldInfo switch fi.onDelete { - case od_CASCADE: + case odCascade: cond := NewCondition().And(fmt.Sprintf("%s__in", fi.name), args...) _, err := d.DeleteBatch(q, nil, fi.mi, cond, tz) if err != nil { return err } - case od_SET_DEFAULT, od_SET_NULL: + case odSetDefault, odSetNULL: cond := NewCondition().And(fmt.Sprintf("%s__in", fi.name), args...) params := Params{fi.column: nil} - if fi.onDelete == od_SET_DEFAULT { + if fi.onDelete == odSetDefault { params[fi.column] = fi.initial.String() } _, err := d.UpdateBatch(q, nil, fi.mi, cond, params, tz) if err != nil { return err } - case od_DO_NOTHING: + case odDoNothing: } } return nil @@ -661,8 +649,8 @@ func (d *dbBase) DeleteBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Con Q := d.ins.TableQuote() - where, args := tables.getCondSql(cond, false, tz) - join := tables.getJoinSql() + where, args := tables.getCondSQL(cond, false, tz) + join := tables.getJoinSQL() cols := fmt.Sprintf("T0.%s%s%s", Q, mi.fields.pk.column, Q) query := fmt.Sprintf("SELECT %s FROM %s%s%s T0 %s%s", cols, Q, mi.table, Q, join, where) @@ -670,16 +658,14 @@ func (d *dbBase) DeleteBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Con d.ins.ReplaceMarks(&query) var rs *sql.Rows - if r, err := q.Query(query, args...); err != nil { + r, err := q.Query(query, args...) + if err != nil { return 0, err - } else { - rs = r } - + rs = r defer rs.Close() var ref interface{} - args = make([]interface{}, 0) cnt := 0 for rs.Next() { @@ -702,24 +688,21 @@ func (d *dbBase) DeleteBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Con query = fmt.Sprintf("DELETE FROM %s%s%s WHERE %s%s%s %s", Q, mi.table, Q, Q, mi.fields.pk.column, Q, sql) d.ins.ReplaceMarks(&query) - - if res, err := q.Exec(query, args...); err == nil { + res, err := q.Exec(query, args...) + if err == nil { num, err := res.RowsAffected() if err != nil { return 0, err } - if num > 0 { err := d.deleteRels(q, mi, args, tz) if err != nil { return num, err } } - return num, nil - } else { - return 0, err } + return 0, err } // read related records. @@ -801,11 +784,11 @@ func (d *dbBase) ReadBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condi tables := newDbTables(mi, d.ins) tables.parseRelated(qs.related, qs.relDepth) - where, args := tables.getCondSql(cond, false, tz) - groupBy := tables.getGroupSql(qs.groups) - orderBy := tables.getOrderSql(qs.orders) - limit := tables.getLimitSql(mi, offset, rlimit) - join := tables.getJoinSql() + where, args := tables.getCondSQL(cond, false, tz) + groupBy := tables.getGroupSQL(qs.groups) + orderBy := tables.getOrderSQL(qs.orders) + limit := tables.getLimitSQL(mi, offset, rlimit) + join := tables.getJoinSQL() for _, tbl := range tables.tables { if tbl.sel { @@ -824,11 +807,11 @@ func (d *dbBase) ReadBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condi d.ins.ReplaceMarks(&query) var rs *sql.Rows - if r, err := q.Query(query, args...); err != nil { + r, err := q.Query(query, args...) + if err != nil { return 0, err - } else { - rs = r } + rs = r refs := make([]interface{}, colsNum) for i := range refs { @@ -942,9 +925,9 @@ func (d *dbBase) Count(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condition tables := newDbTables(mi, d.ins) tables.parseRelated(qs.related, qs.relDepth) - where, args := tables.getCondSql(cond, false, tz) - tables.getOrderSql(qs.orders) - join := tables.getJoinSql() + where, args := tables.getCondSQL(cond, false, tz) + tables.getOrderSQL(qs.orders) + join := tables.getJoinSQL() Q := d.ins.TableQuote() @@ -959,7 +942,7 @@ func (d *dbBase) Count(q dbQuerier, qs *querySet, mi *modelInfo, cond *Condition } // generate sql with replacing operator string placeholders and replaced values. -func (d *dbBase) GenerateOperatorSql(mi *modelInfo, fi *fieldInfo, operator string, args []interface{}, tz *time.Location) (string, []interface{}) { +func (d *dbBase) GenerateOperatorSQL(mi *modelInfo, fi *fieldInfo, operator string, args []interface{}, tz *time.Location) (string, []interface{}) { sql := "" params := getFlatParams(fi, args, tz) @@ -984,7 +967,7 @@ func (d *dbBase) GenerateOperatorSql(mi *modelInfo, fi *fieldInfo, operator stri if len(params) > 1 { panic(fmt.Errorf("operator `%s` need 1 args not %d", operator, len(params))) } - sql = d.ins.OperatorSql(operator) + sql = d.ins.OperatorSQL(operator) switch operator { case "exact": if arg == nil { @@ -1112,12 +1095,12 @@ setValue: ) if len(s) >= 19 { s = s[:19] - t, err = time.ParseInLocation(format_DateTime, s, tz) + t, err = time.ParseInLocation(formatDateTime, s, tz) } else { if len(s) > 10 { s = s[:10] } - t, err = time.ParseInLocation(format_Date, s, tz) + t, err = time.ParseInLocation(formatDate, s, tz) } t = t.In(DefaultTimeLoc) @@ -1448,25 +1431,22 @@ func (d *dbBase) ReadValues(q dbQuerier, qs *querySet, mi *modelInfo, cond *Cond } } - where, args := tables.getCondSql(cond, false, tz) - groupBy := tables.getGroupSql(qs.groups) - orderBy := tables.getOrderSql(qs.orders) - limit := tables.getLimitSql(mi, qs.offset, qs.limit) - join := tables.getJoinSql() + where, args := tables.getCondSQL(cond, false, tz) + groupBy := tables.getGroupSQL(qs.groups) + orderBy := tables.getOrderSQL(qs.orders) + limit := tables.getLimitSQL(mi, qs.offset, qs.limit) + join := tables.getJoinSQL() sels := strings.Join(cols, ", ") - query := fmt.Sprintf("SELECT %s FROM %s%s%s T0 %s%s%s%s%s", sels, Q, mi.table, Q, join, where, groupBy,orderBy, limit) + query := fmt.Sprintf("SELECT %s FROM %s%s%s T0 %s%s%s%s%s", sels, Q, mi.table, Q, join, where, groupBy, orderBy, limit) d.ins.ReplaceMarks(&query) - var rs *sql.Rows - if r, err := q.Query(query, args...); err != nil { + rs, err := q.Query(query, args...) + if err != nil { return 0, err - } else { - rs = r } - refs := make([]interface{}, len(cols)) for i := range refs { var ref interface{} @@ -1481,11 +1461,11 @@ func (d *dbBase) ReadValues(q dbQuerier, qs *querySet, mi *modelInfo, cond *Cond ) for rs.Next() { if cnt == 0 { - if cols, err := rs.Columns(); err != nil { + cols, err := rs.Columns() + if err != nil { return 0, err - } else { - columns = cols } + columns = cols } if err := rs.Scan(refs...); err != nil { @@ -1649,7 +1629,7 @@ func (d *dbBase) GetColumns(db dbQuerier, table string) (map[string][3]string, e } // not implement. -func (d *dbBase) OperatorSql(operator string) string { +func (d *dbBase) OperatorSQL(operator string) string { panic(ErrNotImplement) } diff --git a/orm/db_alias.go b/orm/db_alias.go index 0a862241..38302bc2 100644 --- a/orm/db_alias.go +++ b/orm/db_alias.go @@ -22,15 +22,16 @@ import ( "time" ) -// database driver constant int. +// DriverType database driver constant int. type DriverType int +// Enum the Database driver const ( - _ DriverType = iota // int enum type - DR_MySQL // mysql - DR_Sqlite // sqlite - DR_Oracle // oracle - DR_Postgres // pgsql + _ DriverType = iota // int enum type + DRMySQL // mysql + DRSqlite // sqlite + DROracle // oracle + DRPostgres // pgsql ) // database driver string. @@ -53,15 +54,15 @@ var _ Driver = new(driver) var ( dataBaseCache = &_dbCache{cache: make(map[string]*alias)} drivers = map[string]DriverType{ - "mysql": DR_MySQL, - "postgres": DR_Postgres, - "sqlite3": DR_Sqlite, + "mysql": DRMySQL, + "postgres": DRPostgres, + "sqlite3": DRSqlite, } dbBasers = map[DriverType]dbBaser{ - DR_MySQL: newdbBaseMysql(), - DR_Sqlite: newdbBaseSqlite(), - DR_Oracle: newdbBaseMysql(), - DR_Postgres: newdbBasePostgres(), + DRMySQL: newdbBaseMysql(), + DRSqlite: newdbBaseSqlite(), + DROracle: newdbBaseMysql(), + DRPostgres: newdbBasePostgres(), } ) @@ -119,7 +120,7 @@ func detectTZ(al *alias) { } switch al.Driver { - case DR_MySQL: + case DRMySQL: row := al.DB.QueryRow("SELECT TIMEDIFF(NOW(), UTC_TIMESTAMP)") var tz string row.Scan(&tz) @@ -147,10 +148,10 @@ func detectTZ(al *alias) { al.Engine = "INNODB" } - case DR_Sqlite: + case DRSqlite: al.TZ = time.UTC - case DR_Postgres: + case DRPostgres: row := al.DB.QueryRow("SELECT current_setting('TIMEZONE')") var tz string row.Scan(&tz) @@ -188,12 +189,13 @@ func addAliasWthDB(aliasName, driverName string, db *sql.DB) (*alias, error) { return al, nil } +// AddAliasWthDB add a aliasName for the drivename func AddAliasWthDB(aliasName, driverName string, db *sql.DB) error { _, err := addAliasWthDB(aliasName, driverName, db) return err } -// Setting the database connect params. Use the database driver self dataSource args. +// RegisterDataBase Setting the database connect params. Use the database driver self dataSource args. func RegisterDataBase(aliasName, driverName, dataSource string, params ...int) error { var ( err error @@ -236,7 +238,7 @@ end: return err } -// Register a database driver use specify driver name, this can be definition the driver is which database type. +// RegisterDriver Register a database driver use specify driver name, this can be definition the driver is which database type. func RegisterDriver(driverName string, typ DriverType) error { if t, ok := drivers[driverName]; ok == false { drivers[driverName] = typ @@ -248,7 +250,7 @@ func RegisterDriver(driverName string, typ DriverType) error { return nil } -// Change the database default used timezone +// SetDataBaseTZ Change the database default used timezone func SetDataBaseTZ(aliasName string, tz *time.Location) error { if al, ok := dataBaseCache.get(aliasName); ok { al.TZ = tz @@ -258,14 +260,14 @@ func SetDataBaseTZ(aliasName string, tz *time.Location) error { return nil } -// Change the max idle conns for *sql.DB, use specify database alias name +// SetMaxIdleConns Change the max idle conns for *sql.DB, use specify database alias name func SetMaxIdleConns(aliasName string, maxIdleConns int) { al := getDbAlias(aliasName) al.MaxIdleConns = maxIdleConns al.DB.SetMaxIdleConns(maxIdleConns) } -// Change the max open conns for *sql.DB, use specify database alias name +// SetMaxOpenConns Change the max open conns for *sql.DB, use specify database alias name func SetMaxOpenConns(aliasName string, maxOpenConns int) { al := getDbAlias(aliasName) al.MaxOpenConns = maxOpenConns @@ -275,7 +277,7 @@ func SetMaxOpenConns(aliasName string, maxOpenConns int) { } } -// Get *sql.DB from registered database by db alias name. +// GetDB Get *sql.DB from registered database by db alias name. // Use "default" as alias name if you not set. func GetDB(aliasNames ...string) (*sql.DB, error) { var name string @@ -284,9 +286,9 @@ func GetDB(aliasNames ...string) (*sql.DB, error) { } else { name = "default" } - if al, ok := dataBaseCache.get(name); ok { + al, ok := dataBaseCache.get(name) + if ok { return al.DB, nil - } else { - return nil, fmt.Errorf("DataBase of alias name `%s` not found\n", name) } + return nil, fmt.Errorf("DataBase of alias name `%s` not found\n", name) } diff --git a/orm/db_mysql.go b/orm/db_mysql.go index 182914a2..10fe2657 100644 --- a/orm/db_mysql.go +++ b/orm/db_mysql.go @@ -67,7 +67,7 @@ type dbBaseMysql struct { var _ dbBaser = new(dbBaseMysql) // get mysql operator. -func (d *dbBaseMysql) OperatorSql(operator string) string { +func (d *dbBaseMysql) OperatorSQL(operator string) string { return mysqlOperators[operator] } diff --git a/orm/db_postgres.go b/orm/db_postgres.go index 6500ef52..7dbef95a 100644 --- a/orm/db_postgres.go +++ b/orm/db_postgres.go @@ -66,7 +66,7 @@ type dbBasePostgres struct { var _ dbBaser = new(dbBasePostgres) // get postgresql operator. -func (d *dbBasePostgres) OperatorSql(operator string) string { +func (d *dbBasePostgres) OperatorSQL(operator string) string { return postgresOperators[operator] } @@ -101,7 +101,7 @@ func (d *dbBasePostgres) ReplaceMarks(query *string) { num := 0 for _, c := range q { if c == '?' { - num += 1 + num++ } } if num == 0 { @@ -114,7 +114,7 @@ func (d *dbBasePostgres) ReplaceMarks(query *string) { if c == '?' { data = append(data, '$') data = append(data, []byte(strconv.Itoa(num))...) - num += 1 + num++ } else { data = append(data, c) } diff --git a/orm/db_sqlite.go b/orm/db_sqlite.go index c2dcbb46..a3cb69a7 100644 --- a/orm/db_sqlite.go +++ b/orm/db_sqlite.go @@ -66,7 +66,7 @@ type dbBaseSqlite struct { var _ dbBaser = new(dbBaseSqlite) // get sqlite operator. -func (d *dbBaseSqlite) OperatorSql(operator string) string { +func (d *dbBaseSqlite) OperatorSQL(operator string) string { return sqliteOperators[operator] } diff --git a/orm/db_tables.go b/orm/db_tables.go index 245be891..cfe415e4 100644 --- a/orm/db_tables.go +++ b/orm/db_tables.go @@ -164,7 +164,7 @@ func (t *dbTables) parseRelated(rels []string, depth int) { } // generate join string. -func (t *dbTables) getJoinSql() (join string) { +func (t *dbTables) getJoinSQL() (join string) { Q := t.base.TableQuote() for _, jt := range t.tables { @@ -220,7 +220,7 @@ func (t *dbTables) parseExprs(mi *modelInfo, exprs []string) (index, name string ) num := len(exprs) - 1 - names := make([]string, 0) + var names []string inner := true @@ -326,7 +326,7 @@ loopFor: } // generate condition sql. -func (t *dbTables) getCondSql(cond *Condition, sub bool, tz *time.Location) (where string, params []interface{}) { +func (t *dbTables) getCondSQL(cond *Condition, sub bool, tz *time.Location) (where string, params []interface{}) { if cond == nil || cond.IsEmpty() { return } @@ -347,7 +347,7 @@ func (t *dbTables) getCondSql(cond *Condition, sub bool, tz *time.Location) (whe where += "NOT " } if p.isCond { - w, ps := t.getCondSql(p.cond, true, tz) + w, ps := t.getCondSQL(p.cond, true, tz) if w != "" { w = fmt.Sprintf("( %s) ", w) } @@ -372,12 +372,12 @@ func (t *dbTables) getCondSql(cond *Condition, sub bool, tz *time.Location) (whe operator = "exact" } - operSql, args := t.base.GenerateOperatorSql(mi, fi, operator, p.args, tz) + operSQL, args := t.base.GenerateOperatorSQL(mi, fi, operator, p.args, tz) leftCol := fmt.Sprintf("%s.%s%s%s", index, Q, fi.column, Q) t.base.GenerateOperatorLeftCol(fi, operator, &leftCol) - where += fmt.Sprintf("%s %s ", leftCol, operSql) + where += fmt.Sprintf("%s %s ", leftCol, operSQL) params = append(params, args...) } @@ -391,8 +391,8 @@ func (t *dbTables) getCondSql(cond *Condition, sub bool, tz *time.Location) (whe } // generate group sql. -func (t *dbTables) getGroupSql(groups []string) (groupSql string) { - if len(groups) == 0 { +func (t *dbTables) getGroupSQL(groups []string) (groupSQL string) { + if len(groups) == 0 { return } @@ -410,12 +410,12 @@ func (t *dbTables) getGroupSql(groups []string) (groupSql string) { groupSqls = append(groupSqls, fmt.Sprintf("%s.%s%s%s", index, Q, fi.column, Q)) } - groupSql = fmt.Sprintf("GROUP BY %s ", strings.Join(groupSqls, ", ")) + groupSQL = fmt.Sprintf("GROUP BY %s ", strings.Join(groupSqls, ", ")) return } // generate order sql. -func (t *dbTables) getOrderSql(orders []string) (orderSql string) { +func (t *dbTables) getOrderSQL(orders []string) (orderSQL string) { if len(orders) == 0 { return } @@ -439,12 +439,12 @@ func (t *dbTables) getOrderSql(orders []string) (orderSql string) { orderSqls = append(orderSqls, fmt.Sprintf("%s.%s%s%s %s", index, Q, fi.column, Q, asc)) } - orderSql = fmt.Sprintf("ORDER BY %s ", strings.Join(orderSqls, ", ")) + orderSQL = fmt.Sprintf("ORDER BY %s ", strings.Join(orderSqls, ", ")) return } // generate limit sql. -func (t *dbTables) getLimitSql(mi *modelInfo, offset int64, limit int64) (limits string) { +func (t *dbTables) getLimitSQL(mi *modelInfo, offset int64, limit int64) (limits string) { if limit == 0 { limit = int64(DefaultRowsLimit) } diff --git a/orm/db_utils.go b/orm/db_utils.go index 4a3ba464..ae9b1625 100644 --- a/orm/db_utils.go +++ b/orm/db_utils.go @@ -24,9 +24,8 @@ import ( func getDbAlias(name string) *alias { if al, ok := dataBaseCache.get(name); ok { return al - } else { - panic(fmt.Errorf("unknown DataBase alias name %s", name)) } + panic(fmt.Errorf("unknown DataBase alias name %s", name)) } // get pk column info. @@ -80,19 +79,19 @@ outFor: var err error if len(v) >= 19 { s := v[:19] - t, err = time.ParseInLocation(format_DateTime, s, DefaultTimeLoc) + t, err = time.ParseInLocation(formatDateTime, s, DefaultTimeLoc) } else { s := v if len(v) > 10 { s = v[:10] } - t, err = time.ParseInLocation(format_Date, s, tz) + t, err = time.ParseInLocation(formatDate, s, tz) } if err == nil { if fi.fieldType == TypeDateField { - v = t.In(tz).Format(format_Date) + v = t.In(tz).Format(formatDate) } else { - v = t.In(tz).Format(format_DateTime) + v = t.In(tz).Format(formatDateTime) } } } @@ -137,9 +136,9 @@ outFor: case reflect.Struct: if v, ok := arg.(time.Time); ok { if fi != nil && fi.fieldType == TypeDateField { - arg = v.In(tz).Format(format_Date) + arg = v.In(tz).Format(formatDate) } else { - arg = v.In(tz).Format(format_DateTime) + arg = v.In(tz).Format(formatDateTime) } } else { typ := val.Type() diff --git a/orm/models.go b/orm/models.go index dcb32b55..faf551be 100644 --- a/orm/models.go +++ b/orm/models.go @@ -19,10 +19,10 @@ import ( ) const ( - od_CASCADE = "cascade" - od_SET_NULL = "set_null" - od_SET_DEFAULT = "set_default" - od_DO_NOTHING = "do_nothing" + odCascade = "cascade" + odSetNULL = "set_null" + odSetDefault = "set_default" + odDoNothing = "do_nothing" defaultStructTagName = "orm" defaultStructTagDelim = ";" ) @@ -113,7 +113,7 @@ func (mc *_modelCache) clean() { mc.done = false } -// Clean model cache. Then you can re-RegisterModel. +// ResetModelCache Clean model cache. Then you can re-RegisterModel. // Common use this api for test case. func ResetModelCache() { modelCache.clean() diff --git a/orm/models_boot.go b/orm/models_boot.go index cb44bc05..808b7822 100644 --- a/orm/models_boot.go +++ b/orm/models_boot.go @@ -51,19 +51,16 @@ func registerModel(prefix string, model interface{}) { } info := newModelInfo(val) - if info.fields.pk == nil { outFor: for _, fi := range info.fields.fieldsDB { - if fi.name == "Id" { - if fi.sf.Tag.Get(defaultStructTagName) == "" { - switch fi.addrValue.Elem().Kind() { - case reflect.Int, reflect.Int32, reflect.Int64, reflect.Uint, reflect.Uint32, reflect.Uint64: - fi.auto = true - fi.pk = true - info.fields.pk = fi - break outFor - } + if strings.ToLower(fi.name) == "id" { + switch fi.addrValue.Elem().Kind() { + case reflect.Int, reflect.Int32, reflect.Int64, reflect.Uint, reflect.Uint32, reflect.Uint64: + fi.auto = true + fi.pk = true + info.fields.pk = fi + break outFor } } } @@ -298,12 +295,12 @@ end: } } -// register models +// RegisterModel register models func RegisterModel(models ...interface{}) { RegisterModelWithPrefix("", models...) } -// register models with a prefix +// RegisterModelWithPrefix register models with a prefix func RegisterModelWithPrefix(prefix string, models ...interface{}) { if modelCache.done { panic(fmt.Errorf("RegisterModel must be run before BootStrap")) @@ -314,7 +311,7 @@ func RegisterModelWithPrefix(prefix string, models ...interface{}) { } } -// bootrap models. +// BootStrap bootrap models. // make all model parsed and can not add more models func BootStrap() { if modelCache.done { diff --git a/orm/models_fields.go b/orm/models_fields.go index f038dd0f..a8cf8e4f 100644 --- a/orm/models_fields.go +++ b/orm/models_fields.go @@ -15,49 +15,28 @@ package orm import ( - "errors" "fmt" "strconv" "time" ) +// Define the Type enum const ( - // bool TypeBooleanField = 1 << iota - - // string TypeCharField - - // string TypeTextField - - // time.Time TypeDateField - // time.Time TypeDateTimeField - - // int8 TypeBitField - // int16 TypeSmallIntegerField - // int32 TypeIntegerField - // int64 TypeBigIntegerField - // uint8 TypePositiveBitField - // uint16 TypePositiveSmallIntegerField - // uint32 TypePositiveIntegerField - // uint64 TypePositiveBigIntegerField - - // float64 TypeFloatField - // float64 TypeDecimalField - RelForeignKey RelOneToOne RelManyToMany @@ -65,6 +44,7 @@ const ( RelReverseMany ) +// Define some logic enum const ( IsIntegerField = ^-TypePositiveBigIntegerField >> 4 << 5 IsPostiveIntegerField = ^-TypePositiveBigIntegerField >> 8 << 9 @@ -72,25 +52,30 @@ const ( IsFieldType = ^-RelReverseMany<<1 + 1 ) -// A true/false field. +// BooleanField A true/false field. type BooleanField bool +// Value return the BooleanField func (e BooleanField) Value() bool { return bool(e) } +// Set will set the BooleanField func (e *BooleanField) Set(d bool) { *e = BooleanField(d) } +// String format the Bool to string func (e *BooleanField) String() string { return strconv.FormatBool(e.Value()) } +// FieldType return BooleanField the type func (e *BooleanField) FieldType() int { return TypeBooleanField } +// SetRaw set the interface to bool func (e *BooleanField) SetRaw(value interface{}) error { switch d := value.(type) { case bool: @@ -102,56 +87,65 @@ func (e *BooleanField) SetRaw(value interface{}) error { } return err default: - return errors.New(fmt.Sprintf(" unknown value `%s`", value)) + return fmt.Errorf(" unknown value `%s`", value) } return nil } +// RawValue return the current value func (e *BooleanField) RawValue() interface{} { return e.Value() } +// verify the BooleanField implement the Fielder interface var _ Fielder = new(BooleanField) -// A string field +// CharField A string field // required values tag: size // The size is enforced at the database level and in models’s validation. // eg: `orm:"size(120)"` type CharField string +// Value return the CharField's Value func (e CharField) Value() string { return string(e) } +// Set CharField value func (e *CharField) Set(d string) { *e = CharField(d) } +// String return the CharField func (e *CharField) String() string { return e.Value() } +// FieldType return the enum type func (e *CharField) FieldType() int { return TypeCharField } +// SetRaw set the interface to string func (e *CharField) SetRaw(value interface{}) error { switch d := value.(type) { case string: e.Set(d) default: - return errors.New(fmt.Sprintf(" unknown value `%s`", value)) + return fmt.Errorf(" unknown value `%s`", value) } return nil } +// RawValue return the CharField value func (e *CharField) RawValue() interface{} { return e.Value() } +// verify CharField implement Fielder var _ Fielder = new(CharField) -// A date, represented in go by a time.Time instance. +// DateField A date, represented in go by a time.Time instance. // only date values like 2006-01-02 // Has a few extra, optional attr tag: // @@ -166,106 +160,125 @@ var _ Fielder = new(CharField) // eg: `orm:"auto_now"` or `orm:"auto_now_add"` type DateField time.Time +// Value return the time.Time func (e DateField) Value() time.Time { return time.Time(e) } +// Set set the DateField's value func (e *DateField) Set(d time.Time) { *e = DateField(d) } +// String convert datatime to string func (e *DateField) String() string { return e.Value().String() } +// FieldType return enum type Date func (e *DateField) FieldType() int { return TypeDateField } +// SetRaw convert the interface to time.Time. Allow string and time.Time func (e *DateField) SetRaw(value interface{}) error { switch d := value.(type) { case time.Time: e.Set(d) case string: - v, err := timeParse(d, format_Date) + v, err := timeParse(d, formatDate) if err != nil { e.Set(v) } return err default: - return errors.New(fmt.Sprintf(" unknown value `%s`", value)) + return fmt.Errorf(" unknown value `%s`", value) } return nil } +// RawValue return Date value func (e *DateField) RawValue() interface{} { return e.Value() } +// verify DateField implement fielder interface var _ Fielder = new(DateField) -// A date, represented in go by a time.Time instance. +// DateTimeField A date, represented in go by a time.Time instance. // datetime values like 2006-01-02 15:04:05 // Takes the same extra arguments as DateField. type DateTimeField time.Time +// Value return the datatime value func (e DateTimeField) Value() time.Time { return time.Time(e) } +// Set set the time.Time to datatime func (e *DateTimeField) Set(d time.Time) { *e = DateTimeField(d) } +// String return the time's String func (e *DateTimeField) String() string { return e.Value().String() } +// FieldType return the enum TypeDateTimeField func (e *DateTimeField) FieldType() int { return TypeDateTimeField } +// SetRaw convert the string or time.Time to DateTimeField func (e *DateTimeField) SetRaw(value interface{}) error { switch d := value.(type) { case time.Time: e.Set(d) case string: - v, err := timeParse(d, format_DateTime) + v, err := timeParse(d, formatDateTime) if err != nil { e.Set(v) } return err default: - return errors.New(fmt.Sprintf(" unknown value `%s`", value)) + return fmt.Errorf(" unknown value `%s`", value) } return nil } +// RawValue return the datatime value func (e *DateTimeField) RawValue() interface{} { return e.Value() } +// verify datatime implement fielder var _ Fielder = new(DateTimeField) -// A floating-point number represented in go by a float32 value. +// FloatField A floating-point number represented in go by a float32 value. type FloatField float64 +// Value return the FloatField value func (e FloatField) Value() float64 { return float64(e) } +// Set the Float64 func (e *FloatField) Set(d float64) { *e = FloatField(d) } +// String return the string func (e *FloatField) String() string { return ToStr(e.Value(), -1, 32) } +// FieldType return the enum type func (e *FloatField) FieldType() int { return TypeFloatField } +// SetRaw converter interface Float64 float32 or string to FloatField func (e *FloatField) SetRaw(value interface{}) error { switch d := value.(type) { case float32: @@ -278,36 +291,43 @@ func (e *FloatField) SetRaw(value interface{}) error { e.Set(v) } default: - return errors.New(fmt.Sprintf(" unknown value `%s`", value)) + return fmt.Errorf(" unknown value `%s`", value) } return nil } +// RawValue return the FloatField value func (e *FloatField) RawValue() interface{} { return e.Value() } +// verify FloatField implement Fielder var _ Fielder = new(FloatField) -// -32768 to 32767 +// SmallIntegerField -32768 to 32767 type SmallIntegerField int16 +// Value return int16 value func (e SmallIntegerField) Value() int16 { return int16(e) } +// Set the SmallIntegerField value func (e *SmallIntegerField) Set(d int16) { *e = SmallIntegerField(d) } +// String convert smallint to string func (e *SmallIntegerField) String() string { return ToStr(e.Value()) } +// FieldType return enum type SmallIntegerField func (e *SmallIntegerField) FieldType() int { return TypeSmallIntegerField } +// SetRaw convert interface int16/string to int16 func (e *SmallIntegerField) SetRaw(value interface{}) error { switch d := value.(type) { case int16: @@ -318,36 +338,43 @@ func (e *SmallIntegerField) SetRaw(value interface{}) error { e.Set(v) } default: - return errors.New(fmt.Sprintf(" unknown value `%s`", value)) + return fmt.Errorf(" unknown value `%s`", value) } return nil } +// RawValue return smallint value func (e *SmallIntegerField) RawValue() interface{} { return e.Value() } +// verify SmallIntegerField implement Fielder var _ Fielder = new(SmallIntegerField) -// -2147483648 to 2147483647 +// IntegerField -2147483648 to 2147483647 type IntegerField int32 +// Value return the int32 func (e IntegerField) Value() int32 { return int32(e) } +// Set IntegerField value func (e *IntegerField) Set(d int32) { *e = IntegerField(d) } +// String convert Int32 to string func (e *IntegerField) String() string { return ToStr(e.Value()) } +// FieldType return the enum type func (e *IntegerField) FieldType() int { return TypeIntegerField } +// SetRaw convert interface int32/string to int32 func (e *IntegerField) SetRaw(value interface{}) error { switch d := value.(type) { case int32: @@ -358,36 +385,43 @@ func (e *IntegerField) SetRaw(value interface{}) error { e.Set(v) } default: - return errors.New(fmt.Sprintf(" unknown value `%s`", value)) + return fmt.Errorf(" unknown value `%s`", value) } return nil } +// RawValue return IntegerField value func (e *IntegerField) RawValue() interface{} { return e.Value() } +// verify IntegerField implement Fielder var _ Fielder = new(IntegerField) -// -9223372036854775808 to 9223372036854775807. +// BigIntegerField -9223372036854775808 to 9223372036854775807. type BigIntegerField int64 +// Value return int64 func (e BigIntegerField) Value() int64 { return int64(e) } +// Set the BigIntegerField value func (e *BigIntegerField) Set(d int64) { *e = BigIntegerField(d) } +// String convert BigIntegerField to string func (e *BigIntegerField) String() string { return ToStr(e.Value()) } +// FieldType return enum type func (e *BigIntegerField) FieldType() int { return TypeBigIntegerField } +// SetRaw convert interface int64/string to int64 func (e *BigIntegerField) SetRaw(value interface{}) error { switch d := value.(type) { case int64: @@ -398,36 +432,43 @@ func (e *BigIntegerField) SetRaw(value interface{}) error { e.Set(v) } default: - return errors.New(fmt.Sprintf(" unknown value `%s`", value)) + return fmt.Errorf(" unknown value `%s`", value) } return nil } +// RawValue return BigIntegerField value func (e *BigIntegerField) RawValue() interface{} { return e.Value() } +// verify BigIntegerField implement Fielder var _ Fielder = new(BigIntegerField) -// 0 to 65535 +// PositiveSmallIntegerField 0 to 65535 type PositiveSmallIntegerField uint16 +// Value return uint16 func (e PositiveSmallIntegerField) Value() uint16 { return uint16(e) } +// Set PositiveSmallIntegerField value func (e *PositiveSmallIntegerField) Set(d uint16) { *e = PositiveSmallIntegerField(d) } +// String convert uint16 to string func (e *PositiveSmallIntegerField) String() string { return ToStr(e.Value()) } +// FieldType return enum type func (e *PositiveSmallIntegerField) FieldType() int { return TypePositiveSmallIntegerField } +// SetRaw convert Interface uint16/string to uint16 func (e *PositiveSmallIntegerField) SetRaw(value interface{}) error { switch d := value.(type) { case uint16: @@ -438,36 +479,43 @@ func (e *PositiveSmallIntegerField) SetRaw(value interface{}) error { e.Set(v) } default: - return errors.New(fmt.Sprintf(" unknown value `%s`", value)) + return fmt.Errorf(" unknown value `%s`", value) } return nil } +// RawValue returns PositiveSmallIntegerField value func (e *PositiveSmallIntegerField) RawValue() interface{} { return e.Value() } +// verify PositiveSmallIntegerField implement Fielder var _ Fielder = new(PositiveSmallIntegerField) -// 0 to 4294967295 +// PositiveIntegerField 0 to 4294967295 type PositiveIntegerField uint32 +// Value return PositiveIntegerField value. Uint32 func (e PositiveIntegerField) Value() uint32 { return uint32(e) } +// Set the PositiveIntegerField value func (e *PositiveIntegerField) Set(d uint32) { *e = PositiveIntegerField(d) } +// String convert PositiveIntegerField to string func (e *PositiveIntegerField) String() string { return ToStr(e.Value()) } +// FieldType return enum type func (e *PositiveIntegerField) FieldType() int { return TypePositiveIntegerField } +// SetRaw convert interface uint32/string to Uint32 func (e *PositiveIntegerField) SetRaw(value interface{}) error { switch d := value.(type) { case uint32: @@ -478,36 +526,43 @@ func (e *PositiveIntegerField) SetRaw(value interface{}) error { e.Set(v) } default: - return errors.New(fmt.Sprintf(" unknown value `%s`", value)) + return fmt.Errorf(" unknown value `%s`", value) } return nil } +// RawValue return the PositiveIntegerField Value func (e *PositiveIntegerField) RawValue() interface{} { return e.Value() } +// verify PositiveIntegerField implement Fielder var _ Fielder = new(PositiveIntegerField) -// 0 to 18446744073709551615 +// PositiveBigIntegerField 0 to 18446744073709551615 type PositiveBigIntegerField uint64 +// Value return uint64 func (e PositiveBigIntegerField) Value() uint64 { return uint64(e) } +// Set PositiveBigIntegerField value func (e *PositiveBigIntegerField) Set(d uint64) { *e = PositiveBigIntegerField(d) } +// String convert PositiveBigIntegerField to string func (e *PositiveBigIntegerField) String() string { return ToStr(e.Value()) } +// FieldType return enum type func (e *PositiveBigIntegerField) FieldType() int { return TypePositiveIntegerField } +// SetRaw convert interface uint64/string to Uint64 func (e *PositiveBigIntegerField) SetRaw(value interface{}) error { switch d := value.(type) { case uint64: @@ -518,48 +573,57 @@ func (e *PositiveBigIntegerField) SetRaw(value interface{}) error { e.Set(v) } default: - return errors.New(fmt.Sprintf(" unknown value `%s`", value)) + return fmt.Errorf(" unknown value `%s`", value) } return nil } +// RawValue return PositiveBigIntegerField value func (e *PositiveBigIntegerField) RawValue() interface{} { return e.Value() } +// verify PositiveBigIntegerField implement Fielder var _ Fielder = new(PositiveBigIntegerField) -// A large text field. +// TextField A large text field. type TextField string +// Value return TextField value func (e TextField) Value() string { return string(e) } +// Set the TextField value func (e *TextField) Set(d string) { *e = TextField(d) } +// String convert TextField to string func (e *TextField) String() string { return e.Value() } +// FieldType return enum type func (e *TextField) FieldType() int { return TypeTextField } +// SetRaw convert interface string to string func (e *TextField) SetRaw(value interface{}) error { switch d := value.(type) { case string: e.Set(d) default: - return errors.New(fmt.Sprintf(" unknown value `%s`", value)) + return fmt.Errorf(" unknown value `%s`", value) } return nil } +// RawValue return TextField value func (e *TextField) RawValue() interface{} { return e.Value() } +// verify TextField implement Fielder var _ Fielder = new(TextField) diff --git a/orm/models_info_f.go b/orm/models_info_f.go index 84a0c024..66dcc23a 100644 --- a/orm/models_info_f.go +++ b/orm/models_info_f.go @@ -119,8 +119,8 @@ type fieldInfo struct { colDefault bool initial StrTo size int - auto_now bool - auto_now_add bool + autoNow bool + autoNowAdd bool rel bool reverse bool reverseField string @@ -309,20 +309,20 @@ checkType: if fi.rel && fi.dbcol { switch onDelete { - case od_CASCADE, od_DO_NOTHING: - case od_SET_DEFAULT: + case odCascade, odDoNothing: + case odSetDefault: if initial.Exist() == false { err = errors.New("on_delete: set_default need set field a default value") goto end } - case od_SET_NULL: + case odSetNULL: if fi.null == false { err = errors.New("on_delete: set_null need set field null") goto end } default: if onDelete == "" { - onDelete = od_CASCADE + onDelete = odCascade } else { err = fmt.Errorf("on_delete value expected choice in `cascade,set_null,set_default,do_nothing`, unknown `%s`", onDelete) goto end @@ -350,9 +350,9 @@ checkType: fi.unique = false case TypeDateField, TypeDateTimeField: if attrs["auto_now"] { - fi.auto_now = true + fi.autoNow = true } else if attrs["auto_now_add"] { - fi.auto_now_add = true + fi.autoNowAdd = true } case TypeFloatField: case TypeDecimalField: diff --git a/orm/models_info_m.go b/orm/models_info_m.go index 3600ee7c..2654cdb5 100644 --- a/orm/models_info_m.go +++ b/orm/models_info_m.go @@ -15,7 +15,6 @@ package orm import ( - "errors" "fmt" "os" "reflect" @@ -72,13 +71,13 @@ func newModelInfo(val reflect.Value) (info *modelInfo) { added := info.fields.Add(fi) if added == false { - err = errors.New(fmt.Sprintf("duplicate column name: %s", fi.column)) + err = fmt.Errorf("duplicate column name: %s", fi.column) break } if fi.pk { if info.fields.pk != nil { - err = errors.New(fmt.Sprintf("one model must have one pk field only")) + err = fmt.Errorf("one model must have one pk field only") break } else { info.fields.pk = fi diff --git a/orm/models_test.go b/orm/models_test.go index 6ca9590c..9dfa183d 100644 --- a/orm/models_test.go +++ b/orm/models_test.go @@ -76,21 +76,21 @@ func (e *SliceStringField) RawValue() interface{} { var _ Fielder = new(SliceStringField) // A json field. -type JsonField struct { +type JSONField struct { Name string Data string } -func (e *JsonField) String() string { +func (e *JSONField) String() string { data, _ := json.Marshal(e) return string(data) } -func (e *JsonField) FieldType() int { +func (e *JSONField) FieldType() int { return TypeTextField } -func (e *JsonField) SetRaw(value interface{}) error { +func (e *JSONField) SetRaw(value interface{}) error { switch d := value.(type) { case string: return json.Unmarshal([]byte(d), e) @@ -99,14 +99,14 @@ func (e *JsonField) SetRaw(value interface{}) error { } } -func (e *JsonField) RawValue() interface{} { +func (e *JSONField) RawValue() interface{} { return e.String() } -var _ Fielder = new(JsonField) +var _ Fielder = new(JSONField) type Data struct { - Id int + ID int `orm:"column(id)"` Boolean bool Char string `orm:"size(50)"` Text string `orm:"type(text)"` @@ -130,7 +130,7 @@ type Data struct { } type DataNull struct { - Id int + ID int `orm:"column(id)"` Boolean bool `orm:"null"` Char string `orm:"null;size(50)"` Text string `orm:"null;type(text)"` @@ -193,7 +193,7 @@ type Float32 float64 type Float64 float64 type DataCustom struct { - Id int + ID int `orm:"column(id)"` Boolean Boolean Char string `orm:"size(50)"` Text string `orm:"type(text)"` @@ -216,28 +216,28 @@ type DataCustom struct { // only for mysql type UserBig struct { - Id uint64 + ID uint64 `orm:"column(id)"` Name string } type User struct { - Id int - UserName string `orm:"size(30);unique"` - Email string `orm:"size(100)"` - Password string `orm:"size(100)"` - Status int16 `orm:"column(Status)"` - IsStaff bool - IsActive bool `orm:"default(1)"` - Created time.Time `orm:"auto_now_add;type(date)"` - Updated time.Time `orm:"auto_now"` - Profile *Profile `orm:"null;rel(one);on_delete(set_null)"` - Posts []*Post `orm:"reverse(many)" json:"-"` - ShouldSkip string `orm:"-"` - Nums int - Langs SliceStringField `orm:"size(100)"` - Extra JsonField `orm:"type(text)"` - unexport bool `orm:"-"` - unexport_ bool + ID int `orm:"column(id)"` + UserName string `orm:"size(30);unique"` + Email string `orm:"size(100)"` + Password string `orm:"size(100)"` + Status int16 `orm:"column(Status)"` + IsStaff bool + IsActive bool `orm:"default(1)"` + Created time.Time `orm:"auto_now_add;type(date)"` + Updated time.Time `orm:"auto_now"` + Profile *Profile `orm:"null;rel(one);on_delete(set_null)"` + Posts []*Post `orm:"reverse(many)" json:"-"` + ShouldSkip string `orm:"-"` + Nums int + Langs SliceStringField `orm:"size(100)"` + Extra JSONField `orm:"type(text)"` + unexport bool `orm:"-"` + unexportBool bool } func (u *User) TableIndex() [][]string { @@ -259,7 +259,7 @@ func NewUser() *User { } type Profile struct { - Id int + ID int `orm:"column(id)"` Age int16 Money float64 User *User `orm:"reverse(one)" json:"-"` @@ -276,7 +276,7 @@ func NewProfile() *Profile { } type Post struct { - Id int + ID int `orm:"column(id)"` User *User `orm:"rel(fk)"` Title string `orm:"size(60)"` Content string `orm:"type(text)"` @@ -297,7 +297,7 @@ func NewPost() *Post { } type Tag struct { - Id int + ID int `orm:"column(id)"` Name string `orm:"size(30)"` BestPost *Post `orm:"rel(one);null"` Posts []*Post `orm:"reverse(many)" json:"-"` @@ -309,7 +309,7 @@ func NewTag() *Tag { } type PostTags struct { - Id int + ID int `orm:"column(id)"` Post *Post `orm:"rel(fk)"` Tag *Tag `orm:"rel(fk)"` } @@ -319,7 +319,7 @@ func (m *PostTags) TableName() string { } type Comment struct { - Id int + ID int `orm:"column(id)"` Post *Post `orm:"rel(fk);column(post)"` Content string `orm:"type(text)"` Parent *Comment `orm:"null;rel(fk)"` @@ -397,7 +397,7 @@ go test -v github.com/astaxie/beego/orm RegisterDataBase("default", DBARGS.Driver, DBARGS.Source, 20) alias := getDbAlias("default") - if alias.Driver == DR_MySQL { + if alias.Driver == DRMySQL { alias.Engine = "INNODB" } diff --git a/orm/orm.go b/orm/orm.go index f881433b..d00d6d03 100644 --- a/orm/orm.go +++ b/orm/orm.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +// Package orm provide ORM for MySQL/PostgreSQL/sqlite // Simple Usage // // package main @@ -59,12 +60,13 @@ import ( "time" ) +// DebugQueries define the debug const ( - Debug_Queries = iota + DebugQueries = iota ) +// Define common vars var ( - // DebugLevel = Debug_Queries Debug = false DebugLog = NewLog(os.Stderr) DefaultRowsLimit = 1000 @@ -79,7 +81,10 @@ var ( ErrNotImplement = errors.New("have not implement") ) +// Params stores the Params type Params map[string]interface{} + +// ParamsList stores paramslist type ParamsList []interface{} type orm struct { @@ -188,7 +193,7 @@ func (o *orm) InsertMulti(bulk int, mds interface{}) (int64, error) { o.setPk(mi, ind, id) - cnt += 1 + cnt++ } } else { mi, _ := o.getMiInd(sind.Index(0).Interface(), false) @@ -489,7 +494,7 @@ func (o *orm) Driver() Driver { return driver(o.alias.Name) } -// create new orm +// NewOrm create new orm func NewOrm() Ormer { BootStrap() // execute only once @@ -501,7 +506,7 @@ func NewOrm() Ormer { return o } -// create a new ormer object with specify *sql.DB for query +// NewOrmWithDB create a new ormer object with specify *sql.DB for query func NewOrmWithDB(driverName, aliasName string, db *sql.DB) (Ormer, error) { var al *alias diff --git a/orm/orm_conds.go b/orm/orm_conds.go index 6344653a..b2eae418 100644 --- a/orm/orm_conds.go +++ b/orm/orm_conds.go @@ -19,6 +19,7 @@ import ( "strings" ) +// ExprSep define the expression seperation const ( ExprSep = "__" ) @@ -32,19 +33,19 @@ type condValue struct { isCond bool } -// condition struct. +// Condition struct. // work for WHERE conditions. type Condition struct { params []condValue } -// return new condition struct +// NewCondition return new condition struct func NewCondition() *Condition { c := &Condition{} return c } -// add expression to condition +// And add expression to condition func (c Condition) And(expr string, args ...interface{}) *Condition { if expr == "" || len(args) == 0 { panic(fmt.Errorf(" args cannot empty")) @@ -53,7 +54,7 @@ func (c Condition) And(expr string, args ...interface{}) *Condition { return &c } -// add NOT expression to condition +// AndNot add NOT expression to condition func (c Condition) AndNot(expr string, args ...interface{}) *Condition { if expr == "" || len(args) == 0 { panic(fmt.Errorf(" args cannot empty")) @@ -62,7 +63,7 @@ func (c Condition) AndNot(expr string, args ...interface{}) *Condition { return &c } -// combine a condition to current condition +// AndCond combine a condition to current condition func (c *Condition) AndCond(cond *Condition) *Condition { c = c.clone() if c == cond { @@ -74,7 +75,7 @@ func (c *Condition) AndCond(cond *Condition) *Condition { return c } -// add OR expression to condition +// Or add OR expression to condition func (c Condition) Or(expr string, args ...interface{}) *Condition { if expr == "" || len(args) == 0 { panic(fmt.Errorf(" args cannot empty")) @@ -83,7 +84,7 @@ func (c Condition) Or(expr string, args ...interface{}) *Condition { return &c } -// add OR NOT expression to condition +// OrNot add OR NOT expression to condition func (c Condition) OrNot(expr string, args ...interface{}) *Condition { if expr == "" || len(args) == 0 { panic(fmt.Errorf(" args cannot empty")) @@ -92,7 +93,7 @@ func (c Condition) OrNot(expr string, args ...interface{}) *Condition { return &c } -// combine a OR condition to current condition +// OrCond combine a OR condition to current condition func (c *Condition) OrCond(cond *Condition) *Condition { c = c.clone() if c == cond { @@ -104,12 +105,12 @@ func (c *Condition) OrCond(cond *Condition) *Condition { return c } -// check the condition arguments are empty or not. +// IsEmpty check the condition arguments are empty or not. func (c *Condition) IsEmpty() bool { return len(c.params) == 0 } -// clone a condition +// clone clone a condition func (c Condition) clone() *Condition { return &c } diff --git a/orm/orm_log.go b/orm/orm_log.go index 419d8e11..712eb219 100644 --- a/orm/orm_log.go +++ b/orm/orm_log.go @@ -23,11 +23,12 @@ import ( "time" ) +// Log implement the log.Logger type Log struct { *log.Logger } -// set io.Writer to create a Logger. +// NewLog set io.Writer to create a Logger. func NewLog(out io.Writer) *Log { d := new(Log) d.Logger = log.New(out, "[ORM]", 1e9) @@ -41,7 +42,7 @@ func debugLogQueies(alias *alias, operaton, query string, t time.Time, err error if err != nil { flag = "FAIL" } - con := fmt.Sprintf(" - %s - [Queries/%s] - [%s / %11s / %7.1fms] - [%s]", t.Format(format_DateTime), alias.Name, flag, operaton, elsp, query) + con := fmt.Sprintf(" - %s - [Queries/%s] - [%s / %11s / %7.1fms] - [%s]", t.Format(formatDateTime), alias.Name, flag, operaton, elsp, query) cons := make([]string, 0, len(args)) for _, arg := range args { cons = append(cons, fmt.Sprintf("%v", arg)) diff --git a/orm/orm_queryset.go b/orm/orm_queryset.go index af16b694..802a1fe0 100644 --- a/orm/orm_queryset.go +++ b/orm/orm_queryset.go @@ -25,11 +25,12 @@ type colValue struct { type operator int +// define Col operations const ( - Col_Add operator = iota - Col_Minus - Col_Multiply - Col_Except + ColAdd operator = iota + ColMinus + ColMultiply + ColExcept ) // ColValue do the field raw changes. e.g Nums = Nums + 10. usage: @@ -38,7 +39,7 @@ const ( // } func ColValue(opt operator, value interface{}) interface{} { switch opt { - case Col_Add, Col_Minus, Col_Multiply, Col_Except: + case ColAdd, ColMinus, ColMultiply, ColExcept: default: panic(fmt.Errorf("orm.ColValue wrong operator")) } @@ -129,21 +130,21 @@ func (o querySet) Distinct() QuerySeter { // set relation model to query together. // it will query relation models and assign to parent model. func (o querySet) RelatedSel(params ...interface{}) QuerySeter { - if len(params) == 0 { - o.relDepth = DefaultRelsDepth - } else { - for _, p := range params { - switch val := p.(type) { - case string: - o.related = append(o.related, val) - case int: - o.relDepth = val - default: - panic(fmt.Errorf(" wrong param kind: %v", val)) - } - } - } - return &o + if len(params) == 0 { + o.relDepth = DefaultRelsDepth + } else { + for _, p := range params { + switch val := p.(type) { + case string: + o.related = append(o.related, val) + case int: + o.relDepth = val + default: + panic(fmt.Errorf(" wrong param kind: %v", val)) + } + } + } + return &o } // set condition to QuerySeter. diff --git a/orm/orm_raw.go b/orm/orm_raw.go index 1452d6fc..cbb18064 100644 --- a/orm/orm_raw.go +++ b/orm/orm_raw.go @@ -165,14 +165,14 @@ func (o *rawSet) setFieldValue(ind reflect.Value, value interface{}) { if str != "" { if len(str) >= 19 { str = str[:19] - t, err := time.ParseInLocation(format_DateTime, str, o.orm.alias.TZ) + t, err := time.ParseInLocation(formatDateTime, str, o.orm.alias.TZ) if err == nil { t = t.In(DefaultTimeLoc) ind.Set(reflect.ValueOf(t)) } } else if len(str) >= 10 { str = str[:10] - t, err := time.ParseInLocation(format_Date, str, DefaultTimeLoc) + t, err := time.ParseInLocation(formatDate, str, DefaultTimeLoc) if err == nil { ind.Set(reflect.ValueOf(t)) } @@ -255,12 +255,13 @@ func (o *rawSet) loopSetRefs(refs []interface{}, sInds []reflect.Value, nIndsPtr // query data and map to container func (o *rawSet) QueryRow(containers ...interface{}) error { - refs := make([]interface{}, 0, len(containers)) - sInds := make([]reflect.Value, 0) - eTyps := make([]reflect.Type, 0) - + var ( + refs = make([]interface{}, 0, len(containers)) + sInds []reflect.Value + eTyps []reflect.Type + sMi *modelInfo + ) structMode := false - var sMi *modelInfo for _, container := range containers { val := reflect.ValueOf(container) ind := reflect.Indirect(val) @@ -385,12 +386,13 @@ func (o *rawSet) QueryRow(containers ...interface{}) error { // query data rows and map to container func (o *rawSet) QueryRows(containers ...interface{}) (int64, error) { - refs := make([]interface{}, 0, len(containers)) - sInds := make([]reflect.Value, 0) - eTyps := make([]reflect.Type, 0) - + var ( + refs = make([]interface{}, 0, len(containers)) + sInds []reflect.Value + eTyps []reflect.Type + sMi *modelInfo + ) structMode := false - var sMi *modelInfo for _, container := range containers { val := reflect.ValueOf(container) sInd := reflect.Indirect(val) @@ -557,10 +559,9 @@ func (o *rawSet) readValues(container interface{}, needCols []string) (int64, er args := getFlatParams(nil, o.args, o.orm.alias.TZ) var rs *sql.Rows - if r, err := o.orm.db.Query(query, args...); err != nil { + rs, err := o.orm.db.Query(query, args...) + if err != nil { return 0, err - } else { - rs = r } defer rs.Close() @@ -574,30 +575,30 @@ func (o *rawSet) readValues(container interface{}, needCols []string) (int64, er for rs.Next() { if cnt == 0 { - if columns, err := rs.Columns(); err != nil { + columns, err := rs.Columns() + if err != nil { return 0, err + } + if len(needCols) > 0 { + indexs = make([]int, 0, len(needCols)) } else { + indexs = make([]int, 0, len(columns)) + } + + cols = columns + refs = make([]interface{}, len(cols)) + for i := range refs { + var ref sql.NullString + refs[i] = &ref + if len(needCols) > 0 { - indexs = make([]int, 0, len(needCols)) - } else { - indexs = make([]int, 0, len(columns)) - } - - cols = columns - refs = make([]interface{}, len(cols)) - for i := range refs { - var ref sql.NullString - refs[i] = &ref - - if len(needCols) > 0 { - for _, c := range needCols { - if c == cols[i] { - indexs = append(indexs, i) - } + for _, c := range needCols { + if c == cols[i] { + indexs = append(indexs, i) } - } else { - indexs = append(indexs, i) } + } else { + indexs = append(indexs, i) } } } @@ -684,11 +685,9 @@ func (o *rawSet) queryRowsTo(container interface{}, keyCol, valueCol string) (in args := getFlatParams(nil, o.args, o.orm.alias.TZ) - var rs *sql.Rows - if r, err := o.orm.db.Query(query, args...); err != nil { + rs, err := o.orm.db.Query(query, args...) + if err != nil { return 0, err - } else { - rs = r } defer rs.Close() @@ -706,32 +705,29 @@ func (o *rawSet) queryRowsTo(container interface{}, keyCol, valueCol string) (in for rs.Next() { if cnt == 0 { - if columns, err := rs.Columns(); err != nil { + columns, err := rs.Columns() + if err != nil { return 0, err - } else { - cols = columns - refs = make([]interface{}, len(cols)) - for i := range refs { - if keyCol == cols[i] { - keyIndex = i - } - - if typ == 1 || keyIndex == i { - var ref sql.NullString - refs[i] = &ref - } else { - var ref interface{} - refs[i] = &ref - } - - if valueCol == cols[i] { - valueIndex = i - } + } + cols = columns + refs = make([]interface{}, len(cols)) + for i := range refs { + if keyCol == cols[i] { + keyIndex = i } - - if keyIndex == -1 || valueIndex == -1 { - panic(fmt.Errorf(" RowsTo unknown key, value column name `%s: %s`", keyCol, valueCol)) + if typ == 1 || keyIndex == i { + var ref sql.NullString + refs[i] = &ref + } else { + var ref interface{} + refs[i] = &ref } + if valueCol == cols[i] { + valueIndex = i + } + } + if keyIndex == -1 || valueIndex == -1 { + panic(fmt.Errorf(" RowsTo unknown key, value column name `%s: %s`", keyCol, valueCol)) } } diff --git a/orm/orm_test.go b/orm/orm_test.go index 14eadabd..4342afa7 100644 --- a/orm/orm_test.go +++ b/orm/orm_test.go @@ -31,13 +31,13 @@ import ( var _ = os.PathSeparator var ( - test_Date = format_Date + " -0700" - test_DateTime = format_DateTime + " -0700" + testDate = formatDate + " -0700" + testDateTime = formatDateTime + " -0700" ) -func ValuesCompare(is bool, a interface{}, args ...interface{}) (err error, ok bool) { +func ValuesCompare(is bool, a interface{}, args ...interface{}) (ok bool, err error) { if len(args) == 0 { - return fmt.Errorf("miss args"), false + return false, fmt.Errorf("miss args") } b := args[0] arg := argAny(args) @@ -71,21 +71,21 @@ func ValuesCompare(is bool, a interface{}, args ...interface{}) (err error, ok b wrongArg: if err != nil { - return err, false + return false, err } - return nil, true + return true, nil } func AssertIs(a interface{}, args ...interface{}) error { - if err, ok := ValuesCompare(true, a, args...); ok == false { + if ok, err := ValuesCompare(true, a, args...); ok == false { return err } return nil } func AssertNot(a interface{}, args ...interface{}) error { - if err, ok := ValuesCompare(false, a, args...); ok == false { + if ok, err := ValuesCompare(false, a, args...); ok == false { return err } return nil @@ -208,7 +208,7 @@ func TestModelSyntax(t *testing.T) { } } -var Data_Values = map[string]interface{}{ +var DataValues = map[string]interface{}{ "Boolean": true, "Char": "char", "Text": "text", @@ -235,7 +235,7 @@ func TestDataTypes(t *testing.T) { d := Data{} ind := reflect.Indirect(reflect.ValueOf(&d)) - for name, value := range Data_Values { + for name, value := range DataValues { e := ind.FieldByName(name) e.Set(reflect.ValueOf(value)) } @@ -244,22 +244,22 @@ func TestDataTypes(t *testing.T) { throwFail(t, err) throwFail(t, AssertIs(id, 1)) - d = Data{Id: 1} + d = Data{ID: 1} err = dORM.Read(&d) throwFail(t, err) ind = reflect.Indirect(reflect.ValueOf(&d)) - for name, value := range Data_Values { + for name, value := range DataValues { e := ind.FieldByName(name) vu := e.Interface() switch name { case "Date": - vu = vu.(time.Time).In(DefaultTimeLoc).Format(test_Date) - value = value.(time.Time).In(DefaultTimeLoc).Format(test_Date) + vu = vu.(time.Time).In(DefaultTimeLoc).Format(testDate) + value = value.(time.Time).In(DefaultTimeLoc).Format(testDate) case "DateTime": - vu = vu.(time.Time).In(DefaultTimeLoc).Format(test_DateTime) - value = value.(time.Time).In(DefaultTimeLoc).Format(test_DateTime) + vu = vu.(time.Time).In(DefaultTimeLoc).Format(testDateTime) + value = value.(time.Time).In(DefaultTimeLoc).Format(testDateTime) } throwFail(t, AssertIs(vu == value, true), value, vu) } @@ -278,7 +278,7 @@ func TestNullDataTypes(t *testing.T) { throwFail(t, err) throwFail(t, AssertIs(id, 1)) - d = DataNull{Id: 1} + d = DataNull{ID: 1} err = dORM.Read(&d) throwFail(t, err) @@ -309,7 +309,7 @@ func TestNullDataTypes(t *testing.T) { _, err = dORM.Raw(`INSERT INTO data_null (boolean) VALUES (?)`, nil).Exec() throwFail(t, err) - d = DataNull{Id: 2} + d = DataNull{ID: 2} err = dORM.Read(&d) throwFail(t, err) @@ -362,7 +362,7 @@ func TestNullDataTypes(t *testing.T) { throwFail(t, err) throwFail(t, AssertIs(id, 3)) - d = DataNull{Id: 3} + d = DataNull{ID: 3} err = dORM.Read(&d) throwFail(t, err) @@ -402,7 +402,7 @@ func TestDataCustomTypes(t *testing.T) { d := DataCustom{} ind := reflect.Indirect(reflect.ValueOf(&d)) - for name, value := range Data_Values { + for name, value := range DataValues { e := ind.FieldByName(name) if !e.IsValid() { continue @@ -414,13 +414,13 @@ func TestDataCustomTypes(t *testing.T) { throwFail(t, err) throwFail(t, AssertIs(id, 1)) - d = DataCustom{Id: 1} + d = DataCustom{ID: 1} err = dORM.Read(&d) throwFail(t, err) ind = reflect.Indirect(reflect.ValueOf(&d)) - for name, value := range Data_Values { + for name, value := range DataValues { e := ind.FieldByName(name) if !e.IsValid() { continue @@ -451,7 +451,7 @@ func TestCRUD(t *testing.T) { throwFail(t, err) throwFail(t, AssertIs(id, 1)) - u := &User{Id: user.Id} + u := &User{ID: user.ID} err = dORM.Read(u) throwFail(t, err) @@ -461,8 +461,8 @@ func TestCRUD(t *testing.T) { throwFail(t, AssertIs(u.Status, 3)) throwFail(t, AssertIs(u.IsStaff, true)) throwFail(t, AssertIs(u.IsActive, true)) - throwFail(t, AssertIs(u.Created.In(DefaultTimeLoc), user.Created.In(DefaultTimeLoc), test_Date)) - throwFail(t, AssertIs(u.Updated.In(DefaultTimeLoc), user.Updated.In(DefaultTimeLoc), test_DateTime)) + throwFail(t, AssertIs(u.Created.In(DefaultTimeLoc), user.Created.In(DefaultTimeLoc), testDate)) + throwFail(t, AssertIs(u.Updated.In(DefaultTimeLoc), user.Updated.In(DefaultTimeLoc), testDateTime)) user.UserName = "astaxie" user.Profile = profile @@ -470,11 +470,11 @@ func TestCRUD(t *testing.T) { throwFail(t, err) throwFail(t, AssertIs(num, 1)) - u = &User{Id: user.Id} + u = &User{ID: user.ID} err = dORM.Read(u) throwFailNow(t, err) throwFail(t, AssertIs(u.UserName, "astaxie")) - throwFail(t, AssertIs(u.Profile.Id, profile.Id)) + throwFail(t, AssertIs(u.Profile.ID, profile.ID)) u = &User{UserName: "astaxie", Password: "pass"} err = dORM.Read(u, "UserName") @@ -487,7 +487,7 @@ func TestCRUD(t *testing.T) { throwFail(t, err) throwFail(t, AssertIs(num, 1)) - u = &User{Id: user.Id} + u = &User{ID: user.ID} err = dORM.Read(u) throwFailNow(t, err) throwFail(t, AssertIs(u.UserName, "QQ")) @@ -497,7 +497,7 @@ func TestCRUD(t *testing.T) { throwFail(t, err) throwFail(t, AssertIs(num, 1)) - u = &User{Id: user.Id} + u = &User{ID: user.ID} err = dORM.Read(u) throwFail(t, err) throwFail(t, AssertIs(true, u.Profile == nil)) @@ -506,7 +506,7 @@ func TestCRUD(t *testing.T) { throwFail(t, err) throwFail(t, AssertIs(num, 1)) - u = &User{Id: 100} + u = &User{ID: 100} err = dORM.Read(u) throwFail(t, AssertIs(err, ErrNoRows)) @@ -516,7 +516,7 @@ func TestCRUD(t *testing.T) { throwFail(t, err) throwFail(t, AssertIs(id, 1)) - ub = UserBig{Id: 1} + ub = UserBig{ID: 1} err = dORM.Read(&ub) throwFail(t, err) throwFail(t, AssertIs(ub.Name, "name")) @@ -586,7 +586,7 @@ func TestInsertTestData(t *testing.T) { throwFail(t, AssertIs(id, 4)) tags := []*Tag{ - {Name: "golang", BestPost: &Post{Id: 2}}, + {Name: "golang", BestPost: &Post{ID: 2}}, {Name: "example"}, {Name: "format"}, {Name: "c++"}, @@ -638,7 +638,7 @@ The program—and web server—godoc processes Go source files to extract docume } func TestCustomField(t *testing.T) { - user := User{Id: 2} + user := User{ID: 2} err := dORM.Read(&user) throwFailNow(t, err) @@ -648,7 +648,7 @@ func TestCustomField(t *testing.T) { _, err = dORM.Update(&user, "Langs", "Extra") throwFailNow(t, err) - user = User{Id: 2} + user = User{ID: 2} err = dORM.Read(&user) throwFailNow(t, err) throwFailNow(t, AssertIs(len(user.Langs), 2)) @@ -889,9 +889,9 @@ func TestAll(t *testing.T) { throwFailNow(t, AssertIs(users2[0].UserName, "slene")) throwFailNow(t, AssertIs(users2[1].UserName, "astaxie")) throwFailNow(t, AssertIs(users2[2].UserName, "nobody")) - throwFailNow(t, AssertIs(users2[0].Id, 0)) - throwFailNow(t, AssertIs(users2[1].Id, 0)) - throwFailNow(t, AssertIs(users2[2].Id, 0)) + throwFailNow(t, AssertIs(users2[0].ID, 0)) + throwFailNow(t, AssertIs(users2[1].ID, 0)) + throwFailNow(t, AssertIs(users2[2].ID, 0)) throwFailNow(t, AssertIs(users2[0].Profile == nil, false)) throwFailNow(t, AssertIs(users2[1].Profile == nil, false)) throwFailNow(t, AssertIs(users2[2].Profile == nil, true)) @@ -1112,7 +1112,7 @@ func TestReverseQuery(t *testing.T) { func TestLoadRelated(t *testing.T) { // load reverse foreign key - user := User{Id: 3} + user := User{ID: 3} err := dORM.Read(&user) throwFailNow(t, err) @@ -1121,7 +1121,7 @@ func TestLoadRelated(t *testing.T) { throwFailNow(t, err) throwFailNow(t, AssertIs(num, 2)) throwFailNow(t, AssertIs(len(user.Posts), 2)) - throwFailNow(t, AssertIs(user.Posts[0].User.Id, 3)) + throwFailNow(t, AssertIs(user.Posts[0].User.ID, 3)) num, err = dORM.LoadRelated(&user, "Posts", true) throwFailNow(t, err) @@ -1143,8 +1143,8 @@ func TestLoadRelated(t *testing.T) { throwFailNow(t, AssertIs(user.Posts[0].Title, "Formatting")) // load reverse one to one - profile := Profile{Id: 3} - profile.BestPost = &Post{Id: 2} + profile := Profile{ID: 3} + profile.BestPost = &Post{ID: 2} num, err = dORM.Update(&profile, "BestPost") throwFailNow(t, err) throwFailNow(t, AssertIs(num, 1)) @@ -1183,7 +1183,7 @@ func TestLoadRelated(t *testing.T) { throwFailNow(t, AssertIs(user.Profile.BestPost == nil, false)) throwFailNow(t, AssertIs(user.Profile.BestPost.Title, "Examples")) - post := Post{Id: 2} + post := Post{ID: 2} // load rel foreign key err = dORM.Read(&post) @@ -1204,7 +1204,7 @@ func TestLoadRelated(t *testing.T) { throwFailNow(t, AssertIs(post.User.Profile.Age, 30)) // load rel m2m - post = Post{Id: 2} + post = Post{ID: 2} err = dORM.Read(&post) throwFailNow(t, err) @@ -1224,7 +1224,7 @@ func TestLoadRelated(t *testing.T) { throwFailNow(t, AssertIs(post.Tags[0].BestPost.User.UserName, "astaxie")) // load reverse m2m - tag := Tag{Id: 1} + tag := Tag{ID: 1} err = dORM.Read(&tag) throwFailNow(t, err) @@ -1233,19 +1233,19 @@ func TestLoadRelated(t *testing.T) { throwFailNow(t, err) throwFailNow(t, AssertIs(num, 3)) throwFailNow(t, AssertIs(tag.Posts[0].Title, "Introduction")) - throwFailNow(t, AssertIs(tag.Posts[0].User.Id, 2)) + throwFailNow(t, AssertIs(tag.Posts[0].User.ID, 2)) throwFailNow(t, AssertIs(tag.Posts[0].User.Profile == nil, true)) num, err = dORM.LoadRelated(&tag, "Posts", true) throwFailNow(t, err) throwFailNow(t, AssertIs(num, 3)) throwFailNow(t, AssertIs(tag.Posts[0].Title, "Introduction")) - throwFailNow(t, AssertIs(tag.Posts[0].User.Id, 2)) + throwFailNow(t, AssertIs(tag.Posts[0].User.ID, 2)) throwFailNow(t, AssertIs(tag.Posts[0].User.UserName, "slene")) } func TestQueryM2M(t *testing.T) { - post := Post{Id: 4} + post := Post{ID: 4} m2m := dORM.QueryM2M(&post, "Tags") tag1 := []*Tag{{Name: "TestTag1"}, {Name: "TestTag2"}} @@ -1319,7 +1319,7 @@ func TestQueryM2M(t *testing.T) { for _, post := range posts { p := post.(*Post) - p.User = &User{Id: 1} + p.User = &User{ID: 1} _, err := dORM.Insert(post) throwFailNow(t, err) } @@ -1459,10 +1459,10 @@ func TestRawQueryRow(t *testing.T) { Decimal float64 ) - data_values := make(map[string]interface{}, len(Data_Values)) + dataValues := make(map[string]interface{}, len(DataValues)) - for k, v := range Data_Values { - data_values[strings.ToLower(k)] = v + for k, v := range DataValues { + dataValues[strings.ToLower(k)] = v } Q := dDbBaser.TableQuote() @@ -1488,14 +1488,14 @@ func TestRawQueryRow(t *testing.T) { throwFail(t, AssertIs(id, 1)) case "date": v = v.(time.Time).In(DefaultTimeLoc) - value := data_values[col].(time.Time).In(DefaultTimeLoc) - throwFail(t, AssertIs(v, value, test_Date)) + value := dataValues[col].(time.Time).In(DefaultTimeLoc) + throwFail(t, AssertIs(v, value, testDate)) case "datetime": v = v.(time.Time).In(DefaultTimeLoc) - value := data_values[col].(time.Time).In(DefaultTimeLoc) - throwFail(t, AssertIs(v, value, test_DateTime)) + value := dataValues[col].(time.Time).In(DefaultTimeLoc) + throwFail(t, AssertIs(v, value, testDateTime)) default: - throwFail(t, AssertIs(v, data_values[col])) + throwFail(t, AssertIs(v, dataValues[col])) } } @@ -1529,16 +1529,16 @@ func TestQueryRows(t *testing.T) { ind := reflect.Indirect(reflect.ValueOf(datas[0])) - for name, value := range Data_Values { + for name, value := range DataValues { e := ind.FieldByName(name) vu := e.Interface() switch name { case "Date": - vu = vu.(time.Time).In(DefaultTimeLoc).Format(test_Date) - value = value.(time.Time).In(DefaultTimeLoc).Format(test_Date) + vu = vu.(time.Time).In(DefaultTimeLoc).Format(testDate) + value = value.(time.Time).In(DefaultTimeLoc).Format(testDate) case "DateTime": - vu = vu.(time.Time).In(DefaultTimeLoc).Format(test_DateTime) - value = value.(time.Time).In(DefaultTimeLoc).Format(test_DateTime) + vu = vu.(time.Time).In(DefaultTimeLoc).Format(testDateTime) + value = value.(time.Time).In(DefaultTimeLoc).Format(testDateTime) } throwFail(t, AssertIs(vu == value, true), value, vu) } @@ -1553,16 +1553,16 @@ func TestQueryRows(t *testing.T) { ind = reflect.Indirect(reflect.ValueOf(datas2[0])) - for name, value := range Data_Values { + for name, value := range DataValues { e := ind.FieldByName(name) vu := e.Interface() switch name { case "Date": - vu = vu.(time.Time).In(DefaultTimeLoc).Format(test_Date) - value = value.(time.Time).In(DefaultTimeLoc).Format(test_Date) + vu = vu.(time.Time).In(DefaultTimeLoc).Format(testDate) + value = value.(time.Time).In(DefaultTimeLoc).Format(testDate) case "DateTime": - vu = vu.(time.Time).In(DefaultTimeLoc).Format(test_DateTime) - value = value.(time.Time).In(DefaultTimeLoc).Format(test_DateTime) + vu = vu.(time.Time).In(DefaultTimeLoc).Format(testDateTime) + value = value.(time.Time).In(DefaultTimeLoc).Format(testDateTime) } throwFail(t, AssertIs(vu == value, true), value, vu) } @@ -1699,25 +1699,25 @@ func TestUpdate(t *testing.T) { throwFail(t, AssertIs(num, 1)) num, err = qs.Filter("user_name", "slene").Update(Params{ - "Nums": ColValue(Col_Add, 100), + "Nums": ColValue(ColAdd, 100), }) throwFail(t, err) throwFail(t, AssertIs(num, 1)) num, err = qs.Filter("user_name", "slene").Update(Params{ - "Nums": ColValue(Col_Minus, 50), + "Nums": ColValue(ColMinus, 50), }) throwFail(t, err) throwFail(t, AssertIs(num, 1)) num, err = qs.Filter("user_name", "slene").Update(Params{ - "Nums": ColValue(Col_Multiply, 3), + "Nums": ColValue(ColMultiply, 3), }) throwFail(t, err) throwFail(t, AssertIs(num, 1)) num, err = qs.Filter("user_name", "slene").Update(Params{ - "Nums": ColValue(Col_Except, 5), + "Nums": ColValue(ColExcept, 5), }) throwFail(t, err) throwFail(t, AssertIs(num, 1)) @@ -1838,15 +1838,15 @@ func TestReadOrCreate(t *testing.T) { throwFail(t, AssertIs(u.Status, 7)) throwFail(t, AssertIs(u.IsStaff, false)) throwFail(t, AssertIs(u.IsActive, true)) - throwFail(t, AssertIs(u.Created.In(DefaultTimeLoc), u.Created.In(DefaultTimeLoc), test_Date)) - throwFail(t, AssertIs(u.Updated.In(DefaultTimeLoc), u.Updated.In(DefaultTimeLoc), test_DateTime)) + throwFail(t, AssertIs(u.Created.In(DefaultTimeLoc), u.Created.In(DefaultTimeLoc), testDate)) + throwFail(t, AssertIs(u.Updated.In(DefaultTimeLoc), u.Updated.In(DefaultTimeLoc), testDateTime)) nu := &User{UserName: u.UserName, Email: "someotheremail@gmail.com"} created, pk, err = dORM.ReadOrCreate(nu, "UserName") throwFail(t, err) throwFail(t, AssertIs(created, false)) - throwFail(t, AssertIs(nu.Id, u.Id)) - throwFail(t, AssertIs(pk, u.Id)) + throwFail(t, AssertIs(nu.ID, u.ID)) + throwFail(t, AssertIs(pk, u.ID)) throwFail(t, AssertIs(nu.UserName, u.UserName)) throwFail(t, AssertIs(nu.Email, u.Email)) // should contain the value in the table, not the one specified above throwFail(t, AssertIs(nu.Password, u.Password)) diff --git a/orm/qb.go b/orm/qb.go index efe368db..d7efae81 100644 --- a/orm/qb.go +++ b/orm/qb.go @@ -16,6 +16,7 @@ package orm import "errors" +// QueryBuilder is the Query builder interface type QueryBuilder interface { Select(fields ...string) QueryBuilder From(tables ...string) QueryBuilder @@ -43,15 +44,16 @@ type QueryBuilder interface { String() string } +// NewQueryBuilder return the QueryBuilder func NewQueryBuilder(driver string) (qb QueryBuilder, err error) { if driver == "mysql" { qb = new(MySQLQueryBuilder) } else if driver == "postgres" { - err = errors.New("postgres query builder is not supported yet!") + err = errors.New("postgres query builder is not supported yet") } else if driver == "sqlite" { - err = errors.New("sqlite query builder is not supported yet!") + err = errors.New("sqlite query builder is not supported yet") } else { - err = errors.New("unknown driver for query builder!") + err = errors.New("unknown driver for query builder") } return } diff --git a/orm/qb_mysql.go b/orm/qb_mysql.go index 9ce9b7d9..f6d1e185 100644 --- a/orm/qb_mysql.go +++ b/orm/qb_mysql.go @@ -20,134 +20,160 @@ import ( "strings" ) -const COMMA_SPACE = ", " +// CommaSpace is the seperation +const CommaSpace = ", " +// MySQLQueryBuilder is the SQL build type MySQLQueryBuilder struct { Tokens []string } +// Select will join the fields func (qb *MySQLQueryBuilder) Select(fields ...string) QueryBuilder { - qb.Tokens = append(qb.Tokens, "SELECT", strings.Join(fields, COMMA_SPACE)) + qb.Tokens = append(qb.Tokens, "SELECT", strings.Join(fields, CommaSpace)) return qb } +// From join the tables func (qb *MySQLQueryBuilder) From(tables ...string) QueryBuilder { - qb.Tokens = append(qb.Tokens, "FROM", strings.Join(tables, COMMA_SPACE)) + qb.Tokens = append(qb.Tokens, "FROM", strings.Join(tables, CommaSpace)) return qb } +// InnerJoin INNER JOIN the table func (qb *MySQLQueryBuilder) InnerJoin(table string) QueryBuilder { qb.Tokens = append(qb.Tokens, "INNER JOIN", table) return qb } +// LeftJoin LEFT JOIN the table func (qb *MySQLQueryBuilder) LeftJoin(table string) QueryBuilder { qb.Tokens = append(qb.Tokens, "LEFT JOIN", table) return qb } +// RightJoin RIGHT JOIN the table func (qb *MySQLQueryBuilder) RightJoin(table string) QueryBuilder { qb.Tokens = append(qb.Tokens, "RIGHT JOIN", table) return qb } +// On join with on cond func (qb *MySQLQueryBuilder) On(cond string) QueryBuilder { qb.Tokens = append(qb.Tokens, "ON", cond) return qb } +// Where join the Where cond func (qb *MySQLQueryBuilder) Where(cond string) QueryBuilder { qb.Tokens = append(qb.Tokens, "WHERE", cond) return qb } +// And join the and cond func (qb *MySQLQueryBuilder) And(cond string) QueryBuilder { qb.Tokens = append(qb.Tokens, "AND", cond) return qb } +// Or join the or cond func (qb *MySQLQueryBuilder) Or(cond string) QueryBuilder { qb.Tokens = append(qb.Tokens, "OR", cond) return qb } +// In join the IN (vals) func (qb *MySQLQueryBuilder) In(vals ...string) QueryBuilder { - qb.Tokens = append(qb.Tokens, "IN", "(", strings.Join(vals, COMMA_SPACE), ")") + qb.Tokens = append(qb.Tokens, "IN", "(", strings.Join(vals, CommaSpace), ")") return qb } +// OrderBy join the Order by fields func (qb *MySQLQueryBuilder) OrderBy(fields ...string) QueryBuilder { - qb.Tokens = append(qb.Tokens, "ORDER BY", strings.Join(fields, COMMA_SPACE)) + qb.Tokens = append(qb.Tokens, "ORDER BY", strings.Join(fields, CommaSpace)) return qb } +// Asc join the asc func (qb *MySQLQueryBuilder) Asc() QueryBuilder { qb.Tokens = append(qb.Tokens, "ASC") return qb } +// Desc join the desc func (qb *MySQLQueryBuilder) Desc() QueryBuilder { qb.Tokens = append(qb.Tokens, "DESC") return qb } +// Limit join the limit num func (qb *MySQLQueryBuilder) Limit(limit int) QueryBuilder { qb.Tokens = append(qb.Tokens, "LIMIT", strconv.Itoa(limit)) return qb } +// Offset join the offset num func (qb *MySQLQueryBuilder) Offset(offset int) QueryBuilder { qb.Tokens = append(qb.Tokens, "OFFSET", strconv.Itoa(offset)) return qb } +// GroupBy join the Group by fields func (qb *MySQLQueryBuilder) GroupBy(fields ...string) QueryBuilder { - qb.Tokens = append(qb.Tokens, "GROUP BY", strings.Join(fields, COMMA_SPACE)) + qb.Tokens = append(qb.Tokens, "GROUP BY", strings.Join(fields, CommaSpace)) return qb } +// Having join the Having cond func (qb *MySQLQueryBuilder) Having(cond string) QueryBuilder { qb.Tokens = append(qb.Tokens, "HAVING", cond) return qb } +// Update join the update table func (qb *MySQLQueryBuilder) Update(tables ...string) QueryBuilder { - qb.Tokens = append(qb.Tokens, "UPDATE", strings.Join(tables, COMMA_SPACE)) + qb.Tokens = append(qb.Tokens, "UPDATE", strings.Join(tables, CommaSpace)) return qb } +// Set join the set kv func (qb *MySQLQueryBuilder) Set(kv ...string) QueryBuilder { - qb.Tokens = append(qb.Tokens, "SET", strings.Join(kv, COMMA_SPACE)) + qb.Tokens = append(qb.Tokens, "SET", strings.Join(kv, CommaSpace)) return qb } +// Delete join the Delete tables func (qb *MySQLQueryBuilder) Delete(tables ...string) QueryBuilder { qb.Tokens = append(qb.Tokens, "DELETE") if len(tables) != 0 { - qb.Tokens = append(qb.Tokens, strings.Join(tables, COMMA_SPACE)) + qb.Tokens = append(qb.Tokens, strings.Join(tables, CommaSpace)) } return qb } +// InsertInto join the insert SQL func (qb *MySQLQueryBuilder) InsertInto(table string, fields ...string) QueryBuilder { qb.Tokens = append(qb.Tokens, "INSERT INTO", table) if len(fields) != 0 { - fieldsStr := strings.Join(fields, COMMA_SPACE) + fieldsStr := strings.Join(fields, CommaSpace) qb.Tokens = append(qb.Tokens, "(", fieldsStr, ")") } return qb } +// Values join the Values(vals) func (qb *MySQLQueryBuilder) Values(vals ...string) QueryBuilder { - valsStr := strings.Join(vals, COMMA_SPACE) + valsStr := strings.Join(vals, CommaSpace) qb.Tokens = append(qb.Tokens, "VALUES", "(", valsStr, ")") return qb } +// Subquery join the sub as alias func (qb *MySQLQueryBuilder) Subquery(sub string, alias string) string { return fmt.Sprintf("(%s) AS %s", sub, alias) } +// String join all Tokens func (qb *MySQLQueryBuilder) String() string { return strings.Join(qb.Tokens, " ") } diff --git a/orm/types.go b/orm/types.go index 95a3fee3..1bdd441a 100644 --- a/orm/types.go +++ b/orm/types.go @@ -20,13 +20,13 @@ import ( "time" ) -// database driver +// Driver define database driver type Driver interface { Name() string Type() DriverType } -// field info +// Fielder define field info type Fielder interface { String() string FieldType() int @@ -34,7 +34,7 @@ type Fielder interface { RawValue() interface{} } -// orm struct +// Ormer define the orm interface type Ormer interface { Read(interface{}, ...string) error ReadOrCreate(interface{}, string, ...string) (bool, int64, error) @@ -53,13 +53,13 @@ type Ormer interface { Driver() Driver } -// insert prepared statement +// Inserter insert prepared statement type Inserter interface { Insert(interface{}) (int64, error) Close() error } -// query seter +// QuerySeter query seter type QuerySeter interface { Filter(string, ...interface{}) QuerySeter Exclude(string, ...interface{}) QuerySeter @@ -84,7 +84,7 @@ type QuerySeter interface { RowsToStruct(interface{}, string, string) (int64, error) } -// model to model query struct +// QueryM2Mer model to model query struct type QueryM2Mer interface { Add(...interface{}) (int64, error) Remove(...interface{}) (int64, error) @@ -93,13 +93,13 @@ type QueryM2Mer interface { Count() (int64, error) } -// raw query statement +// RawPreparer raw query statement type RawPreparer interface { Exec(...interface{}) (sql.Result, error) Close() error } -// raw query seter +// RawSeter raw query seter type RawSeter interface { Exec() (sql.Result, error) QueryRow(...interface{}) error @@ -113,7 +113,7 @@ type RawSeter interface { Prepare() (RawPreparer, error) } -// statement querier +// stmtQuerier statement querier type stmtQuerier interface { Close() error Exec(args ...interface{}) (sql.Result, error) @@ -162,8 +162,8 @@ type dbBaser interface { UpdateBatch(dbQuerier, *querySet, *modelInfo, *Condition, Params, *time.Location) (int64, error) DeleteBatch(dbQuerier, *querySet, *modelInfo, *Condition, *time.Location) (int64, error) Count(dbQuerier, *querySet, *modelInfo, *Condition, *time.Location) (int64, error) - OperatorSql(string) string - GenerateOperatorSql(*modelInfo, *fieldInfo, string, []interface{}, *time.Location) (string, []interface{}) + OperatorSQL(string) string + GenerateOperatorSQL(*modelInfo, *fieldInfo, string, []interface{}, *time.Location) (string, []interface{}) GenerateOperatorLeftCol(*fieldInfo, string, *string) PrepareInsert(dbQuerier, *modelInfo) (stmtQuerier, string, error) ReadValues(dbQuerier, *querySet, *modelInfo, *Condition, []string, interface{}, *time.Location) (int64, error) diff --git a/orm/utils.go b/orm/utils.go index 88168763..f9af2515 100644 --- a/orm/utils.go +++ b/orm/utils.go @@ -22,9 +22,10 @@ import ( "time" ) +// StrTo is the target string type StrTo string -// set string +// Set string func (f *StrTo) Set(v string) { if v != "" { *f = StrTo(v) @@ -33,93 +34,93 @@ func (f *StrTo) Set(v string) { } } -// clean string +// Clear string func (f *StrTo) Clear() { *f = StrTo(0x1E) } -// check string exist +// Exist check string exist func (f StrTo) Exist() bool { return string(f) != string(0x1E) } -// string to bool +// Bool string to bool func (f StrTo) Bool() (bool, error) { return strconv.ParseBool(f.String()) } -// string to float32 +// Float32 string to float32 func (f StrTo) Float32() (float32, error) { v, err := strconv.ParseFloat(f.String(), 32) return float32(v), err } -// string to float64 +// Float64 string to float64 func (f StrTo) Float64() (float64, error) { return strconv.ParseFloat(f.String(), 64) } -// string to int +// Int string to int func (f StrTo) Int() (int, error) { v, err := strconv.ParseInt(f.String(), 10, 32) return int(v), err } -// string to int8 +// Int8 string to int8 func (f StrTo) Int8() (int8, error) { v, err := strconv.ParseInt(f.String(), 10, 8) return int8(v), err } -// string to int16 +// Int16 string to int16 func (f StrTo) Int16() (int16, error) { v, err := strconv.ParseInt(f.String(), 10, 16) return int16(v), err } -// string to int32 +// Int32 string to int32 func (f StrTo) Int32() (int32, error) { v, err := strconv.ParseInt(f.String(), 10, 32) return int32(v), err } -// string to int64 +// Int64 string to int64 func (f StrTo) Int64() (int64, error) { v, err := strconv.ParseInt(f.String(), 10, 64) return int64(v), err } -// string to uint +// Uint string to uint func (f StrTo) Uint() (uint, error) { v, err := strconv.ParseUint(f.String(), 10, 32) return uint(v), err } -// string to uint8 +// Uint8 string to uint8 func (f StrTo) Uint8() (uint8, error) { v, err := strconv.ParseUint(f.String(), 10, 8) return uint8(v), err } -// string to uint16 +// Uint16 string to uint16 func (f StrTo) Uint16() (uint16, error) { v, err := strconv.ParseUint(f.String(), 10, 16) return uint16(v), err } -// string to uint31 +// Uint32 string to uint31 func (f StrTo) Uint32() (uint32, error) { v, err := strconv.ParseUint(f.String(), 10, 32) return uint32(v), err } -// string to uint64 +// Uint64 string to uint64 func (f StrTo) Uint64() (uint64, error) { v, err := strconv.ParseUint(f.String(), 10, 64) return uint64(v), err } -// string to string +// String string to string func (f StrTo) String() string { if f.Exist() { return string(f) @@ -127,7 +128,7 @@ func (f StrTo) String() string { return "" } -// interface to string +// ToStr interface to string func ToStr(value interface{}, args ...int) (s string) { switch v := value.(type) { case bool: @@ -166,7 +167,7 @@ func ToStr(value interface{}, args ...int) (s string) { return s } -// interface to int64 +// ToInt64 interface to int64 func ToInt64(value interface{}) (d int64) { val := reflect.ValueOf(value) switch value.(type) { From ea2039c1dcdc9c2cda07e25188ab154952193669 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sat, 12 Sep 2015 22:03:45 +0800 Subject: [PATCH 212/436] golint plugins --- plugins/apiauth/apiauth.go | 18 +++++++++++------- plugins/auth/basic.go | 16 ++++++++++------ plugins/cors/cors_test.go | 15 ++++++++------- plugins/jwt/jwt.go | 27 ++++++++++++++++----------- 4 files changed, 45 insertions(+), 31 deletions(-) diff --git a/plugins/apiauth/apiauth.go b/plugins/apiauth/apiauth.go index 56a92d25..3091c698 100644 --- a/plugins/apiauth/apiauth.go +++ b/plugins/apiauth/apiauth.go @@ -33,7 +33,7 @@ // // maybe store in configure, maybe in database // } // -// beego.InsertFilter("*", beego.BeforeRouter,apiauth.APIAuthWithFunc(getAppSecret, 360)) +// beego.InsertFilter("*", beego.BeforeRouter,apiauth.APISecretAuth(getAppSecret, 360)) // // Infomation: // @@ -68,8 +68,10 @@ import ( "github.com/astaxie/beego/context" ) -type AppIdToAppSecret func(string) string +// AppIDToAppSecret is used to get appsecret throw appid +type AppIDToAppSecret func(string) string +// APIBaiscAuth use the basic appid/appkey as the AppIdToAppSecret func APIBaiscAuth(appid, appkey string) beego.FilterFunc { ft := func(aid string) string { if aid == appid { @@ -77,10 +79,11 @@ func APIBaiscAuth(appid, appkey string) beego.FilterFunc { } return "" } - return APIAuthWithFunc(ft, 300) + return APISecretAuth(ft, 300) } -func APIAuthWithFunc(f AppIdToAppSecret, timeout int) beego.FilterFunc { +// APISecretAuth use AppIdToAppSecret verify and +func APISecretAuth(f AppIDToAppSecret, timeout int) beego.FilterFunc { return func(ctx *context.Context) { if ctx.Input.Query("appid") == "" { ctx.ResponseWriter.WriteHeader(403) @@ -116,13 +119,14 @@ func APIAuthWithFunc(f AppIdToAppSecret, timeout int) beego.FilterFunc { return } if ctx.Input.Query("signature") != - Signature(appsecret, ctx.Input.Method(), ctx.Request.Form, ctx.Input.Uri()) { + Signature(appsecret, ctx.Input.Method(), ctx.Request.Form, ctx.Input.URI()) { ctx.ResponseWriter.WriteHeader(403) ctx.WriteString("auth failed") } } } +// Signature used to generate signature with the appsecret/method/params/RequestURI func Signature(appsecret, method string, params url.Values, RequestURI string) (result string) { var query string pa := make(map[string]string) @@ -139,11 +143,11 @@ func Signature(appsecret, method string, params url.Values, RequestURI string) ( query = fmt.Sprintf("%v%v%v", query, vs.Keys[i], vs.Vals[i]) } } - string_to_sign := fmt.Sprintf("%v\n%v\n%v\n", method, query, RequestURI) + stringToSign := fmt.Sprintf("%v\n%v\n%v\n", method, query, RequestURI) sha256 := sha256.New hash := hmac.New(sha256, []byte(appsecret)) - hash.Write([]byte(string_to_sign)) + hash.Write([]byte(stringToSign)) return base64.StdEncoding.EncodeToString(hash.Sum(nil)) } diff --git a/plugins/auth/basic.go b/plugins/auth/basic.go index 946b8457..c478044a 100644 --- a/plugins/auth/basic.go +++ b/plugins/auth/basic.go @@ -46,6 +46,7 @@ import ( var defaultRealm = "Authorization Required" +// Basic is the http basic auth func Basic(username string, password string) beego.FilterFunc { secrets := func(user, pass string) bool { return user == username && pass == password @@ -53,6 +54,7 @@ func Basic(username string, password string) beego.FilterFunc { return NewBasicAuthenticator(secrets, defaultRealm) } +// NewBasicAuthenticator return the BasicAuth func NewBasicAuthenticator(secrets SecretProvider, Realm string) beego.FilterFunc { return func(ctx *context.Context) { a := &BasicAuth{Secrets: secrets, Realm: Realm} @@ -62,17 +64,19 @@ func NewBasicAuthenticator(secrets SecretProvider, Realm string) beego.FilterFun } } +// SecretProvider is the SecretProvider function type SecretProvider func(user, pass string) bool +// BasicAuth store the SecretProvider and Realm type BasicAuth struct { Secrets SecretProvider Realm string } -//Checks the username/password combination from the request. Returns -//either an empty string (authentication failed) or the name of the -//authenticated user. -//Supports MD5 and SHA1 password entries +// CheckAuth Checks the username/password combination from the request. Returns +// either an empty string (authentication failed) or the name of the +// authenticated user. +// Supports MD5 and SHA1 password entries func (a *BasicAuth) CheckAuth(r *http.Request) string { s := strings.SplitN(r.Header.Get("Authorization"), " ", 2) if len(s) != 2 || s[0] != "Basic" { @@ -94,8 +98,8 @@ func (a *BasicAuth) CheckAuth(r *http.Request) string { return "" } -//http.Handler for BasicAuth which initiates the authentication process -//(or requires reauthentication). +// RequireAuth http.Handler for BasicAuth which initiates the authentication process +// (or requires reauthentication). func (a *BasicAuth) RequireAuth(w http.ResponseWriter, r *http.Request) { w.Header().Set("WWW-Authenticate", `Basic realm="`+a.Realm+`"`) w.WriteHeader(401) diff --git a/plugins/cors/cors_test.go b/plugins/cors/cors_test.go index 5c02ab98..56816dd9 100644 --- a/plugins/cors/cors_test.go +++ b/plugins/cors/cors_test.go @@ -25,21 +25,23 @@ import ( "github.com/astaxie/beego/context" ) -type HttpHeaderGuardRecorder struct { +// HTTPHeaderGuardRecorder is httptest.ResponseRecorder with own http.Header +type HTTPHeaderGuardRecorder struct { *httptest.ResponseRecorder savedHeaderMap http.Header } -func NewRecorder() *HttpHeaderGuardRecorder { - return &HttpHeaderGuardRecorder{httptest.NewRecorder(), nil} +// NewRecorder return HttpHeaderGuardRecorder +func NewRecorder() *HTTPHeaderGuardRecorder { + return &HTTPHeaderGuardRecorder{httptest.NewRecorder(), nil} } -func (gr *HttpHeaderGuardRecorder) WriteHeader(code int) { +func (gr *HTTPHeaderGuardRecorder) WriteHeader(code int) { gr.ResponseRecorder.WriteHeader(code) gr.savedHeaderMap = gr.ResponseRecorder.Header() } -func (gr *HttpHeaderGuardRecorder) Header() http.Header { +func (gr *HTTPHeaderGuardRecorder) Header() http.Header { if gr.savedHeaderMap != nil { // headers were written. clone so we don't get updates clone := make(http.Header) @@ -47,9 +49,8 @@ func (gr *HttpHeaderGuardRecorder) Header() http.Header { clone[k] = v } return clone - } else { - return gr.ResponseRecorder.Header() } + return gr.ResponseRecorder.Header() } func Test_AllowAll(t *testing.T) { diff --git a/plugins/jwt/jwt.go b/plugins/jwt/jwt.go index fd064686..49bc0e3b 100644 --- a/plugins/jwt/jwt.go +++ b/plugins/jwt/jwt.go @@ -50,17 +50,17 @@ // beego.AddNamespace(ns) // } // - package jwt import ( + "io/ioutil" + "net/http" + "time" + "github.com/astaxie/beego" "github.com/astaxie/beego/context" "github.com/astaxie/beego/logs" goJwt "github.com/dgrijalva/jwt-go" - "io/ioutil" - "net/http" - "time" ) // Options for the JWT Auth @@ -70,11 +70,13 @@ type Options struct { WhiteList []string } +// RSAKeys store PrivateKey and PublicKey var RSAKeys struct { PrivateKey []byte PublicKey []byte } +// AuthRequest retunn FilterFunc func AuthRequest(o *Options) beego.FilterFunc { RSAKeys.PrivateKey, _ = ioutil.ReadFile(o.PrivateKeyPath) RSAKeys.PublicKey, _ = ioutil.ReadFile(o.PublicKeyPath) @@ -101,26 +103,29 @@ func AuthRequest(o *Options) beego.FilterFunc { } } -// oprations for Jwt -type JwtController struct { +// Controller oprations for Jwt +type Controller struct { beego.Controller } -func (this *JwtController) URLMapping() { - this.Mapping("IssueToken", this.IssueToken) +// URLMapping is used to mapping the string to method +func (c *Controller) URLMapping() { + c.Mapping("IssueToken", c.IssueToken) } +// IssueToken function // @Title IssueToken // @Description Issue a Json Web Token // @Success 200 string // @Failure 403 no privilege to access // @Failure 500 server inner error // @router /issue-token [get] -func (this *JwtController) IssueToken() { - this.Data["json"] = CreateToken() - this.ServeJson() +func (c *Controller) IssueToken() { + c.Data["json"] = CreateToken() + c.ServeJSON() } +// CreateToken return the token func CreateToken() map[string]string { log := logs.NewLogger(10000) log.SetLogger("console", "") From 172894efe8a00aa295cbaab6b60e03b8cb5021a3 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sat, 12 Sep 2015 22:53:55 +0800 Subject: [PATCH 213/436] golint session --- context/input.go | 2 +- controller.go | 6 +-- session/couchbase/sess_couchbase.go | 68 +++++++++++++---------- session/ledis/ledis_session.go | 75 +++++++++++++------------- session/memcache/sess_memcache.go | 64 +++++++++++----------- session/mysql/sess_mysql.go | 81 ++++++++++++++-------------- session/postgres/sess_postgresql.go | 84 ++++++++++++++--------------- session/redis/sess_redis.go | 82 ++++++++++++++-------------- session/sess_cookie.go | 33 ++++++------ session/sess_file.go | 38 +++++++------ session/sess_mem.go | 71 ++++++++++++------------ session/sess_utils.go | 6 +-- session/session.go | 65 +++++++++++----------- 13 files changed, 336 insertions(+), 339 deletions(-) diff --git a/context/input.go b/context/input.go index 2cf3235f..53cc3e88 100644 --- a/context/input.go +++ b/context/input.go @@ -39,7 +39,7 @@ var ( // BeegoInput operates the http request header, data, cookie and body. // it also contains router params and current session. type BeegoInput struct { - CruSession session.SessionStore + CruSession session.Store Params map[string]string Data map[interface{}]interface{} // store some values in this context when calling context in filter or controller. Request *http.Request diff --git a/controller.go b/controller.go index 39a7c91b..7fbf6dc5 100644 --- a/controller.go +++ b/controller.go @@ -67,7 +67,7 @@ type Controller struct { TplExt string _xsrfToken string gotofunc string - CruSession session.SessionStore + CruSession session.Store XSRFExpire int AppController interface{} EnableRender bool @@ -559,7 +559,7 @@ func (c *Controller) SaveToFile(fromfile, tofile string) error { } // StartSession starts session and load old session data info this controller. -func (c *Controller) StartSession() session.SessionStore { +func (c *Controller) StartSession() session.Store { if c.CruSession == nil { c.CruSession = c.Ctx.Input.CruSession } @@ -596,7 +596,7 @@ func (c *Controller) SessionRegenerateID() { if c.CruSession != nil { c.CruSession.SessionRelease(c.Ctx.ResponseWriter) } - c.CruSession = GlobalSessions.SessionRegenerateId(c.Ctx.ResponseWriter, c.Ctx.Request) + c.CruSession = GlobalSessions.SessionRegenerateID(c.Ctx.ResponseWriter, c.Ctx.Request) c.Ctx.Input.CruSession = c.CruSession } diff --git a/session/couchbase/sess_couchbase.go b/session/couchbase/sess_couchbase.go index 827d55d9..f5320dd7 100644 --- a/session/couchbase/sess_couchbase.go +++ b/session/couchbase/sess_couchbase.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// package couchbase for session provider +// Package couchbase for session provider // // depend on github.com/couchbaselabs/go-couchbasee // @@ -30,21 +30,22 @@ // } // // more docs: http://beego.me/docs/module/session.md -package session +package couchbase import ( "net/http" "strings" "sync" - "github.com/couchbaselabs/go-couchbase" + "gh.apple.com/md/go-couchbase" "github.com/astaxie/beego/session" ) -var couchbpder = &CouchbaseProvider{} +var couchbpder = &Provider{} -type CouchbaseSessionStore struct { +// SessionStore store each session +type SessionStore struct { b *couchbase.Bucket sid string lock sync.RWMutex @@ -52,7 +53,8 @@ type CouchbaseSessionStore struct { maxlifetime int64 } -type CouchbaseProvider struct { +// Provider couchabse provided +type Provider struct { maxlifetime int64 savePath string pool string @@ -60,42 +62,47 @@ type CouchbaseProvider struct { b *couchbase.Bucket } -func (cs *CouchbaseSessionStore) Set(key, value interface{}) error { +// Set value to couchabse session +func (cs *SessionStore) Set(key, value interface{}) error { cs.lock.Lock() defer cs.lock.Unlock() cs.values[key] = value return nil } -func (cs *CouchbaseSessionStore) Get(key interface{}) interface{} { +// Get value from couchabse session +func (cs *SessionStore) Get(key interface{}) interface{} { cs.lock.RLock() defer cs.lock.RUnlock() if v, ok := cs.values[key]; ok { return v - } else { - return nil } + return nil } -func (cs *CouchbaseSessionStore) Delete(key interface{}) error { +// Delete value in couchbase session by given key +func (cs *SessionStore) Delete(key interface{}) error { cs.lock.Lock() defer cs.lock.Unlock() delete(cs.values, key) return nil } -func (cs *CouchbaseSessionStore) Flush() error { +// Flush Clean all values in couchbase session +func (cs *SessionStore) Flush() error { cs.lock.Lock() defer cs.lock.Unlock() cs.values = make(map[interface{}]interface{}) return nil } -func (cs *CouchbaseSessionStore) SessionID() string { +// SessionID Get couchbase session store id +func (cs *SessionStore) SessionID() string { return cs.sid } -func (cs *CouchbaseSessionStore) SessionRelease(w http.ResponseWriter) { +// SessionRelease Write couchbase session with Gob string +func (cs *SessionStore) SessionRelease(w http.ResponseWriter) { defer cs.b.Close() bo, err := session.EncodeGob(cs.values) @@ -106,7 +113,7 @@ func (cs *CouchbaseSessionStore) SessionRelease(w http.ResponseWriter) { cs.b.Set(cs.sid, int(cs.maxlifetime), bo) } -func (cp *CouchbaseProvider) getBucket() *couchbase.Bucket { +func (cp *Provider) getBucket() *couchbase.Bucket { c, err := couchbase.Connect(cp.savePath) if err != nil { return nil @@ -125,10 +132,10 @@ func (cp *CouchbaseProvider) getBucket() *couchbase.Bucket { return bucket } -// init couchbase session +// SessionInit init couchbase session // savepath like couchbase server REST/JSON URL // e.g. http://host:port/, Pool, Bucket -func (cp *CouchbaseProvider) SessionInit(maxlifetime int64, savePath string) error { +func (cp *Provider) SessionInit(maxlifetime int64, savePath string) error { cp.maxlifetime = maxlifetime configs := strings.Split(savePath, ",") if len(configs) > 0 { @@ -144,8 +151,8 @@ func (cp *CouchbaseProvider) SessionInit(maxlifetime int64, savePath string) err return nil } -// read couchbase session by sid -func (cp *CouchbaseProvider) SessionRead(sid string) (session.SessionStore, error) { +// SessionRead read couchbase session by sid +func (cp *Provider) SessionRead(sid string) (session.Store, error) { cp.b = cp.getBucket() var doc []byte @@ -161,11 +168,13 @@ func (cp *CouchbaseProvider) SessionRead(sid string) (session.SessionStore, erro } } - cs := &CouchbaseSessionStore{b: cp.b, sid: sid, values: kv, maxlifetime: cp.maxlifetime} + cs := &SessionStore{b: cp.b, sid: sid, values: kv, maxlifetime: cp.maxlifetime} return cs, nil } -func (cp *CouchbaseProvider) SessionExist(sid string) bool { +// SessionExist Check couchbase session exist. +// it checkes sid exist or not. +func (cp *Provider) SessionExist(sid string) bool { cp.b = cp.getBucket() defer cp.b.Close() @@ -173,12 +182,12 @@ func (cp *CouchbaseProvider) SessionExist(sid string) bool { if err := cp.b.Get(sid, &doc); err != nil || doc == nil { return false - } else { - return true } + return true } -func (cp *CouchbaseProvider) SessionRegenerate(oldsid, sid string) (session.SessionStore, error) { +// SessionRegenerate remove oldsid and use sid to generate new session +func (cp *Provider) SessionRegenerate(oldsid, sid string) (session.Store, error) { cp.b = cp.getBucket() var doc []byte @@ -206,11 +215,12 @@ func (cp *CouchbaseProvider) SessionRegenerate(oldsid, sid string) (session.Sess } } - cs := &CouchbaseSessionStore{b: cp.b, sid: sid, values: kv, maxlifetime: cp.maxlifetime} + cs := &SessionStore{b: cp.b, sid: sid, values: kv, maxlifetime: cp.maxlifetime} return cs, nil } -func (cp *CouchbaseProvider) SessionDestroy(sid string) error { +// SessionDestroy Remove bucket in this couchbase +func (cp *Provider) SessionDestroy(sid string) error { cp.b = cp.getBucket() defer cp.b.Close() @@ -218,11 +228,13 @@ func (cp *CouchbaseProvider) SessionDestroy(sid string) error { return nil } -func (cp *CouchbaseProvider) SessionGC() { +// SessionGC Recycle +func (cp *Provider) SessionGC() { return } -func (cp *CouchbaseProvider) SessionAll() int { +// SessionAll return all active session +func (cp *Provider) SessionAll() int { return 0 } diff --git a/session/ledis/ledis_session.go b/session/ledis/ledis_session.go index 643b8817..68f37b08 100644 --- a/session/ledis/ledis_session.go +++ b/session/ledis/ledis_session.go @@ -1,4 +1,5 @@ -package session +// Package ledis provide session Provider +package ledis import ( "net/http" @@ -11,59 +12,58 @@ import ( "github.com/siddontang/ledisdb/ledis" ) -var ledispder = &LedisProvider{} +var ledispder = &Provider{} var c *ledis.DB -// ledis session store -type LedisSessionStore struct { +// SessionStore ledis session store +type SessionStore struct { sid string lock sync.RWMutex values map[interface{}]interface{} maxlifetime int64 } -// set value in ledis session -func (ls *LedisSessionStore) Set(key, value interface{}) error { +// Set value in ledis session +func (ls *SessionStore) Set(key, value interface{}) error { ls.lock.Lock() defer ls.lock.Unlock() ls.values[key] = value return nil } -// get value in ledis session -func (ls *LedisSessionStore) Get(key interface{}) interface{} { +// Get value in ledis session +func (ls *SessionStore) Get(key interface{}) interface{} { ls.lock.RLock() defer ls.lock.RUnlock() if v, ok := ls.values[key]; ok { return v - } else { - return nil } + return nil } -// delete value in ledis session -func (ls *LedisSessionStore) Delete(key interface{}) error { +// Delete value in ledis session +func (ls *SessionStore) Delete(key interface{}) error { ls.lock.Lock() defer ls.lock.Unlock() delete(ls.values, key) return nil } -// clear all values in ledis session -func (ls *LedisSessionStore) Flush() error { +// Flush clear all values in ledis session +func (ls *SessionStore) Flush() error { ls.lock.Lock() defer ls.lock.Unlock() ls.values = make(map[interface{}]interface{}) return nil } -// get ledis session id -func (ls *LedisSessionStore) SessionID() string { +// SessionID get ledis session id +func (ls *SessionStore) SessionID() string { return ls.sid } -// save session values to ledis -func (ls *LedisSessionStore) SessionRelease(w http.ResponseWriter) { +// SessionRelease save session values to ledis +func (ls *SessionStore) SessionRelease(w http.ResponseWriter) { b, err := session.EncodeGob(ls.values) if err != nil { return @@ -72,17 +72,17 @@ func (ls *LedisSessionStore) SessionRelease(w http.ResponseWriter) { c.Expire([]byte(ls.sid), ls.maxlifetime) } -// ledis session provider -type LedisProvider struct { +// Provider ledis session provider +type Provider struct { maxlifetime int64 savePath string db int } -// init ledis session +// SessionInit init ledis session // savepath like ledis server saveDataPath,pool size // e.g. 127.0.0.1:6379,100,astaxie -func (lp *LedisProvider) SessionInit(maxlifetime int64, savePath string) error { +func (lp *Provider) SessionInit(maxlifetime int64, savePath string) error { var err error lp.maxlifetime = maxlifetime configs := strings.Split(savePath, ",") @@ -106,8 +106,8 @@ func (lp *LedisProvider) SessionInit(maxlifetime int64, savePath string) error { return nil } -// read ledis session by sid -func (lp *LedisProvider) SessionRead(sid string) (session.SessionStore, error) { +// SessionRead read ledis session by sid +func (lp *Provider) SessionRead(sid string) (session.Store, error) { kvs, err := c.Get([]byte(sid)) var kv map[interface{}]interface{} if len(kvs) == 0 { @@ -118,22 +118,21 @@ func (lp *LedisProvider) SessionRead(sid string) (session.SessionStore, error) { return nil, err } } - ls := &LedisSessionStore{sid: sid, values: kv, maxlifetime: lp.maxlifetime} + ls := &SessionStore{sid: sid, values: kv, maxlifetime: lp.maxlifetime} return ls, nil } -// check ledis session exist by sid -func (lp *LedisProvider) SessionExist(sid string) bool { +// SessionExist check ledis session exist by sid +func (lp *Provider) SessionExist(sid string) bool { count, _ := c.Exists([]byte(sid)) if count == 0 { return false - } else { - return true } + return true } -// generate new sid for ledis session -func (lp *LedisProvider) SessionRegenerate(oldsid, sid string) (session.SessionStore, error) { +// SessionRegenerate generate new sid for ledis session +func (lp *Provider) SessionRegenerate(oldsid, sid string) (session.Store, error) { count, _ := c.Exists([]byte(sid)) if count == 0 { // oldsid doesn't exists, set the new sid directly @@ -156,23 +155,23 @@ func (lp *LedisProvider) SessionRegenerate(oldsid, sid string) (session.SessionS return nil, err } } - ls := &LedisSessionStore{sid: sid, values: kv, maxlifetime: lp.maxlifetime} + ls := &SessionStore{sid: sid, values: kv, maxlifetime: lp.maxlifetime} return ls, nil } -// delete ledis session by id -func (lp *LedisProvider) SessionDestroy(sid string) error { +// SessionDestroy delete ledis session by id +func (lp *Provider) SessionDestroy(sid string) error { c.Del([]byte(sid)) return nil } -// Impelment method, no used. -func (lp *LedisProvider) SessionGC() { +// SessionGC Impelment method, no used. +func (lp *Provider) SessionGC() { return } -// @todo -func (lp *LedisProvider) SessionAll() int { +// SessionAll return all active session +func (lp *Provider) SessionAll() int { return 0 } func init() { diff --git a/session/memcache/sess_memcache.go b/session/memcache/sess_memcache.go index bb33075a..f1069bc9 100644 --- a/session/memcache/sess_memcache.go +++ b/session/memcache/sess_memcache.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// package memcache for session provider +// Package memcache for session provider // // depend on github.com/bradfitz/gomemcache/memcache // @@ -30,7 +30,7 @@ // } // // more docs: http://beego.me/docs/module/session.md -package session +package memcache import ( "net/http" @@ -45,56 +45,55 @@ import ( var mempder = &MemProvider{} var client *memcache.Client -// memcache session store -type MemcacheSessionStore struct { +// SessionStore memcache session store +type SessionStore struct { sid string lock sync.RWMutex values map[interface{}]interface{} maxlifetime int64 } -// set value in memcache session -func (rs *MemcacheSessionStore) Set(key, value interface{}) error { +// Set value in memcache session +func (rs *SessionStore) Set(key, value interface{}) error { rs.lock.Lock() defer rs.lock.Unlock() rs.values[key] = value return nil } -// get value in memcache session -func (rs *MemcacheSessionStore) Get(key interface{}) interface{} { +// Get value in memcache session +func (rs *SessionStore) Get(key interface{}) interface{} { rs.lock.RLock() defer rs.lock.RUnlock() if v, ok := rs.values[key]; ok { return v - } else { - return nil } + return nil } -// delete value in memcache session -func (rs *MemcacheSessionStore) Delete(key interface{}) error { +// Delete value in memcache session +func (rs *SessionStore) Delete(key interface{}) error { rs.lock.Lock() defer rs.lock.Unlock() delete(rs.values, key) return nil } -// clear all values in memcache session -func (rs *MemcacheSessionStore) Flush() error { +// Flush clear all values in memcache session +func (rs *SessionStore) Flush() error { rs.lock.Lock() defer rs.lock.Unlock() rs.values = make(map[interface{}]interface{}) return nil } -// get memcache session id -func (rs *MemcacheSessionStore) SessionID() string { +// SessionID get memcache session id +func (rs *SessionStore) SessionID() string { return rs.sid } -// save session values to memcache -func (rs *MemcacheSessionStore) SessionRelease(w http.ResponseWriter) { +// SessionRelease save session values to memcache +func (rs *SessionStore) SessionRelease(w http.ResponseWriter) { b, err := session.EncodeGob(rs.values) if err != nil { return @@ -103,7 +102,7 @@ func (rs *MemcacheSessionStore) SessionRelease(w http.ResponseWriter) { client.Set(&item) } -// memcahe session provider +// MemProvider memcache session provider type MemProvider struct { maxlifetime int64 conninfo []string @@ -111,7 +110,7 @@ type MemProvider struct { password string } -// init memcache session +// SessionInit init memcache session // savepath like // e.g. 127.0.0.1:9090 func (rp *MemProvider) SessionInit(maxlifetime int64, savePath string) error { @@ -121,8 +120,8 @@ func (rp *MemProvider) SessionInit(maxlifetime int64, savePath string) error { return nil } -// read memcache session by sid -func (rp *MemProvider) SessionRead(sid string) (session.SessionStore, error) { +// SessionRead read memcache session by sid +func (rp *MemProvider) SessionRead(sid string) (session.Store, error) { if client == nil { if err := rp.connectInit(); err != nil { return nil, err @@ -130,7 +129,7 @@ func (rp *MemProvider) SessionRead(sid string) (session.SessionStore, error) { } item, err := client.Get(sid) if err != nil && err == memcache.ErrCacheMiss { - rs := &MemcacheSessionStore{sid: sid, values: make(map[interface{}]interface{}), maxlifetime: rp.maxlifetime} + rs := &SessionStore{sid: sid, values: make(map[interface{}]interface{}), maxlifetime: rp.maxlifetime} return rs, nil } var kv map[interface{}]interface{} @@ -142,11 +141,11 @@ func (rp *MemProvider) SessionRead(sid string) (session.SessionStore, error) { return nil, err } } - rs := &MemcacheSessionStore{sid: sid, values: kv, maxlifetime: rp.maxlifetime} + rs := &SessionStore{sid: sid, values: kv, maxlifetime: rp.maxlifetime} return rs, nil } -// check memcache session exist by sid +// SessionExist check memcache session exist by sid func (rp *MemProvider) SessionExist(sid string) bool { if client == nil { if err := rp.connectInit(); err != nil { @@ -155,13 +154,12 @@ func (rp *MemProvider) SessionExist(sid string) bool { } if item, err := client.Get(sid); err != nil || len(item.Value) == 0 { return false - } else { - return true } + return true } -// generate new sid for memcache session -func (rp *MemProvider) SessionRegenerate(oldsid, sid string) (session.SessionStore, error) { +// SessionRegenerate generate new sid for memcache session +func (rp *MemProvider) SessionRegenerate(oldsid, sid string) (session.Store, error) { if client == nil { if err := rp.connectInit(); err != nil { return nil, err @@ -195,11 +193,11 @@ func (rp *MemProvider) SessionRegenerate(oldsid, sid string) (session.SessionSto } } - rs := &MemcacheSessionStore{sid: sid, values: kv, maxlifetime: rp.maxlifetime} + rs := &SessionStore{sid: sid, values: kv, maxlifetime: rp.maxlifetime} return rs, nil } -// delete memcache session by id +// SessionDestroy delete memcache session by id func (rp *MemProvider) SessionDestroy(sid string) error { if client == nil { if err := rp.connectInit(); err != nil { @@ -219,12 +217,12 @@ func (rp *MemProvider) connectInit() error { return nil } -// Impelment method, no used. +// SessionGC Impelment method, no used. func (rp *MemProvider) SessionGC() { return } -// @todo +// SessionAll return all activeSession func (rp *MemProvider) SessionAll() int { return 0 } diff --git a/session/mysql/sess_mysql.go b/session/mysql/sess_mysql.go index 26237e95..969d26c9 100644 --- a/session/mysql/sess_mysql.go +++ b/session/mysql/sess_mysql.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// package mysql for session provider +// Package mysql for session provider // // depends on github.com/go-sql-driver/mysql: // @@ -38,7 +38,7 @@ // } // // more docs: http://beego.me/docs/module/session.md -package session +package mysql import ( "database/sql" @@ -47,67 +47,67 @@ import ( "time" "github.com/astaxie/beego/session" - + // import mysql driver _ "github.com/go-sql-driver/mysql" ) var ( + // TableName store the session in MySQL TableName = "session" - mysqlpder = &MysqlProvider{} + mysqlpder = &Provider{} ) -// mysql session store -type MysqlSessionStore struct { +// SessionStore mysql session store +type SessionStore struct { c *sql.DB sid string lock sync.RWMutex values map[interface{}]interface{} } -// set value in mysql session. +// Set value in mysql session. // it is temp value in map. -func (st *MysqlSessionStore) Set(key, value interface{}) error { +func (st *SessionStore) Set(key, value interface{}) error { st.lock.Lock() defer st.lock.Unlock() st.values[key] = value return nil } -// get value from mysql session -func (st *MysqlSessionStore) Get(key interface{}) interface{} { +// Get value from mysql session +func (st *SessionStore) Get(key interface{}) interface{} { st.lock.RLock() defer st.lock.RUnlock() if v, ok := st.values[key]; ok { return v - } else { - return nil } + return nil } -// delete value in mysql session -func (st *MysqlSessionStore) Delete(key interface{}) error { +// Delete value in mysql session +func (st *SessionStore) Delete(key interface{}) error { st.lock.Lock() defer st.lock.Unlock() delete(st.values, key) return nil } -// clear all values in mysql session -func (st *MysqlSessionStore) Flush() error { +// Flush clear all values in mysql session +func (st *SessionStore) Flush() error { st.lock.Lock() defer st.lock.Unlock() st.values = make(map[interface{}]interface{}) return nil } -// get session id of this mysql session store -func (st *MysqlSessionStore) SessionID() string { +// SessionID get session id of this mysql session store +func (st *SessionStore) SessionID() string { return st.sid } -// save mysql session values to database. +// SessionRelease save mysql session values to database. // must call this method to save values to database. -func (st *MysqlSessionStore) SessionRelease(w http.ResponseWriter) { +func (st *SessionStore) SessionRelease(w http.ResponseWriter) { defer st.c.Close() b, err := session.EncodeGob(st.values) if err != nil { @@ -118,14 +118,14 @@ func (st *MysqlSessionStore) SessionRelease(w http.ResponseWriter) { } -// mysql session provider -type MysqlProvider struct { +// Provider mysql session provider +type Provider struct { maxlifetime int64 savePath string } // connect to mysql -func (mp *MysqlProvider) connectInit() *sql.DB { +func (mp *Provider) connectInit() *sql.DB { db, e := sql.Open("mysql", mp.savePath) if e != nil { return nil @@ -133,16 +133,16 @@ func (mp *MysqlProvider) connectInit() *sql.DB { return db } -// init mysql session. +// SessionInit init mysql session. // savepath is the connection string of mysql. -func (mp *MysqlProvider) SessionInit(maxlifetime int64, savePath string) error { +func (mp *Provider) SessionInit(maxlifetime int64, savePath string) error { mp.maxlifetime = maxlifetime mp.savePath = savePath return nil } -// get mysql session by sid -func (mp *MysqlProvider) SessionRead(sid string) (session.SessionStore, error) { +// SessionRead get mysql session by sid +func (mp *Provider) SessionRead(sid string) (session.Store, error) { c := mp.connectInit() row := c.QueryRow("select session_data from "+TableName+" where session_key=?", sid) var sessiondata []byte @@ -160,12 +160,12 @@ func (mp *MysqlProvider) SessionRead(sid string) (session.SessionStore, error) { return nil, err } } - rs := &MysqlSessionStore{c: c, sid: sid, values: kv} + rs := &SessionStore{c: c, sid: sid, values: kv} return rs, nil } -// check mysql session exist -func (mp *MysqlProvider) SessionExist(sid string) bool { +// SessionExist check mysql session exist +func (mp *Provider) SessionExist(sid string) bool { c := mp.connectInit() defer c.Close() row := c.QueryRow("select session_data from "+TableName+" where session_key=?", sid) @@ -173,13 +173,12 @@ func (mp *MysqlProvider) SessionExist(sid string) bool { err := row.Scan(&sessiondata) if err == sql.ErrNoRows { return false - } else { - return true } + return true } -// generate new sid for mysql session -func (mp *MysqlProvider) SessionRegenerate(oldsid, sid string) (session.SessionStore, error) { +// SessionRegenerate generate new sid for mysql session +func (mp *Provider) SessionRegenerate(oldsid, sid string) (session.Store, error) { c := mp.connectInit() row := c.QueryRow("select session_data from "+TableName+" where session_key=?", oldsid) var sessiondata []byte @@ -197,28 +196,28 @@ func (mp *MysqlProvider) SessionRegenerate(oldsid, sid string) (session.SessionS return nil, err } } - rs := &MysqlSessionStore{c: c, sid: sid, values: kv} + rs := &SessionStore{c: c, sid: sid, values: kv} return rs, nil } -// delete mysql session by sid -func (mp *MysqlProvider) SessionDestroy(sid string) error { +// SessionDestroy delete mysql session by sid +func (mp *Provider) SessionDestroy(sid string) error { c := mp.connectInit() c.Exec("DELETE FROM "+TableName+" where session_key=?", sid) c.Close() return nil } -// delete expired values in mysql session -func (mp *MysqlProvider) SessionGC() { +// SessionGC delete expired values in mysql session +func (mp *Provider) SessionGC() { c := mp.connectInit() c.Exec("DELETE from "+TableName+" where session_expiry < ?", time.Now().Unix()-mp.maxlifetime) c.Close() return } -// count values in mysql session -func (mp *MysqlProvider) SessionAll() int { +// SessionAll count values in mysql session +func (mp *Provider) SessionAll() int { c := mp.connectInit() defer c.Close() var total int diff --git a/session/postgres/sess_postgresql.go b/session/postgres/sess_postgresql.go index ac9a1612..73f9c13a 100644 --- a/session/postgres/sess_postgresql.go +++ b/session/postgres/sess_postgresql.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// package postgresql for session provider +// Package postgres for session provider // // depends on github.com/lib/pq: // @@ -27,9 +27,9 @@ // session_expiry timestamp NOT NULL, // CONSTRAINT session_key PRIMARY KEY(session_key) // ); - +// // will be activated with these settings in app.conf: - +// // SessionOn = true // SessionProvider = postgresql // SessionSavePath = "user=a password=b dbname=c sslmode=disable" @@ -48,7 +48,7 @@ // } // // more docs: http://beego.me/docs/module/session.md -package session +package postgres import ( "database/sql" @@ -57,64 +57,63 @@ import ( "time" "github.com/astaxie/beego/session" - + // import postgresql Driver _ "github.com/lib/pq" ) -var postgresqlpder = &PostgresqlProvider{} +var postgresqlpder = &Provider{} -// postgresql session store -type PostgresqlSessionStore struct { +// SessionStore postgresql session store +type SessionStore struct { c *sql.DB sid string lock sync.RWMutex values map[interface{}]interface{} } -// set value in postgresql session. +// Set value in postgresql session. // it is temp value in map. -func (st *PostgresqlSessionStore) Set(key, value interface{}) error { +func (st *SessionStore) Set(key, value interface{}) error { st.lock.Lock() defer st.lock.Unlock() st.values[key] = value return nil } -// get value from postgresql session -func (st *PostgresqlSessionStore) Get(key interface{}) interface{} { +// Get value from postgresql session +func (st *SessionStore) Get(key interface{}) interface{} { st.lock.RLock() defer st.lock.RUnlock() if v, ok := st.values[key]; ok { return v - } else { - return nil } + return nil } -// delete value in postgresql session -func (st *PostgresqlSessionStore) Delete(key interface{}) error { +// Delete value in postgresql session +func (st *SessionStore) Delete(key interface{}) error { st.lock.Lock() defer st.lock.Unlock() delete(st.values, key) return nil } -// clear all values in postgresql session -func (st *PostgresqlSessionStore) Flush() error { +// Flush clear all values in postgresql session +func (st *SessionStore) Flush() error { st.lock.Lock() defer st.lock.Unlock() st.values = make(map[interface{}]interface{}) return nil } -// get session id of this postgresql session store -func (st *PostgresqlSessionStore) SessionID() string { +// SessionID get session id of this postgresql session store +func (st *SessionStore) SessionID() string { return st.sid } -// save postgresql session values to database. +// SessionRelease save postgresql session values to database. // must call this method to save values to database. -func (st *PostgresqlSessionStore) SessionRelease(w http.ResponseWriter) { +func (st *SessionStore) SessionRelease(w http.ResponseWriter) { defer st.c.Close() b, err := session.EncodeGob(st.values) if err != nil { @@ -125,14 +124,14 @@ func (st *PostgresqlSessionStore) SessionRelease(w http.ResponseWriter) { } -// postgresql session provider -type PostgresqlProvider struct { +// Provider postgresql session provider +type Provider struct { maxlifetime int64 savePath string } // connect to postgresql -func (mp *PostgresqlProvider) connectInit() *sql.DB { +func (mp *Provider) connectInit() *sql.DB { db, e := sql.Open("postgres", mp.savePath) if e != nil { return nil @@ -140,16 +139,16 @@ func (mp *PostgresqlProvider) connectInit() *sql.DB { return db } -// init postgresql session. +// SessionInit init postgresql session. // savepath is the connection string of postgresql. -func (mp *PostgresqlProvider) SessionInit(maxlifetime int64, savePath string) error { +func (mp *Provider) SessionInit(maxlifetime int64, savePath string) error { mp.maxlifetime = maxlifetime mp.savePath = savePath return nil } -// get postgresql session by sid -func (mp *PostgresqlProvider) SessionRead(sid string) (session.SessionStore, error) { +// SessionRead get postgresql session by sid +func (mp *Provider) SessionRead(sid string) (session.Store, error) { c := mp.connectInit() row := c.QueryRow("select session_data from session where session_key=$1", sid) var sessiondata []byte @@ -174,12 +173,12 @@ func (mp *PostgresqlProvider) SessionRead(sid string) (session.SessionStore, err return nil, err } } - rs := &PostgresqlSessionStore{c: c, sid: sid, values: kv} + rs := &SessionStore{c: c, sid: sid, values: kv} return rs, nil } -// check postgresql session exist -func (mp *PostgresqlProvider) SessionExist(sid string) bool { +// SessionExist check postgresql session exist +func (mp *Provider) SessionExist(sid string) bool { c := mp.connectInit() defer c.Close() row := c.QueryRow("select session_data from session where session_key=$1", sid) @@ -188,13 +187,12 @@ func (mp *PostgresqlProvider) SessionExist(sid string) bool { if err == sql.ErrNoRows { return false - } else { - return true } + return true } -// generate new sid for postgresql session -func (mp *PostgresqlProvider) SessionRegenerate(oldsid, sid string) (session.SessionStore, error) { +// SessionRegenerate generate new sid for postgresql session +func (mp *Provider) SessionRegenerate(oldsid, sid string) (session.Store, error) { c := mp.connectInit() row := c.QueryRow("select session_data from session where session_key=$1", oldsid) var sessiondata []byte @@ -213,28 +211,28 @@ func (mp *PostgresqlProvider) SessionRegenerate(oldsid, sid string) (session.Ses return nil, err } } - rs := &PostgresqlSessionStore{c: c, sid: sid, values: kv} + rs := &SessionStore{c: c, sid: sid, values: kv} return rs, nil } -// delete postgresql session by sid -func (mp *PostgresqlProvider) SessionDestroy(sid string) error { +// SessionDestroy delete postgresql session by sid +func (mp *Provider) SessionDestroy(sid string) error { c := mp.connectInit() c.Exec("DELETE FROM session where session_key=$1", sid) c.Close() return nil } -// delete expired values in postgresql session -func (mp *PostgresqlProvider) SessionGC() { +// SessionGC delete expired values in postgresql session +func (mp *Provider) SessionGC() { c := mp.connectInit() c.Exec("DELETE from session where EXTRACT(EPOCH FROM (current_timestamp - session_expiry)) > $1", mp.maxlifetime) c.Close() return } -// count values in postgresql session -func (mp *PostgresqlProvider) SessionAll() int { +// SessionAll count values in postgresql session +func (mp *Provider) SessionAll() int { c := mp.connectInit() defer c.Close() var total int diff --git a/session/redis/sess_redis.go b/session/redis/sess_redis.go index d31feb2c..18e1f888 100644 --- a/session/redis/sess_redis.go +++ b/session/redis/sess_redis.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// package redis for session provider +// Package redis for session provider // // depend on github.com/garyburd/redigo/redis // @@ -30,7 +30,7 @@ // } // // more docs: http://beego.me/docs/module/session.md -package session +package redis import ( "net/http" @@ -43,15 +43,15 @@ import ( "github.com/garyburd/redigo/redis" ) -var redispder = &RedisProvider{} +var redispder = &Provider{} // redis max pool size -var MAX_POOL_SIZE = 100 +var MaxPoolSize = 100 var redisPool chan redis.Conn -// redis session store -type RedisSessionStore struct { +// SessionStore redis session store +type SessionStore struct { p *redis.Pool sid string lock sync.RWMutex @@ -59,48 +59,47 @@ type RedisSessionStore struct { maxlifetime int64 } -// set value in redis session -func (rs *RedisSessionStore) Set(key, value interface{}) error { +// Set value in redis session +func (rs *SessionStore) Set(key, value interface{}) error { rs.lock.Lock() defer rs.lock.Unlock() rs.values[key] = value return nil } -// get value in redis session -func (rs *RedisSessionStore) Get(key interface{}) interface{} { +// Get value in redis session +func (rs *SessionStore) Get(key interface{}) interface{} { rs.lock.RLock() defer rs.lock.RUnlock() if v, ok := rs.values[key]; ok { return v - } else { - return nil } + return nil } -// delete value in redis session -func (rs *RedisSessionStore) Delete(key interface{}) error { +// Delete value in redis session +func (rs *SessionStore) Delete(key interface{}) error { rs.lock.Lock() defer rs.lock.Unlock() delete(rs.values, key) return nil } -// clear all values in redis session -func (rs *RedisSessionStore) Flush() error { +// Flush clear all values in redis session +func (rs *SessionStore) Flush() error { rs.lock.Lock() defer rs.lock.Unlock() rs.values = make(map[interface{}]interface{}) return nil } -// get redis session id -func (rs *RedisSessionStore) SessionID() string { +// SessionID get redis session id +func (rs *SessionStore) SessionID() string { return rs.sid } -// save session values to redis -func (rs *RedisSessionStore) SessionRelease(w http.ResponseWriter) { +// SessionRelease save session values to redis +func (rs *SessionStore) SessionRelease(w http.ResponseWriter) { c := rs.p.Get() defer c.Close() @@ -112,8 +111,8 @@ func (rs *RedisSessionStore) SessionRelease(w http.ResponseWriter) { c.Do("SETEX", rs.sid, rs.maxlifetime, string(b)) } -// redis session provider -type RedisProvider struct { +// Provider redis session provider +type Provider struct { maxlifetime int64 savePath string poolsize int @@ -122,10 +121,10 @@ type RedisProvider struct { poollist *redis.Pool } -// init redis session +// SessionInit init redis session // savepath like redis server addr,pool size,password,dbnum // e.g. 127.0.0.1:6379,100,astaxie,0 -func (rp *RedisProvider) SessionInit(maxlifetime int64, savePath string) error { +func (rp *Provider) SessionInit(maxlifetime int64, savePath string) error { rp.maxlifetime = maxlifetime configs := strings.Split(savePath, ",") if len(configs) > 0 { @@ -134,12 +133,12 @@ func (rp *RedisProvider) SessionInit(maxlifetime int64, savePath string) error { if len(configs) > 1 { poolsize, err := strconv.Atoi(configs[1]) if err != nil || poolsize <= 0 { - rp.poolsize = MAX_POOL_SIZE + rp.poolsize = MaxPoolSize } else { rp.poolsize = poolsize } } else { - rp.poolsize = MAX_POOL_SIZE + rp.poolsize = MaxPoolSize } if len(configs) > 2 { rp.password = configs[2] @@ -176,8 +175,8 @@ func (rp *RedisProvider) SessionInit(maxlifetime int64, savePath string) error { return rp.poollist.Get().Err() } -// read redis session by sid -func (rp *RedisProvider) SessionRead(sid string) (session.SessionStore, error) { +// SessionRead read redis session by sid +func (rp *Provider) SessionRead(sid string) (session.Store, error) { c := rp.poollist.Get() defer c.Close() @@ -192,24 +191,23 @@ func (rp *RedisProvider) SessionRead(sid string) (session.SessionStore, error) { } } - rs := &RedisSessionStore{p: rp.poollist, sid: sid, values: kv, maxlifetime: rp.maxlifetime} + rs := &SessionStore{p: rp.poollist, sid: sid, values: kv, maxlifetime: rp.maxlifetime} return rs, nil } -// check redis session exist by sid -func (rp *RedisProvider) SessionExist(sid string) bool { +// SessionExist check redis session exist by sid +func (rp *Provider) SessionExist(sid string) bool { c := rp.poollist.Get() defer c.Close() if existed, err := redis.Int(c.Do("EXISTS", sid)); err != nil || existed == 0 { return false - } else { - return true } + return true } -// generate new sid for redis session -func (rp *RedisProvider) SessionRegenerate(oldsid, sid string) (session.SessionStore, error) { +// SessionRegenerate generate new sid for redis session +func (rp *Provider) SessionRegenerate(oldsid, sid string) (session.Store, error) { c := rp.poollist.Get() defer c.Close() @@ -234,12 +232,12 @@ func (rp *RedisProvider) SessionRegenerate(oldsid, sid string) (session.SessionS } } - rs := &RedisSessionStore{p: rp.poollist, sid: sid, values: kv, maxlifetime: rp.maxlifetime} + rs := &SessionStore{p: rp.poollist, sid: sid, values: kv, maxlifetime: rp.maxlifetime} return rs, nil } -// delete redis session by id -func (rp *RedisProvider) SessionDestroy(sid string) error { +// SessionDestroy delete redis session by id +func (rp *Provider) SessionDestroy(sid string) error { c := rp.poollist.Get() defer c.Close() @@ -247,13 +245,13 @@ func (rp *RedisProvider) SessionDestroy(sid string) error { return nil } -// Impelment method, no used. -func (rp *RedisProvider) SessionGC() { +// SessionGC Impelment method, no used. +func (rp *Provider) SessionGC() { return } -// @todo -func (rp *RedisProvider) SessionAll() int { +// SessionAll return all activeSession +func (rp *Provider) SessionAll() int { return 0 } diff --git a/session/sess_cookie.go b/session/sess_cookie.go index 01dc505c..3fefa360 100644 --- a/session/sess_cookie.go +++ b/session/sess_cookie.go @@ -25,7 +25,7 @@ import ( var cookiepder = &CookieProvider{} -// Cookie SessionStore +// CookieSessionStore Cookie SessionStore type CookieSessionStore struct { sid string values map[interface{}]interface{} // session data @@ -47,9 +47,8 @@ func (st *CookieSessionStore) Get(key interface{}) interface{} { defer st.lock.RUnlock() if v, ok := st.values[key]; ok { return v - } else { - return nil } + return nil } // Delete value in cookie session @@ -60,7 +59,7 @@ func (st *CookieSessionStore) Delete(key interface{}) error { return nil } -// Clean all values in cookie session +// Flush Clean all values in cookie session func (st *CookieSessionStore) Flush() error { st.lock.Lock() defer st.lock.Unlock() @@ -68,12 +67,12 @@ func (st *CookieSessionStore) Flush() error { return nil } -// Return id of this cookie session +// SessionID Return id of this cookie session func (st *CookieSessionStore) SessionID() string { return st.sid } -// Write cookie session to http response cookie +// SessionRelease Write cookie session to http response cookie func (st *CookieSessionStore) SessionRelease(w http.ResponseWriter) { str, err := encodeCookie(cookiepder.block, cookiepder.config.SecurityKey, @@ -101,14 +100,14 @@ type cookieConfig struct { Maxage int `json:"maxage"` } -// Cookie session provider +// CookieProvider Cookie session provider type CookieProvider struct { maxlifetime int64 config *cookieConfig block cipher.Block } -// Init cookie session provider with max lifetime and config json. +// SessionInit Init cookie session provider with max lifetime and config json. // maxlifetime is ignored. // json config: // securityKey - hash string @@ -136,9 +135,9 @@ func (pder *CookieProvider) SessionInit(maxlifetime int64, config string) error return nil } -// Get SessionStore in cooke. +// SessionRead Get SessionStore in cooke. // decode cooke string to map and put into SessionStore with sid. -func (pder *CookieProvider) SessionRead(sid string) (SessionStore, error) { +func (pder *CookieProvider) SessionRead(sid string) (Store, error) { maps, _ := decodeCookie(pder.block, pder.config.SecurityKey, pder.config.SecurityName, @@ -150,32 +149,32 @@ func (pder *CookieProvider) SessionRead(sid string) (SessionStore, error) { return rs, nil } -// Cookie session is always existed +// SessionExist Cookie session is always existed func (pder *CookieProvider) SessionExist(sid string) bool { return true } -// Implement method, no used. -func (pder *CookieProvider) SessionRegenerate(oldsid, sid string) (SessionStore, error) { +// SessionRegenerate Implement method, no used. +func (pder *CookieProvider) SessionRegenerate(oldsid, sid string) (Store, error) { return nil, nil } -// Implement method, no used. +// SessionDestroy Implement method, no used. func (pder *CookieProvider) SessionDestroy(sid string) error { return nil } -// Implement method, no used. +// SessionGC Implement method, no used. func (pder *CookieProvider) SessionGC() { return } -// Implement method, return 0. +// SessionAll Implement method, return 0. func (pder *CookieProvider) SessionAll() int { return 0 } -// Implement method, no used. +// SessionUpdate Implement method, no used. func (pder *CookieProvider) SessionUpdate(sid string) error { return nil } diff --git a/session/sess_file.go b/session/sess_file.go index b1084acf..9265b030 100644 --- a/session/sess_file.go +++ b/session/sess_file.go @@ -32,7 +32,7 @@ var ( gcmaxlifetime int64 ) -// File session store +// FileSessionStore File session store type FileSessionStore struct { sid string lock sync.RWMutex @@ -53,9 +53,8 @@ func (fs *FileSessionStore) Get(key interface{}) interface{} { defer fs.lock.RUnlock() if v, ok := fs.values[key]; ok { return v - } else { - return nil } + return nil } // Delete value in file session by given key @@ -66,7 +65,7 @@ func (fs *FileSessionStore) Delete(key interface{}) error { return nil } -// Clean all values in file session +// Flush Clean all values in file session func (fs *FileSessionStore) Flush() error { fs.lock.Lock() defer fs.lock.Unlock() @@ -74,12 +73,12 @@ func (fs *FileSessionStore) Flush() error { return nil } -// Get file session store id +// SessionID Get file session store id func (fs *FileSessionStore) SessionID() string { return fs.sid } -// Write file session to local file with Gob string +// SessionRelease Write file session to local file with Gob string func (fs *FileSessionStore) SessionRelease(w http.ResponseWriter) { b, err := EncodeGob(fs.values) if err != nil { @@ -100,14 +99,14 @@ func (fs *FileSessionStore) SessionRelease(w http.ResponseWriter) { f.Close() } -// File session provider +// FileProvider File session provider type FileProvider struct { lock sync.RWMutex maxlifetime int64 savePath string } -// Init file session provider. +// SessionInit Init file session provider. // savePath sets the session files path. func (fp *FileProvider) SessionInit(maxlifetime int64, savePath string) error { fp.maxlifetime = maxlifetime @@ -115,10 +114,10 @@ func (fp *FileProvider) SessionInit(maxlifetime int64, savePath string) error { return nil } -// Read file session by sid. +// SessionRead Read file session by sid. // if file is not exist, create it. // the file path is generated from sid string. -func (fp *FileProvider) SessionRead(sid string) (SessionStore, error) { +func (fp *FileProvider) SessionRead(sid string) (Store, error) { filepder.lock.Lock() defer filepder.lock.Unlock() @@ -154,7 +153,7 @@ func (fp *FileProvider) SessionRead(sid string) (SessionStore, error) { return ss, nil } -// Check file session exist. +// SessionExist Check file session exist. // it checkes the file named from sid exist or not. func (fp *FileProvider) SessionExist(sid string) bool { filepder.lock.Lock() @@ -163,12 +162,11 @@ func (fp *FileProvider) SessionExist(sid string) bool { _, err := os.Stat(path.Join(fp.savePath, string(sid[0]), string(sid[1]), sid)) if err == nil { return true - } else { - return false } + return false } -// Remove all files in this save path +// SessionDestroy Remove all files in this save path func (fp *FileProvider) SessionDestroy(sid string) error { filepder.lock.Lock() defer filepder.lock.Unlock() @@ -176,7 +174,7 @@ func (fp *FileProvider) SessionDestroy(sid string) error { return nil } -// Recycle files in save path +// SessionGC Recycle files in save path func (fp *FileProvider) SessionGC() { filepder.lock.Lock() defer filepder.lock.Unlock() @@ -185,7 +183,7 @@ func (fp *FileProvider) SessionGC() { filepath.Walk(fp.savePath, gcpath) } -// Get active file session number. +// SessionAll Get active file session number. // it walks save path to count files. func (fp *FileProvider) SessionAll() int { a := &activeSession{} @@ -199,9 +197,9 @@ func (fp *FileProvider) SessionAll() int { return a.total } -// Generate new sid for file session. +// SessionRegenerate Generate new sid for file session. // it delete old file and create new file named from new sid. -func (fp *FileProvider) SessionRegenerate(oldsid, sid string) (SessionStore, error) { +func (fp *FileProvider) SessionRegenerate(oldsid, sid string) (Store, error) { filepder.lock.Lock() defer filepder.lock.Unlock() @@ -269,14 +267,14 @@ type activeSession struct { total int } -func (self *activeSession) visit(paths string, f os.FileInfo, err error) error { +func (as *activeSession) visit(paths string, f os.FileInfo, err error) error { if err != nil { return err } if f.IsDir() { return nil } - self.total = self.total + 1 + as.total = as.total + 1 return nil } diff --git a/session/sess_mem.go b/session/sess_mem.go index dd066703..dd61ef57 100644 --- a/session/sess_mem.go +++ b/session/sess_mem.go @@ -23,7 +23,7 @@ import ( var mempder = &MemProvider{list: list.New(), sessions: make(map[string]*list.Element)} -// memory session store. +// MemSessionStore memory session store. // it saved sessions in a map in memory. type MemSessionStore struct { sid string //session id @@ -32,7 +32,7 @@ type MemSessionStore struct { lock sync.RWMutex } -// set value to memory session +// Set value to memory session func (st *MemSessionStore) Set(key, value interface{}) error { st.lock.Lock() defer st.lock.Unlock() @@ -40,18 +40,17 @@ func (st *MemSessionStore) Set(key, value interface{}) error { return nil } -// get value from memory session by key +// Get value from memory session by key func (st *MemSessionStore) Get(key interface{}) interface{} { st.lock.RLock() defer st.lock.RUnlock() if v, ok := st.value[key]; ok { return v - } else { - return nil } + return nil } -// delete in memory session by key +// Delete in memory session by key func (st *MemSessionStore) Delete(key interface{}) error { st.lock.Lock() defer st.lock.Unlock() @@ -59,7 +58,7 @@ func (st *MemSessionStore) Delete(key interface{}) error { return nil } -// clear all values in memory session +// Flush clear all values in memory session func (st *MemSessionStore) Flush() error { st.lock.Lock() defer st.lock.Unlock() @@ -67,15 +66,16 @@ func (st *MemSessionStore) Flush() error { return nil } -// get this id of memory session store +// SessionID get this id of memory session store func (st *MemSessionStore) SessionID() string { return st.sid } -// Implement method, no used. +// SessionRelease Implement method, no used. func (st *MemSessionStore) SessionRelease(w http.ResponseWriter) { } +// MemProvider Implement the provider interface type MemProvider struct { lock sync.RWMutex // locker sessions map[string]*list.Element // map in memory @@ -84,44 +84,42 @@ type MemProvider struct { savePath string } -// init memory session +// SessionInit init memory session func (pder *MemProvider) SessionInit(maxlifetime int64, savePath string) error { pder.maxlifetime = maxlifetime pder.savePath = savePath return nil } -// get memory session store by sid -func (pder *MemProvider) SessionRead(sid string) (SessionStore, error) { +// SessionRead get memory session store by sid +func (pder *MemProvider) SessionRead(sid string) (Store, error) { pder.lock.RLock() if element, ok := pder.sessions[sid]; ok { go pder.SessionUpdate(sid) pder.lock.RUnlock() return element.Value.(*MemSessionStore), nil - } else { - pder.lock.RUnlock() - pder.lock.Lock() - newsess := &MemSessionStore{sid: sid, timeAccessed: time.Now(), value: make(map[interface{}]interface{})} - element := pder.list.PushBack(newsess) - pder.sessions[sid] = element - pder.lock.Unlock() - return newsess, nil } + pder.lock.RUnlock() + pder.lock.Lock() + newsess := &MemSessionStore{sid: sid, timeAccessed: time.Now(), value: make(map[interface{}]interface{})} + element := pder.list.PushBack(newsess) + pder.sessions[sid] = element + pder.lock.Unlock() + return newsess, nil } -// check session store exist in memory session by sid +// SessionExist check session store exist in memory session by sid func (pder *MemProvider) SessionExist(sid string) bool { pder.lock.RLock() defer pder.lock.RUnlock() if _, ok := pder.sessions[sid]; ok { return true - } else { - return false } + return false } -// generate new sid for session store in memory session -func (pder *MemProvider) SessionRegenerate(oldsid, sid string) (SessionStore, error) { +// SessionRegenerate generate new sid for session store in memory session +func (pder *MemProvider) SessionRegenerate(oldsid, sid string) (Store, error) { pder.lock.RLock() if element, ok := pder.sessions[oldsid]; ok { go pder.SessionUpdate(oldsid) @@ -132,18 +130,17 @@ func (pder *MemProvider) SessionRegenerate(oldsid, sid string) (SessionStore, er delete(pder.sessions, oldsid) pder.lock.Unlock() return element.Value.(*MemSessionStore), nil - } else { - pder.lock.RUnlock() - pder.lock.Lock() - newsess := &MemSessionStore{sid: sid, timeAccessed: time.Now(), value: make(map[interface{}]interface{})} - element := pder.list.PushBack(newsess) - pder.sessions[sid] = element - pder.lock.Unlock() - return newsess, nil } + pder.lock.RUnlock() + pder.lock.Lock() + newsess := &MemSessionStore{sid: sid, timeAccessed: time.Now(), value: make(map[interface{}]interface{})} + element := pder.list.PushBack(newsess) + pder.sessions[sid] = element + pder.lock.Unlock() + return newsess, nil } -// delete session store in memory session by id +// SessionDestroy delete session store in memory session by id func (pder *MemProvider) SessionDestroy(sid string) error { pder.lock.Lock() defer pder.lock.Unlock() @@ -155,7 +152,7 @@ func (pder *MemProvider) SessionDestroy(sid string) error { return nil } -// clean expired session stores in memory session +// SessionGC clean expired session stores in memory session func (pder *MemProvider) SessionGC() { pder.lock.RLock() for { @@ -177,12 +174,12 @@ func (pder *MemProvider) SessionGC() { pder.lock.RUnlock() } -// get count number of memory session +// SessionAll get count number of memory session func (pder *MemProvider) SessionAll() int { return pder.list.Len() } -// expand time of session store by id in memory session +// SessionUpdate expand time of session store by id in memory session func (pder *MemProvider) SessionUpdate(sid string) error { pder.lock.Lock() defer pder.lock.Unlock() diff --git a/session/sess_utils.go b/session/sess_utils.go index 9ae74528..756f3e4a 100644 --- a/session/sess_utils.go +++ b/session/sess_utils.go @@ -178,11 +178,11 @@ func decodeCookie(block cipher.Block, hashKey, name, value string, gcmaxlifetime return nil, err } // 5. DecodeGob. - if dst, err := DecodeGob(b); err != nil { + dst, err := DecodeGob(b) + if err != nil { return nil, err - } else { - return dst, nil } + return dst, nil } // Encoding ------------------------------------------------------------------- diff --git a/session/session.go b/session/session.go index f0895de1..947bfcbb 100644 --- a/session/session.go +++ b/session/session.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// package session provider +// Package session provider // // Usage: // import( @@ -37,8 +37,8 @@ import ( "time" ) -// SessionStore contains all data for one session process with specific id. -type SessionStore interface { +// Store contains all data for one session process with specific id. +type Store interface { Set(key, value interface{}) error //set session value Get(key interface{}) interface{} //get session value Delete(key interface{}) error //delete session value @@ -51,9 +51,9 @@ type SessionStore interface { // it can operate a SessionStore by its id. type Provider interface { SessionInit(gclifetime int64, config string) error - SessionRead(sid string) (SessionStore, error) + SessionRead(sid string) (Store, error) SessionExist(sid string) bool - SessionRegenerate(oldsid, sid string) (SessionStore, error) + SessionRegenerate(oldsid, sid string) (Store, error) SessionDestroy(sid string) error SessionAll() int //get all active session SessionGC() @@ -83,7 +83,7 @@ type managerConfig struct { CookieLifeTime int `json:"cookieLifeTime"` ProviderConfig string `json:"providerConfig"` Domain string `json:"domain"` - SessionIdLength int64 `json:"sessionIdLength"` + SessionIDLength int64 `json:"sessionIDLength"` } // Manager contains Provider and its configuration. @@ -92,7 +92,7 @@ type Manager struct { config *managerConfig } -// Create new Manager with provider name and json config string. +// NewManager Create new Manager with provider name and json config string. // provider name: // 1. cookie // 2. file @@ -123,8 +123,8 @@ func NewManager(provideName, config string) (*Manager, error) { return nil, err } - if cf.SessionIdLength == 0 { - cf.SessionIdLength = 16 + if cf.SessionIDLength == 0 { + cf.SessionIDLength = 16 } return &Manager{ @@ -133,12 +133,12 @@ func NewManager(provideName, config string) (*Manager, error) { }, nil } -// Start session. generate or read the session id from http request. +// SessionStart Start session. generate or read the session id from http request. // if session id exists, return SessionStore with this id. -func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (session SessionStore, err error) { +func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (session Store, err error) { cookie, errs := r.Cookie(manager.config.CookieName) if errs != nil || cookie.Value == "" { - sid, errs := manager.sessionId(r) + sid, errs := manager.sessionID(r) if errs != nil { return nil, errs } @@ -167,7 +167,7 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se if manager.provider.SessionExist(sid) { session, err = manager.provider.SessionRead(sid) } else { - sid, err = manager.sessionId(r) + sid, err = manager.sessionID(r) if err != nil { return nil, err } @@ -193,39 +193,38 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se return } -// Destroy session by its id in http request cookie. +// SessionDestroy Destroy session by its id in http request cookie. func (manager *Manager) SessionDestroy(w http.ResponseWriter, r *http.Request) { cookie, err := r.Cookie(manager.config.CookieName) if err != nil || cookie.Value == "" { return - } else { - manager.provider.SessionDestroy(cookie.Value) - expiration := time.Now() - cookie := http.Cookie{Name: manager.config.CookieName, - Path: "/", - HttpOnly: true, - Expires: expiration, - MaxAge: -1} - http.SetCookie(w, &cookie) } + manager.provider.SessionDestroy(cookie.Value) + expiration := time.Now() + cookie = &http.Cookie{Name: manager.config.CookieName, + Path: "/", + HttpOnly: true, + Expires: expiration, + MaxAge: -1} + http.SetCookie(w, cookie) } -// Get SessionStore by its id. -func (manager *Manager) GetSessionStore(sid string) (sessions SessionStore, err error) { +// GetSessionStore Get SessionStore by its id. +func (manager *Manager) GetSessionStore(sid string) (sessions Store, err error) { sessions, err = manager.provider.SessionRead(sid) return } -// Start session gc process. +// GC Start session gc process. // it can do gc in times after gc lifetime. func (manager *Manager) GC() { manager.provider.SessionGC() time.AfterFunc(time.Duration(manager.config.Gclifetime)*time.Second, func() { manager.GC() }) } -// Regenerate a session id for this SessionStore who's id is saving in http request. -func (manager *Manager) SessionRegenerateId(w http.ResponseWriter, r *http.Request) (session SessionStore) { - sid, err := manager.sessionId(r) +// SessionRegenerateID Regenerate a session id for this SessionStore who's id is saving in http request. +func (manager *Manager) SessionRegenerateID(w http.ResponseWriter, r *http.Request) (session Store) { + sid, err := manager.sessionID(r) if err != nil { return } @@ -256,18 +255,18 @@ func (manager *Manager) SessionRegenerateId(w http.ResponseWriter, r *http.Reque return } -// Get all active sessions count number. +// GetActiveSession Get all active sessions count number. func (manager *Manager) GetActiveSession() int { return manager.provider.SessionAll() } -// Set cookie with https. +// SetSecure Set cookie with https. func (manager *Manager) SetSecure(secure bool) { manager.config.Secure = secure } -func (manager *Manager) sessionId(r *http.Request) (string, error) { - b := make([]byte, manager.config.SessionIdLength) +func (manager *Manager) sessionID(r *http.Request) (string, error) { + b := make([]byte, manager.config.SessionIDLength) n, err := rand.Read(b) if n != len(b) || err != nil { return "", fmt.Errorf("Could not successfully read from the system CSPRNG.") From a289b08e64632c931985c3132209f4bc14660f21 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sat, 12 Sep 2015 23:15:23 +0800 Subject: [PATCH 214/436] golint swagger --- swagger/docsSpec.go | 56 +++++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/swagger/docsSpec.go b/swagger/docsSpec.go index 6f8fe1db..1874da42 100644 --- a/swagger/docsSpec.go +++ b/swagger/docsSpec.go @@ -12,53 +12,59 @@ // See the License for the specific language governing permissions and // limitations under the License. -// swagger struct definition +// Package swagger struct definition package swagger +// SwaggerVersion show the current swagger version const SwaggerVersion = "1.2" +// ResourceListing list the resource type ResourceListing struct { - ApiVersion string `json:"apiVersion"` + APIVersion string `json:"apiVersion"` SwaggerVersion string `json:"swaggerVersion"` // e.g 1.2 // BasePath string `json:"basePath"` obsolete in 1.1 - Apis []ApiRef `json:"apis"` + APIs []APIRef `json:"apis"` Infos Infomation `json:"info"` } -type ApiRef struct { +// APIRef description the api path and description +type APIRef struct { Path string `json:"path"` // relative or absolute, must start with / Description string `json:"description"` } +// Infomation show the API Infomation type Infomation struct { Title string `json:"title,omitempty"` Description string `json:"description,omitempty"` Contact string `json:"contact,omitempty"` - TermsOfServiceUrl string `json:"termsOfServiceUrl,omitempty"` + TermsOfServiceURL string `json:"termsOfServiceUrl,omitempty"` License string `json:"license,omitempty"` - LicenseUrl string `json:"licenseUrl,omitempty"` + LicenseURL string `json:"licenseUrl,omitempty"` } -// https://github.com/wordnik/swagger-core/blob/scala_2.10-1.3-RC3/schemas/api-declaration-schema.json -type ApiDeclaration struct { - ApiVersion string `json:"apiVersion"` +// APIDeclaration see https://github.com/wordnik/swagger-core/blob/scala_2.10-1.3-RC3/schemas/api-declaration-schema.json +type APIDeclaration struct { + APIVersion string `json:"apiVersion"` SwaggerVersion string `json:"swaggerVersion"` BasePath string `json:"basePath"` ResourcePath string `json:"resourcePath"` // must start with / Consumes []string `json:"consumes,omitempty"` Produces []string `json:"produces,omitempty"` - Apis []Api `json:"apis,omitempty"` + APIs []API `json:"apis,omitempty"` Models map[string]Model `json:"models,omitempty"` } -type Api struct { +// API show tha API struct +type API struct { Path string `json:"path"` // relative or absolute, must start with / Description string `json:"description"` Operations []Operation `json:"operations,omitempty"` } +// Operation desc the Operation type Operation struct { - HttpMethod string `json:"httpMethod"` + HTTPMethod string `json:"httpMethod"` Nickname string `json:"nickname"` Type string `json:"type"` // in 1.1 = DataType // ResponseClass string `json:"responseClass"` obsolete in 1.2 @@ -72,15 +78,18 @@ type Operation struct { Protocols []Protocol `json:"protocols,omitempty"` } +// Protocol support which Protocol type Protocol struct { } +// ResponseMessage Show the type ResponseMessage struct { Code int `json:"code"` Message string `json:"message"` ResponseModel string `json:"responseModel"` } +// Parameter desc the request parameters type Parameter struct { ParamType string `json:"paramType"` // path,query,body,header,form Name string `json:"name"` @@ -94,17 +103,20 @@ type Parameter struct { Maximum int `json:"maximum"` } +// ErrorResponse desc response type ErrorResponse struct { Code int `json:"code"` Reason string `json:"reason"` } +// Model define the data model type Model struct { - Id string `json:"id"` + ID string `json:"id"` Required []string `json:"required,omitempty"` Properties map[string]ModelProperty `json:"properties"` } +// ModelProperty define the properties type ModelProperty struct { Type string `json:"type"` Description string `json:"description"` @@ -112,20 +124,20 @@ type ModelProperty struct { Format string `json:"format"` } -// https://github.com/wordnik/swagger-core/wiki/authorizations +// Authorization see https://github.com/wordnik/swagger-core/wiki/authorizations type Authorization struct { LocalOAuth OAuth `json:"local-oauth"` - ApiKey ApiKey `json:"apiKey"` + APIKey APIKey `json:"apiKey"` } -// https://github.com/wordnik/swagger-core/wiki/authorizations +// OAuth see https://github.com/wordnik/swagger-core/wiki/authorizations type OAuth struct { Type string `json:"type"` // e.g. oauth2 Scopes []string `json:"scopes"` // e.g. PUBLIC GrantTypes map[string]GrantType `json:"grantTypes"` } -// https://github.com/wordnik/swagger-core/wiki/authorizations +// GrantType see https://github.com/wordnik/swagger-core/wiki/authorizations type GrantType struct { LoginEndpoint Endpoint `json:"loginEndpoint"` TokenName string `json:"tokenName"` // e.g. access_code @@ -133,16 +145,16 @@ type GrantType struct { TokenEndpoint Endpoint `json:"tokenEndpoint"` } -// https://github.com/wordnik/swagger-core/wiki/authorizations +// Endpoint see https://github.com/wordnik/swagger-core/wiki/authorizations type Endpoint struct { - Url string `json:"url"` - ClientIdName string `json:"clientIdName"` + URL string `json:"url"` + ClientIDName string `json:"clientIdName"` ClientSecretName string `json:"clientSecretName"` TokenName string `json:"tokenName"` } -// https://github.com/wordnik/swagger-core/wiki/authorizations -type ApiKey struct { +// APIKey see https://github.com/wordnik/swagger-core/wiki/authorizations +type APIKey struct { Type string `json:"type"` // e.g. apiKey PassAs string `json:"passAs"` // e.g. header } From be7accc94c46680eba3b33086ba922eb5e2ceef8 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sat, 12 Sep 2015 23:19:18 +0800 Subject: [PATCH 215/436] golint testing --- testing/client.go | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/testing/client.go b/testing/client.go index 366bda96..c3737e9c 100644 --- a/testing/client.go +++ b/testing/client.go @@ -20,11 +20,11 @@ import ( ) var port = "" -var baseUrl = "http://localhost:" +var baseURL = "http://localhost:" -// beego test request client -type TestHttpRequest struct { - httplib.BeegoHttpRequest +// TestHTTPRequest beego test request client +type TestHTTPRequest struct { + httplib.BeegoHTTPRequest } func getPort() string { @@ -39,27 +39,27 @@ func getPort() string { return port } -// returns test client in GET method -func Get(path string) *TestHttpRequest { - return &TestHttpRequest{*httplib.Get(baseUrl + getPort() + path)} +// Get returns test client in GET method +func Get(path string) *TestHTTPRequest { + return &TestHTTPRequest{*httplib.Get(baseURL + getPort() + path)} } -// returns test client in POST method -func Post(path string) *TestHttpRequest { - return &TestHttpRequest{*httplib.Post(baseUrl + getPort() + path)} +// Post returns test client in POST method +func Post(path string) *TestHTTPRequest { + return &TestHTTPRequest{*httplib.Post(baseURL + getPort() + path)} } -// returns test client in PUT method -func Put(path string) *TestHttpRequest { - return &TestHttpRequest{*httplib.Put(baseUrl + getPort() + path)} +// Put returns test client in PUT method +func Put(path string) *TestHTTPRequest { + return &TestHTTPRequest{*httplib.Put(baseURL + getPort() + path)} } -// returns test client in DELETE method -func Delete(path string) *TestHttpRequest { - return &TestHttpRequest{*httplib.Delete(baseUrl + getPort() + path)} +// Delete returns test client in DELETE method +func Delete(path string) *TestHTTPRequest { + return &TestHTTPRequest{*httplib.Delete(baseURL + getPort() + path)} } -// returns test client in HEAD method -func Head(path string) *TestHttpRequest { - return &TestHttpRequest{*httplib.Head(baseUrl + getPort() + path)} +// Head returns test client in HEAD method +func Head(path string) *TestHTTPRequest { + return &TestHTTPRequest{*httplib.Head(baseURL + getPort() + path)} } From 1d200da472f3e1eae44b0814e45c507db4cf8882 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sat, 12 Sep 2015 23:28:24 +0800 Subject: [PATCH 216/436] golint toolbox --- toolbox/healthcheck.go | 6 +-- toolbox/profile.go | 8 ++-- toolbox/statistics.go | 37 ++++++++++--------- toolbox/task.go | 84 +++++++++++++++++++++--------------------- 4 files changed, 68 insertions(+), 67 deletions(-) diff --git a/toolbox/healthcheck.go b/toolbox/healthcheck.go index 4ccff785..46251eda 100644 --- a/toolbox/healthcheck.go +++ b/toolbox/healthcheck.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// toolbox healthcheck +// Package toolbox healthcheck // // type DatabaseCheck struct { // } @@ -33,12 +33,12 @@ package toolbox // health checker map var AdminCheckList map[string]HealthChecker -// health checker interface +// HealthChecker health checker interface type HealthChecker interface { Check() error } -// add health checker with name string +// AddHealthCheck add health checker with name string func AddHealthCheck(name string, hc HealthChecker) { AdminCheckList[name] = hc } diff --git a/toolbox/profile.go b/toolbox/profile.go index b428e2ff..06e40ede 100644 --- a/toolbox/profile.go +++ b/toolbox/profile.go @@ -34,7 +34,7 @@ func init() { pid = os.Getpid() } -// parse input command string +// ProcessInput parse input command string func ProcessInput(input string, w io.Writer) { switch input { case "lookup goroutine": @@ -58,7 +58,7 @@ func ProcessInput(input string, w io.Writer) { } } -// record memory profile in pprof +// MemProf record memory profile in pprof func MemProf(w io.Writer) { filename := "mem-" + strconv.Itoa(pid) + ".memprof" if f, err := os.Create(filename); err != nil { @@ -74,7 +74,7 @@ func MemProf(w io.Writer) { } } -// start cpu profile monitor +// GetCPUProfile start cpu profile monitor func GetCPUProfile(w io.Writer) { sec := 30 filename := "cpu-" + strconv.Itoa(pid) + ".pprof" @@ -92,7 +92,7 @@ func GetCPUProfile(w io.Writer) { fmt.Fprintf(w, "Now you can use this to check it: go tool pprof %s %s\n", fl, filename) } -// print gc information to io.Writer +// PrintGCSummary print gc information to io.Writer func PrintGCSummary(w io.Writer) { memStats := &runtime.MemStats{} runtime.ReadMemStats(memStats) diff --git a/toolbox/statistics.go b/toolbox/statistics.go index beeafc7b..59c0ba0f 100644 --- a/toolbox/statistics.go +++ b/toolbox/statistics.go @@ -22,7 +22,7 @@ import ( // Statistics struct type Statistics struct { - RequestUrl string + RequestURL string RequestController string RequestNum int64 MinTime time.Duration @@ -30,21 +30,21 @@ type Statistics struct { TotalTime time.Duration } -// UrlMap contains several statistics struct to log different data -type UrlMap struct { +// URLMap contains several statistics struct to log different data +type URLMap struct { lock sync.RWMutex LengthLimit int //limit the urlmap's length if it's equal to 0 there's no limit urlmap map[string]map[string]*Statistics } -// add statistics task. +// AddStatistics add statistics task. // it needs request method, request url, request controller and statistics time duration -func (m *UrlMap) AddStatistics(requestMethod, requestUrl, requestController string, requesttime time.Duration) { +func (m *URLMap) AddStatistics(requestMethod, requestURL, requestController string, requesttime time.Duration) { m.lock.Lock() defer m.lock.Unlock() - if method, ok := m.urlmap[requestUrl]; ok { + if method, ok := m.urlmap[requestURL]; ok { if s, ok := method[requestMethod]; ok { - s.RequestNum += 1 + s.RequestNum++ if s.MaxTime < requesttime { s.MaxTime = requesttime } @@ -54,14 +54,14 @@ func (m *UrlMap) AddStatistics(requestMethod, requestUrl, requestController stri s.TotalTime += requesttime } else { nb := &Statistics{ - RequestUrl: requestUrl, + RequestURL: requestURL, RequestController: requestController, RequestNum: 1, MinTime: requesttime, MaxTime: requesttime, TotalTime: requesttime, } - m.urlmap[requestUrl][requestMethod] = nb + m.urlmap[requestURL][requestMethod] = nb } } else { @@ -70,7 +70,7 @@ func (m *UrlMap) AddStatistics(requestMethod, requestUrl, requestController stri } methodmap := make(map[string]*Statistics) nb := &Statistics{ - RequestUrl: requestUrl, + RequestURL: requestURL, RequestController: requestController, RequestNum: 1, MinTime: requesttime, @@ -78,18 +78,18 @@ func (m *UrlMap) AddStatistics(requestMethod, requestUrl, requestController stri TotalTime: requesttime, } methodmap[requestMethod] = nb - m.urlmap[requestUrl] = methodmap + m.urlmap[requestURL] = methodmap } } -// put url statistics result in io.Writer -func (m *UrlMap) GetMap() map[string]interface{} { +// GetMap put url statistics result in io.Writer +func (m *URLMap) GetMap() map[string]interface{} { m.lock.RLock() defer m.lock.RUnlock() var fields = []string{"requestUrl", "method", "times", "used", "max used", "min used", "avg used"} - resultLists := make([][]string, 0) + var resultLists [][]string content := make(map[string]interface{}) content["Fields"] = fields @@ -111,9 +111,10 @@ func (m *UrlMap) GetMap() map[string]interface{} { return content } -func (m *UrlMap) GetMapData() []map[string]interface{} { +// GetMapData return all mapdata +func (m *URLMap) GetMapData() []map[string]interface{} { - resultLists := make([]map[string]interface{}, 0) + var resultLists []map[string]interface{} for k, v := range m.urlmap { for kk, vv := range v { @@ -133,10 +134,10 @@ func (m *UrlMap) GetMapData() []map[string]interface{} { } // global statistics data map -var StatisticsMap *UrlMap +var StatisticsMap *URLMap func init() { - StatisticsMap = &UrlMap{ + StatisticsMap = &URLMap{ urlmap: make(map[string]map[string]*Statistics), } } diff --git a/toolbox/task.go b/toolbox/task.go index 23e2fb5e..537de428 100644 --- a/toolbox/task.go +++ b/toolbox/task.go @@ -69,7 +69,7 @@ const ( starBit = 1 << 63 ) -// time taks schedule +// Schedule time taks schedule type Schedule struct { Second uint64 Minute uint64 @@ -79,10 +79,10 @@ type Schedule struct { Week uint64 } -// task func type +// TaskFunc task func type type TaskFunc func() error -// task interface +// Tasker task interface type Tasker interface { GetSpec() string GetStatus() string @@ -99,7 +99,7 @@ type taskerr struct { errinfo string } -// task struct +// Task task struct type Task struct { Taskname string Spec *Schedule @@ -111,7 +111,7 @@ type Task struct { ErrLimit int // max length for the errlist, 0 stand for no limit } -// add new task with name, time and func +// NewTask add new task with name, time and func func NewTask(tname string, spec string, f TaskFunc) *Task { task := &Task{ @@ -124,49 +124,49 @@ func NewTask(tname string, spec string, f TaskFunc) *Task { return task } -//get spec string -func (s *Task) GetSpec() string { - return s.SpecStr +// GetSpec get spec string +func (t *Task) GetSpec() string { + return t.SpecStr } -// get current task status -func (tk *Task) GetStatus() string { +// GetStatus get current task status +func (t *Task) GetStatus() string { var str string - for _, v := range tk.Errlist { + for _, v := range t.Errlist { str += v.t.String() + ":" + v.errinfo + "
" } return str } -// run task -func (tk *Task) Run() error { - err := tk.DoFunc() +// Run run all tasks +func (t *Task) Run() error { + err := t.DoFunc() if err != nil { - if tk.ErrLimit > 0 && tk.ErrLimit > len(tk.Errlist) { - tk.Errlist = append(tk.Errlist, &taskerr{t: tk.Next, errinfo: err.Error()}) + if t.ErrLimit > 0 && t.ErrLimit > len(t.Errlist) { + t.Errlist = append(t.Errlist, &taskerr{t: t.Next, errinfo: err.Error()}) } } return err } -// set next time for this task -func (tk *Task) SetNext(now time.Time) { - tk.Next = tk.Spec.Next(now) +// SetNext set next time for this task +func (t *Task) SetNext(now time.Time) { + t.Next = t.Spec.Next(now) } -// get the next call time of this task -func (tk *Task) GetNext() time.Time { - return tk.Next +// GetNext get the next call time of this task +func (t *Task) GetNext() time.Time { + return t.Next } -// set prev time of this task -func (tk *Task) SetPrev(now time.Time) { - tk.Prev = now +// SetPrev set prev time of this task +func (t *Task) SetPrev(now time.Time) { + t.Prev = now } -// get prev time of this task -func (tk *Task) GetPrev() time.Time { - return tk.Prev +// GetPrev get prev time of this task +func (t *Task) GetPrev() time.Time { + return t.Prev } // six columns mean： @@ -177,7 +177,7 @@ func (tk *Task) GetPrev() time.Time { // month：1-12 // week：0-6（0 means Sunday） -// some signals： +// SetCron some signals： // *： any time // ,：　 separate signal //　　 －：duration @@ -289,7 +289,7 @@ func (t *Task) parseSpec(spec string) *Schedule { return nil } -// set schedule to next time +// Next set schedule to next time func (s *Schedule) Next(t time.Time) time.Time { // Start at the earliest possible time (the upcoming second). @@ -377,8 +377,8 @@ WRAP: func dayMatches(s *Schedule, t time.Time) bool { var ( - domMatch bool = 1< 0 - dowMatch bool = 1< 0 + domMatch = 1< 0 + dowMatch = 1< 0 ) if s.Day&starBit > 0 || s.Week&starBit > 0 { @@ -387,7 +387,7 @@ func dayMatches(s *Schedule, t time.Time) bool { return domMatch || dowMatch } -// start all tasks +// StartTask start all tasks func StartTask() { isstart = true go run() @@ -430,13 +430,13 @@ func run() { } } -// start all tasks +// StopTask stop all tasks func StopTask() { isstart = false stop <- true } -// add task with name +// AddTask add task with name func AddTask(taskname string, t Tasker) { AdminTaskList[taskname] = t if isstart { @@ -444,7 +444,7 @@ func AddTask(taskname string, t Tasker) { } } -// add task with name +// DeleteTask delete task with name func DeleteTask(taskname string) { delete(AdminTaskList, taskname) if isstart { @@ -452,13 +452,13 @@ func DeleteTask(taskname string) { } } -// sort map for tasker +// MapSorter sort map for tasker type MapSorter struct { Keys []string Vals []Tasker } -// create new tasker map +// NewMapSorter create new tasker map func NewMapSorter(m map[string]Tasker) *MapSorter { ms := &MapSorter{ Keys: make([]string, 0, len(m)), @@ -471,7 +471,7 @@ func NewMapSorter(m map[string]Tasker) *MapSorter { return ms } -// sort tasker map +// Sort sort tasker map func (ms *MapSorter) Sort() { sort.Sort(ms) } @@ -512,11 +512,11 @@ func getRange(expr string, r bounds) uint64 { singleDigit = len(lowAndHigh) == 1 ) - var extra_star uint64 + var extrastar uint64 if lowAndHigh[0] == "*" || lowAndHigh[0] == "?" { start = r.min end = r.max - extra_star = starBit + extrastar = starBit } else { start = parseIntOrName(lowAndHigh[0], r.names) switch len(lowAndHigh) { @@ -553,7 +553,7 @@ func getRange(expr string, r bounds) uint64 { log.Panicf("Beginning of range (%d) beyond end of range (%d): %s", start, end, expr) } - return getBits(start, end, step) | extra_star + return getBits(start, end, step) | extrastar } // parseIntOrName returns the (possibly-named) integer contained in expr. From 2389bc72f9156b70c81958c87a1815096dd8dce5 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 13 Sep 2015 00:13:19 +0800 Subject: [PATCH 217/436] golint validation --- validation/util.go | 11 +- validation/util_test.go | 4 +- validation/validation.go | 192 +++++++++++++++++----------------- validation/validation_test.go | 6 +- validation/validators.go | 102 ++++++++++++++++-- 5 files changed, 202 insertions(+), 113 deletions(-) diff --git a/validation/util.go b/validation/util.go index 367da5dc..9e4f642d 100644 --- a/validation/util.go +++ b/validation/util.go @@ -23,7 +23,8 @@ import ( ) const ( - VALIDTAG = "valid" + // ValidTag struct tag + ValidTag = "valid" ) var ( @@ -55,16 +56,16 @@ func init() { } } -// Valid function type +// ValidFunc Valid function type type ValidFunc struct { Name string Params []interface{} } -// Validate function map +// Funcs Validate function map type Funcs map[string]reflect.Value -// validate values with named type string +// Call validate values with named type string func (f Funcs) Call(name string, params ...interface{}) (result []reflect.Value, err error) { defer func() { if r := recover(); r != nil { @@ -96,7 +97,7 @@ func isStructPtr(t reflect.Type) bool { } func getValidFuncs(f reflect.StructField) (vfs []ValidFunc, err error) { - tag := f.Tag.Get(VALIDTAG) + tag := f.Tag.Get(ValidTag) if len(tag) == 0 { return } diff --git a/validation/util_test.go b/validation/util_test.go index c4283c4e..d7e10506 100644 --- a/validation/util_test.go +++ b/validation/util_test.go @@ -20,7 +20,7 @@ import ( ) type user struct { - Id int + ID int Tag string `valid:"Maxx(aa)"` Name string `valid:"Required;"` Age int `valid:"Required;Range(1, 140)"` @@ -33,7 +33,7 @@ func TestGetValidFuncs(t *testing.T) { var vfs []ValidFunc var err error - f, _ := tf.FieldByName("Id") + f, _ := tf.FieldByName("ID") if vfs, err = getValidFuncs(f); err != nil { t.Fatal(err) } diff --git a/validation/validation.go b/validation/validation.go index d98ff190..76683d91 100644 --- a/validation/validation.go +++ b/validation/validation.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// package for validations +// Package validation for validations // // import ( // "github.com/astaxie/beego/validation" @@ -53,41 +53,43 @@ import ( "strings" ) +// ValidFormer valid interface type ValidFormer interface { Valid(*Validation) } -type ValidationError struct { +// Error show the error +type Error struct { Message, Key, Name, Field, Tmpl string Value interface{} LimitValue interface{} } -// Returns the Message. -func (e *ValidationError) String() string { +// String Returns the Message. +func (e *Error) String() string { if e == nil { return "" } return e.Message } -// A ValidationResult is returned from every validation method. +// Result is returned from every validation method. // It provides an indication of success, and a pointer to the Error (if any). -type ValidationResult struct { - Error *ValidationError +type Result struct { + Error *Error Ok bool } -// Get ValidationResult by given key string. -func (r *ValidationResult) Key(key string) *ValidationResult { +// Key Get Result by given key string. +func (r *Result) Key(key string) *Result { if r.Error != nil { r.Error.Key = key } return r } -// Set ValidationResult message by string or format string with args -func (r *ValidationResult) Message(message string, args ...interface{}) *ValidationResult { +// Message Set Result message by string or format string with args +func (r *Result) Message(message string, args ...interface{}) *Result { if r.Error != nil { if len(args) == 0 { r.Error.Message = message @@ -100,142 +102,142 @@ func (r *ValidationResult) Message(message string, args ...interface{}) *Validat // A Validation context manages data validation and error messages. type Validation struct { - Errors []*ValidationError - ErrorsMap map[string]*ValidationError + Errors []*Error + ErrorsMap map[string]*Error } -// Clean all ValidationError. +// Clear Clean all ValidationError. func (v *Validation) Clear() { - v.Errors = []*ValidationError{} - v.ErrorsMap = nil + v.Errors = []*Error{} + v.ErrorsMap = nil } -// Has ValidationError nor not. +// HasErrors Has ValidationError nor not. func (v *Validation) HasErrors() bool { return len(v.Errors) > 0 } -// Return the errors mapped by key. +// ErrorMap Return the errors mapped by key. // If there are multiple validation errors associated with a single key, the // first one "wins". (Typically the first validation will be the more basic). -func (v *Validation) ErrorMap() map[string]*ValidationError { +func (v *Validation) ErrorMap() map[string]*Error { return v.ErrorsMap } -// Add an error to the validation context. -func (v *Validation) Error(message string, args ...interface{}) *ValidationResult { - result := (&ValidationResult{ +// Error Add an error to the validation context. +func (v *Validation) Error(message string, args ...interface{}) *Result { + result := (&Result{ Ok: false, - Error: &ValidationError{}, + Error: &Error{}, }).Message(message, args...) v.Errors = append(v.Errors, result.Error) return result } -// Test that the argument is non-nil and non-empty (if string or list) -func (v *Validation) Required(obj interface{}, key string) *ValidationResult { +// Required Test that the argument is non-nil and non-empty (if string or list) +func (v *Validation) Required(obj interface{}, key string) *Result { return v.apply(Required{key}, obj) } -// Test that the obj is greater than min if obj's type is int -func (v *Validation) Min(obj interface{}, min int, key string) *ValidationResult { +// Min Test that the obj is greater than min if obj's type is int +func (v *Validation) Min(obj interface{}, min int, key string) *Result { return v.apply(Min{min, key}, obj) } -// Test that the obj is less than max if obj's type is int -func (v *Validation) Max(obj interface{}, max int, key string) *ValidationResult { +// Max Test that the obj is less than max if obj's type is int +func (v *Validation) Max(obj interface{}, max int, key string) *Result { return v.apply(Max{max, key}, obj) } -// Test that the obj is between mni and max if obj's type is int -func (v *Validation) Range(obj interface{}, min, max int, key string) *ValidationResult { +// Range Test that the obj is between mni and max if obj's type is int +func (v *Validation) Range(obj interface{}, min, max int, key string) *Result { return v.apply(Range{Min{Min: min}, Max{Max: max}, key}, obj) } -// Test that the obj is longer than min size if type is string or slice -func (v *Validation) MinSize(obj interface{}, min int, key string) *ValidationResult { +// MinSize Test that the obj is longer than min size if type is string or slice +func (v *Validation) MinSize(obj interface{}, min int, key string) *Result { return v.apply(MinSize{min, key}, obj) } -// Test that the obj is shorter than max size if type is string or slice -func (v *Validation) MaxSize(obj interface{}, max int, key string) *ValidationResult { +// MaxSize Test that the obj is shorter than max size if type is string or slice +func (v *Validation) MaxSize(obj interface{}, max int, key string) *Result { return v.apply(MaxSize{max, key}, obj) } -// Test that the obj is same length to n if type is string or slice -func (v *Validation) Length(obj interface{}, n int, key string) *ValidationResult { +// Length Test that the obj is same length to n if type is string or slice +func (v *Validation) Length(obj interface{}, n int, key string) *Result { return v.apply(Length{n, key}, obj) } -// Test that the obj is [a-zA-Z] if type is string -func (v *Validation) Alpha(obj interface{}, key string) *ValidationResult { +// Alpha Test that the obj is [a-zA-Z] if type is string +func (v *Validation) Alpha(obj interface{}, key string) *Result { return v.apply(Alpha{key}, obj) } -// Test that the obj is [0-9] if type is string -func (v *Validation) Numeric(obj interface{}, key string) *ValidationResult { +// Numeric Test that the obj is [0-9] if type is string +func (v *Validation) Numeric(obj interface{}, key string) *Result { return v.apply(Numeric{key}, obj) } -// Test that the obj is [0-9a-zA-Z] if type is string -func (v *Validation) AlphaNumeric(obj interface{}, key string) *ValidationResult { +// AlphaNumeric Test that the obj is [0-9a-zA-Z] if type is string +func (v *Validation) AlphaNumeric(obj interface{}, key string) *Result { return v.apply(AlphaNumeric{key}, obj) } -// Test that the obj matches regexp if type is string -func (v *Validation) Match(obj interface{}, regex *regexp.Regexp, key string) *ValidationResult { +// Match Test that the obj matches regexp if type is string +func (v *Validation) Match(obj interface{}, regex *regexp.Regexp, key string) *Result { return v.apply(Match{regex, key}, obj) } -// Test that the obj doesn't match regexp if type is string -func (v *Validation) NoMatch(obj interface{}, regex *regexp.Regexp, key string) *ValidationResult { +// NoMatch Test that the obj doesn't match regexp if type is string +func (v *Validation) NoMatch(obj interface{}, regex *regexp.Regexp, key string) *Result { return v.apply(NoMatch{Match{Regexp: regex}, key}, obj) } -// Test that the obj is [0-9a-zA-Z_-] if type is string -func (v *Validation) AlphaDash(obj interface{}, key string) *ValidationResult { +// AlphaDash Test that the obj is [0-9a-zA-Z_-] if type is string +func (v *Validation) AlphaDash(obj interface{}, key string) *Result { return v.apply(AlphaDash{NoMatch{Match: Match{Regexp: alphaDashPattern}}, key}, obj) } -// Test that the obj is email address if type is string -func (v *Validation) Email(obj interface{}, key string) *ValidationResult { +// Email Test that the obj is email address if type is string +func (v *Validation) Email(obj interface{}, key string) *Result { return v.apply(Email{Match{Regexp: emailPattern}, key}, obj) } -// Test that the obj is IP address if type is string -func (v *Validation) IP(obj interface{}, key string) *ValidationResult { +// IP Test that the obj is IP address if type is string +func (v *Validation) IP(obj interface{}, key string) *Result { return v.apply(IP{Match{Regexp: ipPattern}, key}, obj) } -// Test that the obj is base64 encoded if type is string -func (v *Validation) Base64(obj interface{}, key string) *ValidationResult { +// Base64 Test that the obj is base64 encoded if type is string +func (v *Validation) Base64(obj interface{}, key string) *Result { return v.apply(Base64{Match{Regexp: base64Pattern}, key}, obj) } -// Test that the obj is chinese mobile number if type is string -func (v *Validation) Mobile(obj interface{}, key string) *ValidationResult { +// Mobile Test that the obj is chinese mobile number if type is string +func (v *Validation) Mobile(obj interface{}, key string) *Result { return v.apply(Mobile{Match{Regexp: mobilePattern}, key}, obj) } -// Test that the obj is chinese telephone number if type is string -func (v *Validation) Tel(obj interface{}, key string) *ValidationResult { +// Tel Test that the obj is chinese telephone number if type is string +func (v *Validation) Tel(obj interface{}, key string) *Result { return v.apply(Tel{Match{Regexp: telPattern}, key}, obj) } -// Test that the obj is chinese mobile or telephone number if type is string -func (v *Validation) Phone(obj interface{}, key string) *ValidationResult { +// Phone Test that the obj is chinese mobile or telephone number if type is string +func (v *Validation) Phone(obj interface{}, key string) *Result { return v.apply(Phone{Mobile{Match: Match{Regexp: mobilePattern}}, Tel{Match: Match{Regexp: telPattern}}, key}, obj) } -// Test that the obj is chinese zip code if type is string -func (v *Validation) ZipCode(obj interface{}, key string) *ValidationResult { +// ZipCode Test that the obj is chinese zip code if type is string +func (v *Validation) ZipCode(obj interface{}, key string) *Result { return v.apply(ZipCode{Match{Regexp: zipCodePattern}, key}, obj) } -func (v *Validation) apply(chk Validator, obj interface{}) *ValidationResult { +func (v *Validation) apply(chk Validator, obj interface{}) *Result { if chk.IsSatisfied(obj) { - return &ValidationResult{Ok: true} + return &Result{Ok: true} } // Add the error to the validation context. @@ -249,7 +251,7 @@ func (v *Validation) apply(chk Validator, obj interface{}) *ValidationResult { Name = parts[1] } - err := &ValidationError{ + err := &Error{ Message: chk.DefaultMessage(), Key: key, Name: Name, @@ -261,34 +263,34 @@ func (v *Validation) apply(chk Validator, obj interface{}) *ValidationResult { v.setError(err) // Also return it in the result. - return &ValidationResult{ + return &Result{ Ok: false, Error: err, } } -func (v *Validation) setError(err *ValidationError) { +func (v *Validation) setError(err *Error) { v.Errors = append(v.Errors, err) if v.ErrorsMap == nil { - v.ErrorsMap = make(map[string]*ValidationError) + v.ErrorsMap = make(map[string]*Error) } if _, ok := v.ErrorsMap[err.Field]; !ok { v.ErrorsMap[err.Field] = err } } -// Set error message for one field in ValidationError -func (v *Validation) SetError(fieldName string, errMsg string) *ValidationError { - err := &ValidationError{Key: fieldName, Field: fieldName, Tmpl: errMsg, Message: errMsg} +// SetError Set error message for one field in ValidationError +func (v *Validation) SetError(fieldName string, errMsg string) *Error { + err := &Error{Key: fieldName, Field: fieldName, Tmpl: errMsg, Message: errMsg} v.setError(err) return err } -// Apply a group of validators to a field, in order, and return the +// Check Apply a group of validators to a field, in order, and return the // ValidationResult from the first one that fails, or the last one that // succeeds. -func (v *Validation) Check(obj interface{}, checks ...Validator) *ValidationResult { - var result *ValidationResult +func (v *Validation) Check(obj interface{}, checks ...Validator) *Result { + var result *Result for _, check := range checks { result = v.apply(check, obj) if !result.Ok { @@ -298,7 +300,7 @@ func (v *Validation) Check(obj interface{}, checks ...Validator) *ValidationResu return result } -// Validate a struct. +// Valid Validate a struct. // the obj parameter must be a struct or a struct pointer func (v *Validation) Valid(obj interface{}) (b bool, err error) { objT := reflect.TypeOf(obj) @@ -335,7 +337,7 @@ func (v *Validation) Valid(obj interface{}) (b bool, err error) { return !v.HasErrors(), nil } -// Recursively validate a struct. +// RecursiveValid Recursively validate a struct. // Step1: Validate by v.Valid // Step2: If pass on step1, then reflect obj's fields // Step3: Do the Recursively validation to all struct or struct pointer fields @@ -345,30 +347,28 @@ func (v *Validation) RecursiveValid(objc interface{}) (bool, error) { pass, err := v.Valid(objc) if err != nil || false == pass { return pass, err // Stop recursive validation - } else { //pass - // Step 2: Validate struct's struct fields - objT := reflect.TypeOf(objc) - objV := reflect.ValueOf(objc) + } + // Step 2: Validate struct's struct fields + objT := reflect.TypeOf(objc) + objV := reflect.ValueOf(objc) - if isStructPtr(objT) { - objT = objT.Elem() - objV = objV.Elem() - } + if isStructPtr(objT) { + objT = objT.Elem() + objV = objV.Elem() + } - for i := 0; i < objT.NumField(); i++ { + for i := 0; i < objT.NumField(); i++ { - t := objT.Field(i).Type + t := objT.Field(i).Type - // Recursive applies to struct or pointer to structs fields - if isStruct(t) || isStructPtr(t) { - // Step 3: do the recursive validation - // Only valid the Public field recursively - if objV.Field(i).CanInterface() { - pass, err = v.RecursiveValid(objV.Field(i).Interface()) - } + // Recursive applies to struct or pointer to structs fields + if isStruct(t) || isStructPtr(t) { + // Step 3: do the recursive validation + // Only valid the Public field recursively + if objV.Field(i).CanInterface() { + pass, err = v.RecursiveValid(objV.Field(i).Interface()) } } - - return pass, err } + return pass, err } diff --git a/validation/validation_test.go b/validation/validation_test.go index d07b1435..ec65b6d0 100644 --- a/validation/validation_test.go +++ b/validation/validation_test.go @@ -302,7 +302,7 @@ func TestZipCode(t *testing.T) { func TestValid(t *testing.T) { type user struct { - Id int + ID int Name string `valid:"Required;Match(/^(test)?\\w*@(/test/);com$/)"` Age int `valid:"Required;Range(1, 140)"` } @@ -352,13 +352,13 @@ func TestValid(t *testing.T) { func TestRecursiveValid(t *testing.T) { type User struct { - Id int + ID int Name string `valid:"Required;Match(/^(test)?\\w*@(/test/);com$/)"` Age int `valid:"Required;Range(1, 140)"` } type AnonymouseUser struct { - Id2 int + ID2 int Name2 string `valid:"Required;Match(/^(test)?\\w*@(/test/);com$/)"` Age2 int `valid:"Required;Range(1, 140)"` } diff --git a/validation/validators.go b/validation/validators.go index 2dcec356..ec1545fb 100644 --- a/validation/validators.go +++ b/validation/validators.go @@ -22,6 +22,7 @@ import ( "unicode/utf8" ) +// MessageTmpls store commond validate template var MessageTmpls = map[string]string{ "Required": "Can not be empty", "Min": "Minimum is %d", @@ -45,6 +46,7 @@ var MessageTmpls = map[string]string{ "ZipCode": "Must be valid zipcode", } +// Validator interface type Validator interface { IsSatisfied(interface{}) bool DefaultMessage() string @@ -52,10 +54,12 @@ type Validator interface { GetLimitValue() interface{} } +// Required struct type Required struct { Key string } +// IsSatisfied judge whether obj has value func (r Required) IsSatisfied(obj interface{}) bool { if obj == nil { return false @@ -80,23 +84,28 @@ func (r Required) IsSatisfied(obj interface{}) bool { return true } +// DefaultMessage return the default error message func (r Required) DefaultMessage() string { return fmt.Sprint(MessageTmpls["Required"]) } +// GetKey return the r.Key func (r Required) GetKey() string { return r.Key } +// GetLimitValue return nil now func (r Required) GetLimitValue() interface{} { return nil } +// Min check struct type Min struct { Min int Key string } +// IsSatisfied judge whether obj is valid func (m Min) IsSatisfied(obj interface{}) bool { num, ok := obj.(int) if ok { @@ -105,23 +114,28 @@ func (m Min) IsSatisfied(obj interface{}) bool { return false } +// DefaultMessage return the default min error message func (m Min) DefaultMessage() string { return fmt.Sprintf(MessageTmpls["Min"], m.Min) } +// GetKey return the m.Key func (m Min) GetKey() string { return m.Key } +// GetLimitValue return the limit value, Min func (m Min) GetLimitValue() interface{} { return m.Min } +// Max validate struct type Max struct { Max int Key string } +// IsSatisfied judge whether obj is valid func (m Max) IsSatisfied(obj interface{}) bool { num, ok := obj.(int) if ok { @@ -130,47 +144,55 @@ func (m Max) IsSatisfied(obj interface{}) bool { return false } +// DefaultMessage return the default max error message func (m Max) DefaultMessage() string { return fmt.Sprintf(MessageTmpls["Max"], m.Max) } +// GetKey return the m.Key func (m Max) GetKey() string { return m.Key } +// GetLimitValue return the limit value, Max func (m Max) GetLimitValue() interface{} { return m.Max } -// Requires an integer to be within Min, Max inclusive. +// Range Requires an integer to be within Min, Max inclusive. type Range struct { Min Max Key string } +// IsSatisfied judge whether obj is valid func (r Range) IsSatisfied(obj interface{}) bool { return r.Min.IsSatisfied(obj) && r.Max.IsSatisfied(obj) } +// DefaultMessage return the default Range error message func (r Range) DefaultMessage() string { return fmt.Sprintf(MessageTmpls["Range"], r.Min.Min, r.Max.Max) } +// GetKey return the m.Key func (r Range) GetKey() string { return r.Key } +// GetLimitValue return the limit value, Max func (r Range) GetLimitValue() interface{} { return []int{r.Min.Min, r.Max.Max} } -// Requires an array or string to be at least a given length. +// MinSize Requires an array or string to be at least a given length. type MinSize struct { Min int Key string } +// IsSatisfied judge whether obj is valid func (m MinSize) IsSatisfied(obj interface{}) bool { if str, ok := obj.(string); ok { return utf8.RuneCountInString(str) >= m.Min @@ -182,24 +204,28 @@ func (m MinSize) IsSatisfied(obj interface{}) bool { return false } +// DefaultMessage return the default MinSize error message func (m MinSize) DefaultMessage() string { return fmt.Sprintf(MessageTmpls["MinSize"], m.Min) } +// GetKey return the m.Key func (m MinSize) GetKey() string { return m.Key } +// GetLimitValue return the limit value func (m MinSize) GetLimitValue() interface{} { return m.Min } -// Requires an array or string to be at most a given length. +// MaxSize Requires an array or string to be at most a given length. type MaxSize struct { Max int Key string } +// IsSatisfied judge whether obj is valid func (m MaxSize) IsSatisfied(obj interface{}) bool { if str, ok := obj.(string); ok { return utf8.RuneCountInString(str) <= m.Max @@ -211,24 +237,28 @@ func (m MaxSize) IsSatisfied(obj interface{}) bool { return false } +// DefaultMessage return the default MaxSize error message func (m MaxSize) DefaultMessage() string { return fmt.Sprintf(MessageTmpls["MaxSize"], m.Max) } +// GetKey return the m.Key func (m MaxSize) GetKey() string { return m.Key } +// GetLimitValue return the limit value func (m MaxSize) GetLimitValue() interface{} { return m.Max } -// Requires an array or string to be exactly a given length. +// Length Requires an array or string to be exactly a given length. type Length struct { N int Key string } +// IsSatisfied judge whether obj is valid func (l Length) IsSatisfied(obj interface{}) bool { if str, ok := obj.(string); ok { return utf8.RuneCountInString(str) == l.N @@ -240,22 +270,27 @@ func (l Length) IsSatisfied(obj interface{}) bool { return false } +// DefaultMessage return the default Length error message func (l Length) DefaultMessage() string { return fmt.Sprintf(MessageTmpls["Length"], l.N) } +// GetKey return the m.Key func (l Length) GetKey() string { return l.Key } +// GetLimitValue return the limit value func (l Length) GetLimitValue() interface{} { return l.N } +// Alpha check the alpha type Alpha struct { Key string } +// IsSatisfied judge whether obj is valid func (a Alpha) IsSatisfied(obj interface{}) bool { if str, ok := obj.(string); ok { for _, v := range str { @@ -268,22 +303,27 @@ func (a Alpha) IsSatisfied(obj interface{}) bool { return false } +// DefaultMessage return the default Length error message func (a Alpha) DefaultMessage() string { return fmt.Sprint(MessageTmpls["Alpha"]) } +// GetKey return the m.Key func (a Alpha) GetKey() string { return a.Key } +// GetLimitValue return the limit value func (a Alpha) GetLimitValue() interface{} { return nil } +// Numeric check number type Numeric struct { Key string } +// IsSatisfied judge whether obj is valid func (n Numeric) IsSatisfied(obj interface{}) bool { if str, ok := obj.(string); ok { for _, v := range str { @@ -296,22 +336,27 @@ func (n Numeric) IsSatisfied(obj interface{}) bool { return false } +// DefaultMessage return the default Length error message func (n Numeric) DefaultMessage() string { return fmt.Sprint(MessageTmpls["Numeric"]) } +// GetKey return the n.Key func (n Numeric) GetKey() string { return n.Key } +// GetLimitValue return the limit value func (n Numeric) GetLimitValue() interface{} { return nil } +// AlphaNumeric check alpha and number type AlphaNumeric struct { Key string } +// IsSatisfied judge whether obj is valid func (a AlphaNumeric) IsSatisfied(obj interface{}) bool { if str, ok := obj.(string); ok { for _, v := range str { @@ -324,134 +369,161 @@ func (a AlphaNumeric) IsSatisfied(obj interface{}) bool { return false } +// DefaultMessage return the default Length error message func (a AlphaNumeric) DefaultMessage() string { return fmt.Sprint(MessageTmpls["AlphaNumeric"]) } +// GetKey return the a.Key func (a AlphaNumeric) GetKey() string { return a.Key } +// GetLimitValue return the limit value func (a AlphaNumeric) GetLimitValue() interface{} { return nil } -// Requires a string to match a given regex. +// Match Requires a string to match a given regex. type Match struct { Regexp *regexp.Regexp Key string } +// IsSatisfied judge whether obj is valid func (m Match) IsSatisfied(obj interface{}) bool { return m.Regexp.MatchString(fmt.Sprintf("%v", obj)) } +// DefaultMessage return the default Match error message func (m Match) DefaultMessage() string { return fmt.Sprintf(MessageTmpls["Match"], m.Regexp.String()) } +// GetKey return the m.Key func (m Match) GetKey() string { return m.Key } +// GetLimitValue return the limit value func (m Match) GetLimitValue() interface{} { return m.Regexp.String() } -// Requires a string to not match a given regex. +// NoMatch Requires a string to not match a given regex. type NoMatch struct { Match Key string } +// IsSatisfied judge whether obj is valid func (n NoMatch) IsSatisfied(obj interface{}) bool { return !n.Match.IsSatisfied(obj) } +// DefaultMessage return the default NoMatch error message func (n NoMatch) DefaultMessage() string { return fmt.Sprintf(MessageTmpls["NoMatch"], n.Regexp.String()) } +// GetKey return the n.Key func (n NoMatch) GetKey() string { return n.Key } +// GetLimitValue return the limit value func (n NoMatch) GetLimitValue() interface{} { return n.Regexp.String() } var alphaDashPattern = regexp.MustCompile("[^\\d\\w-_]") +// AlphaDash check not Alpha type AlphaDash struct { NoMatch Key string } +// DefaultMessage return the default AlphaDash error message func (a AlphaDash) DefaultMessage() string { return fmt.Sprint(MessageTmpls["AlphaDash"]) } +// GetKey return the n.Key func (a AlphaDash) GetKey() string { return a.Key } +// GetLimitValue return the limit value func (a AlphaDash) GetLimitValue() interface{} { return nil } var emailPattern = regexp.MustCompile("[\\w!#$%&'*+/=?^_`{|}~-]+(?:\\.[\\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\\w](?:[\\w-]*[\\w])?\\.)+[a-zA-Z0-9](?:[\\w-]*[\\w])?") +// Email check struct type Email struct { Match Key string } +// DefaultMessage return the default Email error message func (e Email) DefaultMessage() string { return fmt.Sprint(MessageTmpls["Email"]) } +// GetKey return the n.Key func (e Email) GetKey() string { return e.Key } +// GetLimitValue return the limit value func (e Email) GetLimitValue() interface{} { return nil } var ipPattern = regexp.MustCompile("^((2[0-4]\\d|25[0-5]|[01]?\\d\\d?)\\.){3}(2[0-4]\\d|25[0-5]|[01]?\\d\\d?)$") +// IP check struct type IP struct { Match Key string } +// DefaultMessage return the default IP error message func (i IP) DefaultMessage() string { return fmt.Sprint(MessageTmpls["IP"]) } +// GetKey return the i.Key func (i IP) GetKey() string { return i.Key } +// GetLimitValue return the limit value func (i IP) GetLimitValue() interface{} { return nil } var base64Pattern = regexp.MustCompile("^(?:[A-Za-z0-99+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$") +// Base64 check struct type Base64 struct { Match Key string } +// DefaultMessage return the default Base64 error message func (b Base64) DefaultMessage() string { return fmt.Sprint(MessageTmpls["Base64"]) } +// GetKey return the b.Key func (b Base64) GetKey() string { return b.Key } +// GetLimitValue return the limit value func (b Base64) GetLimitValue() interface{} { return nil } @@ -459,19 +531,23 @@ func (b Base64) GetLimitValue() interface{} { // just for chinese mobile phone number var mobilePattern = regexp.MustCompile("^((\\+86)|(86))?(1(([35][0-9])|[8][0-9]|[7][067]|[4][579]))\\d{8}$") +// Mobile check struct type Mobile struct { Match Key string } +// DefaultMessage return the default Mobile error message func (m Mobile) DefaultMessage() string { return fmt.Sprint(MessageTmpls["Mobile"]) } +// GetKey return the m.Key func (m Mobile) GetKey() string { return m.Key } +// GetLimitValue return the limit value func (m Mobile) GetLimitValue() interface{} { return nil } @@ -479,42 +555,50 @@ func (m Mobile) GetLimitValue() interface{} { // just for chinese telephone number var telPattern = regexp.MustCompile("^(0\\d{2,3}(\\-)?)?\\d{7,8}$") +// Tel check telephone struct type Tel struct { Match Key string } +// DefaultMessage return the default Tel error message func (t Tel) DefaultMessage() string { return fmt.Sprint(MessageTmpls["Tel"]) } +// GetKey return the t.Key func (t Tel) GetKey() string { return t.Key } +// GetLimitValue return the limit value func (t Tel) GetLimitValue() interface{} { return nil } -// just for chinese telephone or mobile phone number +// Phone just for chinese telephone or mobile phone number type Phone struct { Mobile Tel Key string } +// IsSatisfied judge whether obj is valid func (p Phone) IsSatisfied(obj interface{}) bool { return p.Mobile.IsSatisfied(obj) || p.Tel.IsSatisfied(obj) } +// DefaultMessage return the default Phone error message func (p Phone) DefaultMessage() string { return fmt.Sprint(MessageTmpls["Phone"]) } +// GetKey return the p.Key func (p Phone) GetKey() string { return p.Key } +// GetLimitValue return the limit value func (p Phone) GetLimitValue() interface{} { return nil } @@ -522,19 +606,23 @@ func (p Phone) GetLimitValue() interface{} { // just for chinese zipcode var zipCodePattern = regexp.MustCompile("^[1-9]\\d{5}$") +// ZipCode check the zip struct type ZipCode struct { Match Key string } +// DefaultMessage return the default Zip error message func (z ZipCode) DefaultMessage() string { return fmt.Sprint(MessageTmpls["ZipCode"]) } +// GetKey return the z.Key func (z ZipCode) GetKey() string { return z.Key } +// GetLimitValue return the limit value func (z ZipCode) GetLimitValue() interface{} { return nil } From 7b81617a959d396ccb4799a3d2ee8ff3c743f3cd Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 14 Sep 2015 23:13:51 +0800 Subject: [PATCH 218/436] golint captcha --- utils/captcha/captcha.go | 29 +++++++++++++++-------------- utils/captcha/image.go | 1 + 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/utils/captcha/captcha.go b/utils/captcha/captcha.go index 14c6c3b3..3616cc7e 100644 --- a/utils/captcha/captcha.go +++ b/utils/captcha/captcha.go @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +// Package captcha implements generation and verification of image CAPTCHAs. // an example for use captcha // // ``` @@ -78,7 +79,7 @@ const ( // default captcha attributes challengeNums = 6 expiration = 600 - fieldIdName = "captcha_id" + fieldIDName = "captcha_id" fieldCaptchaName = "captcha" cachePrefix = "captcha_" defaultURLPrefix = "/captcha/" @@ -93,7 +94,7 @@ type Captcha struct { URLPrefix string // specify captcha id input field name - FieldIdName string + FieldIDName string // specify captcha result input field name FieldCaptchaName string @@ -121,7 +122,7 @@ func (c *Captcha) genRandChars() []byte { return utils.RandomCreateBytes(c.ChallengeNums, defaultChars...) } -// beego filter handler for serve captcha image +// Handler beego filter handler for serve captcha image func (c *Captcha) Handler(ctx *context.Context) { var chars []byte @@ -156,8 +157,8 @@ func (c *Captcha) Handler(ctx *context.Context) { } } -// tempalte func for output html -func (c *Captcha) CreateCaptchaHtml() template.HTML { +// CreateCaptchaHTML tempalte func for output html +func (c *Captcha) CreateCaptchaHTML() template.HTML { value, err := c.CreateCaptcha() if err != nil { beego.Error("Create Captcha Error:", err) @@ -168,10 +169,10 @@ func (c *Captcha) CreateCaptchaHtml() template.HTML { return template.HTML(fmt.Sprintf(``+ ``+ ``+ - ``, c.FieldIdName, value, c.URLPrefix, value, c.URLPrefix, value)) + ``, c.FieldIDName, value, c.URLPrefix, value, c.URLPrefix, value)) } -// create a new captcha id +// CreateCaptcha create a new captcha id func (c *Captcha) CreateCaptcha() (string, error) { // generate captcha id id := string(utils.RandomCreateBytes(15)) @@ -187,13 +188,13 @@ func (c *Captcha) CreateCaptcha() (string, error) { return id, nil } -// verify from a request +// VerifyReq verify from a request func (c *Captcha) VerifyReq(req *http.Request) bool { req.ParseForm() - return c.Verify(req.Form.Get(c.FieldIdName), req.Form.Get(c.FieldCaptchaName)) + return c.Verify(req.Form.Get(c.FieldIDName), req.Form.Get(c.FieldCaptchaName)) } -// direct verify id and challenge string +// Verify direct verify id and challenge string func (c *Captcha) Verify(id string, challenge string) (success bool) { if len(challenge) == 0 || len(id) == 0 { return @@ -227,11 +228,11 @@ func (c *Captcha) Verify(id string, challenge string) (success bool) { return true } -// create a new captcha.Captcha +// NewCaptcha create a new captcha.Captcha func NewCaptcha(urlPrefix string, store cache.Cache) *Captcha { cpt := &Captcha{} cpt.store = store - cpt.FieldIdName = fieldIdName + cpt.FieldIDName = fieldIDName cpt.FieldCaptchaName = fieldCaptchaName cpt.ChallengeNums = challengeNums cpt.Expiration = expiration @@ -252,7 +253,7 @@ func NewCaptcha(urlPrefix string, store cache.Cache) *Captcha { return cpt } -// create a new captcha.Captcha and auto AddFilter for serve captacha image +// NewWithFilter create a new captcha.Captcha and auto AddFilter for serve captacha image // and add a tempalte func for output html func NewWithFilter(urlPrefix string, store cache.Cache) *Captcha { cpt := NewCaptcha(urlPrefix, store) @@ -261,7 +262,7 @@ func NewWithFilter(urlPrefix string, store cache.Cache) *Captcha { beego.InsertFilter(cpt.URLPrefix+"*", beego.BeforeRouter, cpt.Handler) // add to template func map - beego.AddFuncMap("create_captcha", cpt.CreateCaptchaHtml) + beego.AddFuncMap("create_captcha", cpt.CreateCaptchaHTML()) return cpt } diff --git a/utils/captcha/image.go b/utils/captcha/image.go index 8e9039d0..1057192a 100644 --- a/utils/captcha/image.go +++ b/utils/captcha/image.go @@ -240,6 +240,7 @@ var font = [][]byte{ }, } +// Image struct type Image struct { *image.Paletted numWidth int From 5015614fdcc57786635412136bdf719e6808d251 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 14 Sep 2015 23:17:33 +0800 Subject: [PATCH 219/436] golint pagination --- utils/pagination/controller.go | 2 +- utils/pagination/doc.go | 3 +-- utils/pagination/paginator.go | 34 +++++++++++++++++----------------- utils/pagination/utils.go | 4 ++-- 4 files changed, 21 insertions(+), 22 deletions(-) diff --git a/utils/pagination/controller.go b/utils/pagination/controller.go index f63b30e9..e42c4075 100644 --- a/utils/pagination/controller.go +++ b/utils/pagination/controller.go @@ -18,7 +18,7 @@ import ( "github.com/astaxie/beego/context" ) -// Instantiates a Paginator and assigns it to context.Input.Data["paginator"]. +// SetPaginator Instantiates a Paginator and assigns it to context.Input.Data["paginator"]. func SetPaginator(context *context.Context, per int, nums int64) (paginator *Paginator) { paginator = NewPaginator(context.Request, per, nums) context.Input.Data["paginator"] = &paginator diff --git a/utils/pagination/doc.go b/utils/pagination/doc.go index df0fa3b7..9abc6d78 100644 --- a/utils/pagination/doc.go +++ b/utils/pagination/doc.go @@ -1,6 +1,5 @@ /* - -The pagination package provides utilities to setup a paginator within the +Package pagination provides utilities to setup a paginator within the context of a http request. Usage diff --git a/utils/pagination/paginator.go b/utils/pagination/paginator.go index e813f798..c6db31e0 100644 --- a/utils/pagination/paginator.go +++ b/utils/pagination/paginator.go @@ -33,7 +33,7 @@ type Paginator struct { page int } -// Returns the total number of pages. +// PageNums Returns the total number of pages. func (p *Paginator) PageNums() int { if p.pageNums != 0 { return p.pageNums @@ -46,17 +46,17 @@ func (p *Paginator) PageNums() int { return p.pageNums } -// Returns the total number of items (e.g. from doing SQL count). +// Nums Returns the total number of items (e.g. from doing SQL count). func (p *Paginator) Nums() int64 { return p.nums } -// Sets the total number of items. +// SetNums Sets the total number of items. func (p *Paginator) SetNums(nums interface{}) { - p.nums, _ = ToInt64(nums) + p.nums, _ = toInt64(nums) } -// Returns the current page. +// Page Returns the current page. func (p *Paginator) Page() int { if p.page != 0 { return p.page @@ -74,7 +74,7 @@ func (p *Paginator) Page() int { return p.page } -// Returns a list of all pages. +// Pages Returns a list of all pages. // // Usage (in a view template): // @@ -112,7 +112,7 @@ func (p *Paginator) Pages() []int { return p.pageRange } -// Returns URL for a given page index. +// PageLink Returns URL for a given page index. func (p *Paginator) PageLink(page int) string { link, _ := url.ParseRequestURI(p.Request.URL.String()) values := link.Query() @@ -125,7 +125,7 @@ func (p *Paginator) PageLink(page int) string { return link.String() } -// Returns URL to the previous page. +// PageLinkPrev Returns URL to the previous page. func (p *Paginator) PageLinkPrev() (link string) { if p.HasPrev() { link = p.PageLink(p.Page() - 1) @@ -133,7 +133,7 @@ func (p *Paginator) PageLinkPrev() (link string) { return } -// Returns URL to the next page. +// PageLinkNext Returns URL to the next page. func (p *Paginator) PageLinkNext() (link string) { if p.HasNext() { link = p.PageLink(p.Page() + 1) @@ -141,42 +141,42 @@ func (p *Paginator) PageLinkNext() (link string) { return } -// Returns URL to the first page. +// PageLinkFirst Returns URL to the first page. func (p *Paginator) PageLinkFirst() (link string) { return p.PageLink(1) } -// Returns URL to the last page. +// PageLinkLast Returns URL to the last page. func (p *Paginator) PageLinkLast() (link string) { return p.PageLink(p.PageNums()) } -// Returns true if the current page has a predecessor. +// HasPrev Returns true if the current page has a predecessor. func (p *Paginator) HasPrev() bool { return p.Page() > 1 } -// Returns true if the current page has a successor. +// HasNext Returns true if the current page has a successor. func (p *Paginator) HasNext() bool { return p.Page() < p.PageNums() } -// Returns true if the given page index points to the current page. +// IsActive Returns true if the given page index points to the current page. func (p *Paginator) IsActive(page int) bool { return p.Page() == page } -// Returns the current offset. +// Offset Returns the current offset. func (p *Paginator) Offset() int { return (p.Page() - 1) * p.PerPageNums } -// Returns true if there is more than one page. +// HasPages Returns true if there is more than one page. func (p *Paginator) HasPages() bool { return p.PageNums() > 1 } -// Instantiates a paginator struct for the current http request. +// NewPaginator Instantiates a paginator struct for the current http request. func NewPaginator(req *http.Request, per int, nums interface{}) *Paginator { p := Paginator{} p.Request = req diff --git a/utils/pagination/utils.go b/utils/pagination/utils.go index 5932647d..686e68b0 100644 --- a/utils/pagination/utils.go +++ b/utils/pagination/utils.go @@ -19,8 +19,8 @@ import ( "reflect" ) -// convert any numeric value to int64 -func ToInt64(value interface{}) (d int64, err error) { +// ToInt64 convert any numeric value to int64 +func toInt64(value interface{}) (d int64, err error) { val := reflect.ValueOf(value) switch value.(type) { case int, int8, int16, int32, int64: From c6448727de1442363444a628de5f7f3cf54af8db Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 14 Sep 2015 23:35:13 +0800 Subject: [PATCH 220/436] golint utils --- utils/caller.go | 2 +- utils/debug.go | 8 ++++---- utils/file.go | 4 ++-- utils/mail.go | 5 +++-- utils/safemap.go | 5 +++-- utils/slice.go | 2 +- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/utils/caller.go b/utils/caller.go index de04d96e..73c52a62 100644 --- a/utils/caller.go +++ b/utils/caller.go @@ -19,7 +19,7 @@ import ( "runtime" ) -// get function name +// GetFuncName get function name func GetFuncName(i interface{}) string { return runtime.FuncForPC(reflect.ValueOf(i).Pointer()).Name() } diff --git a/utils/debug.go b/utils/debug.go index f9a682d3..2462e980 100644 --- a/utils/debug.go +++ b/utils/debug.go @@ -42,12 +42,12 @@ type pointerInfo struct { used []int } -// print the data in console +// Display print the data in console func Display(data ...interface{}) { display(true, data...) } -// return data print string +// GetDisplayString return data print string func GetDisplayString(data ...interface{}) string { return display(false, data...) } @@ -91,7 +91,7 @@ func fomateinfo(headlen int, data ...interface{}) []byte { for k, v := range data { var buf2 = new(bytes.Buffer) var pointers *pointerInfo - var interfaces []reflect.Value = make([]reflect.Value, 0, 10) + var interfaces = make([]reflect.Value, 0, 10) printKeyValue(buf2, reflect.ValueOf(v), &pointers, &interfaces, nil, true, " ", 1) @@ -385,7 +385,7 @@ func printPointerInfo(buf *bytes.Buffer, headlen int, pointers *pointerInfo) { if len(p.used) > 0 { anyused = true } - pointerNum += 1 + pointerNum++ p.n = pointerNum } diff --git a/utils/file.go b/utils/file.go index c9c3e903..db197882 100644 --- a/utils/file.go +++ b/utils/file.go @@ -44,7 +44,7 @@ func FileExists(name string) bool { return true } -// Search a file in paths. +// SearchFile Search a file in paths. // this is often used in search config file in /etc ~/ func SearchFile(filename string, paths ...string) (fullpath string, err error) { for _, path := range paths { @@ -56,7 +56,7 @@ func SearchFile(filename string, paths ...string) (fullpath string, err error) { return } -// like command grep -E +// GrepFile like command grep -E // for example: GrepFile(`^hello`, "hello.txt") // \n is striped while read func GrepFile(patten string, filename string) (lines []string, err error) { diff --git a/utils/mail.go b/utils/mail.go index 4959268c..c8ba3d92 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -80,7 +80,7 @@ func NewEMail(config string) *Email { return e } -// Make all send information to byte +// Bytes Make all send information to byte func (e *Email) Bytes() ([]byte, error) { buff := &bytes.Buffer{} w := multipart.NewWriter(buff) @@ -156,7 +156,7 @@ func (e *Email) Bytes() ([]byte, error) { return buff.Bytes(), nil } -// Add attach file to the send mail +// AttachFile Add attach file to the send mail func (e *Email) AttachFile(args ...string) (a *Attachment, err error) { if len(args) < 1 && len(args) > 2 { err = errors.New("Must specify a file name and number of parameters can not exceed at least two") @@ -215,6 +215,7 @@ func (e *Email) Attach(r io.Reader, filename string, args ...string) (a *Attachm return at, nil } +// Send will send out the mail func (e *Email) Send() error { if e.Auth == nil { e.Auth = smtp.PlainAuth(e.Identity, e.Username, e.Password, e.Host) diff --git a/utils/safemap.go b/utils/safemap.go index 37e76eb3..2e438f2c 100644 --- a/utils/safemap.go +++ b/utils/safemap.go @@ -18,6 +18,7 @@ import ( "sync" ) +// BeeMap is a map with lock type BeeMap struct { lock *sync.RWMutex bm map[interface{}]interface{} @@ -41,7 +42,7 @@ func (m *BeeMap) Get(k interface{}) interface{} { return nil } -// Maps the given key and value. Returns false +// Set Maps the given key and value. Returns false // if the key is already in the map and changes nothing. func (m *BeeMap) Set(k interface{}, v interface{}) bool { m.lock.Lock() @@ -56,7 +57,7 @@ func (m *BeeMap) Set(k interface{}, v interface{}) bool { return true } -// Returns true if k is exist in the map. +// Check Returns true if k is exist in the map. func (m *BeeMap) Check(k interface{}) bool { m.lock.RLock() defer m.lock.RUnlock() diff --git a/utils/slice.go b/utils/slice.go index e413004d..8f2cef98 100644 --- a/utils/slice.go +++ b/utils/slice.go @@ -116,7 +116,7 @@ func SliceIntersect(slice1, slice2 []interface{}) (diffslice []interface{}) { return } -// SliceChuck separates one slice to some sized slice. +// SliceChunk separates one slice to some sized slice. func SliceChunk(slice []interface{}, size int) (chunkslice [][]interface{}) { if size >= len(slice) { chunkslice = append(chunkslice, slice) From cce8d1e9349773809ca221d9bf5e0564a205d21f Mon Sep 17 00:00:00 2001 From: JessonChan Date: Thu, 17 Sep 2015 10:31:53 +0800 Subject: [PATCH 221/436] refactor hooks function code --- hooks.go | 50 +++++++++++++++----------------------------------- 1 file changed, 15 insertions(+), 35 deletions(-) diff --git a/hooks.go b/hooks.go index 178d8dc4..7223bd19 100644 --- a/hooks.go +++ b/hooks.go @@ -5,6 +5,8 @@ import ( "path/filepath" "strconv" + "net/http" + "github.com/astaxie/beego/session" ) @@ -18,42 +20,20 @@ func registerMime() error { // register default error http handlers, 404,401,403,500 and 503. func registerDefaultErrorHandler() error { - if _, ok := ErrorMaps["401"]; !ok { - ErrorHandler("401", unauthorized) - } - if _, ok := ErrorMaps["402"]; !ok { - ErrorHandler("402", paymentRequired) - } - - if _, ok := ErrorMaps["403"]; !ok { - ErrorHandler("403", forbidden) - } - - if _, ok := ErrorMaps["404"]; !ok { - ErrorHandler("404", notFound) - } - - if _, ok := ErrorMaps["405"]; !ok { - ErrorHandler("405", methodNotAllowed) - } - - if _, ok := ErrorMaps["500"]; !ok { - ErrorHandler("500", internalServerError) - } - if _, ok := ErrorMaps["501"]; !ok { - ErrorHandler("501", notImplemented) - } - if _, ok := ErrorMaps["502"]; !ok { - ErrorHandler("502", badGateway) - } - - if _, ok := ErrorMaps["503"]; !ok { - ErrorHandler("503", serviceUnavailable) - } - - if _, ok := ErrorMaps["504"]; !ok { - ErrorHandler("504", gatewayTimeout) + for e, h := range map[string]func(http.ResponseWriter, *http.Request){ + "401": unauthorized, + "402": paymentRequired, + "403": forbidden, + "404": notFound, + "405": methodNotAllowed, + "500": internalServerError, + "501": notImplemented, + "502": badGateway, + "503": serviceUnavailable, + "504": gatewayTimeout, + } { + ErrorHandler(e, h) } return nil } From bb776cc4cbef7f315a4b1f8abb96079425796c78 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Thu, 17 Sep 2015 10:33:12 +0800 Subject: [PATCH 222/436] error map refactor --- error.go | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/error.go b/error.go index e1d6dfae..e2848e57 100644 --- a/error.go +++ b/error.go @@ -204,11 +204,7 @@ type errorInfo struct { } // map of http handlers for each error string. -var ErrorMaps map[string]*errorInfo - -func init() { - ErrorMaps = make(map[string]*errorInfo) -} +var ErrorMaps map[string]*errorInfo = make(map[string]*errorInfo, 10) // show 401 unauthorized error. func unauthorized(rw http.ResponseWriter, r *http.Request) { @@ -392,22 +388,21 @@ func ErrorController(c ControllerInterface) *App { } // show error string as simple text message. -// if error string is empty, show 500 error as default. -func exception(errcode string, ctx *context.Context) { - code, err := strconv.Atoi(errcode) - if err != nil { - code = 503 - } - if h, ok := ErrorMaps[errcode]; ok { - executeError(h, ctx, code) - return - } else if h, ok := ErrorMaps["503"]; ok { - executeError(h, ctx, code) - return - } else { - ctx.ResponseWriter.WriteHeader(code) - ctx.WriteString(errcode) +// if error string is empty, show 503 or 500 error as default. +func exception(errCode string, ctx *context.Context) { + for ec, _ := range []string{errCode, "503", "500"} { + code, _ := strconv.Atoi(errCode) + if code == 0 { + code = 503 + } + if h, ok := ErrorMaps[ec]; ok { + executeError(h, ctx, code) + return + } } + //if 50x error has been removed from errorMap + ctx.ResponseWriter.WriteHeader(503) + ctx.WriteString(errCode) } func executeError(err *errorInfo, ctx *context.Context, code int) { From de20960458ad557cc555a30c49626266e4de709b Mon Sep 17 00:00:00 2001 From: JessonChan Date: Thu, 17 Sep 2015 10:36:29 +0800 Subject: [PATCH 223/436] error map refactor --- hooks.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hooks.go b/hooks.go index 7223bd19..6e401c06 100644 --- a/hooks.go +++ b/hooks.go @@ -33,7 +33,9 @@ func registerDefaultErrorHandler() error { "503": serviceUnavailable, "504": gatewayTimeout, } { - ErrorHandler(e, h) + if _, ok := ErrorMaps[e]; !ok { + ErrorHandler(e, h) + } } return nil } From c73e0395edeeac9f26c811a60f575a7ea2e4eb9b Mon Sep 17 00:00:00 2001 From: ngaut Date: Thu, 10 Sep 2015 16:31:53 +0800 Subject: [PATCH 224/436] Orm: Support TiDB --- orm/db_alias.go | 3 + orm/db_tidb.go | 63 +++++++++++++++++++ orm/models_test.go | 10 +++ orm/orm_test.go | 10 ++- orm/qb.go | 2 + orm/qb_tidb.go | 151 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 236 insertions(+), 3 deletions(-) create mode 100644 orm/db_tidb.go create mode 100644 orm/qb_tidb.go diff --git a/orm/db_alias.go b/orm/db_alias.go index 38302bc2..7918300e 100644 --- a/orm/db_alias.go +++ b/orm/db_alias.go @@ -32,6 +32,7 @@ const ( DRSqlite // sqlite DROracle // oracle DRPostgres // pgsql + DRTiDB // TiDB ) // database driver string. @@ -57,12 +58,14 @@ var ( "mysql": DRMySQL, "postgres": DRPostgres, "sqlite3": DRSqlite, + "tidb": DRTiDB, } dbBasers = map[DriverType]dbBaser{ DRMySQL: newdbBaseMysql(), DRSqlite: newdbBaseSqlite(), DROracle: newdbBaseMysql(), DRPostgres: newdbBasePostgres(), + DRTiDB: newdbBaseTidb(), } ) diff --git a/orm/db_tidb.go b/orm/db_tidb.go new file mode 100644 index 00000000..6020a488 --- /dev/null +++ b/orm/db_tidb.go @@ -0,0 +1,63 @@ +// Copyright 2015 TiDB Author. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package orm + +import ( + "fmt" +) + +// mysql dbBaser implementation. +type dbBaseTidb struct { + dbBase +} + +var _ dbBaser = new(dbBaseTidb) + +// get mysql operator. +func (d *dbBaseTidb) OperatorSQL(operator string) string { + return mysqlOperators[operator] +} + +// get mysql table field types. +func (d *dbBaseTidb) DbTypes() map[string]string { + return mysqlTypes +} + +// show table sql for mysql. +func (d *dbBaseTidb) ShowTablesQuery() string { + return "SELECT table_name FROM information_schema.tables WHERE table_type = 'BASE TABLE' AND table_schema = DATABASE()" +} + +// show columns sql of table for mysql. +func (d *dbBaseTidb) ShowColumnsQuery(table string) string { + return fmt.Sprintf("SELECT COLUMN_NAME, COLUMN_TYPE, IS_NULLABLE FROM information_schema.columns "+ + "WHERE table_schema = DATABASE() AND table_name = '%s'", table) +} + +// execute sql to check index exist. +func (d *dbBaseTidb) IndexExists(db dbQuerier, table string, name string) bool { + row := db.QueryRow("SELECT count(*) FROM information_schema.statistics "+ + "WHERE table_schema = DATABASE() AND table_name = ? AND index_name = ?", table, name) + var cnt int + row.Scan(&cnt) + return cnt > 0 +} + +// create new mysql dbBaser. +func newdbBaseTidb() dbBaser { + b := new(dbBaseTidb) + b.ins = b + return b +} diff --git a/orm/models_test.go b/orm/models_test.go index 9dfa183d..23e2b9e3 100644 --- a/orm/models_test.go +++ b/orm/models_test.go @@ -25,6 +25,7 @@ import ( _ "github.com/go-sql-driver/mysql" _ "github.com/lib/pq" _ "github.com/mattn/go-sqlite3" + _ "github.com/pingcap/tidb" ) // A slice string field. @@ -345,6 +346,7 @@ var ( IsMysql = DBARGS.Driver == "mysql" IsSqlite = DBARGS.Driver == "sqlite3" IsPostgres = DBARGS.Driver == "postgres" + IsTidb = DBARGS.Driver == "tidb" ) var ( @@ -364,6 +366,7 @@ Default DB Drivers. mysql: https://github.com/go-sql-driver/mysql sqlite3: https://github.com/mattn/go-sqlite3 postgres: https://github.com/lib/pq +tidb: https://github.com/pingcap/tidb usage: @@ -371,6 +374,7 @@ go get -u github.com/astaxie/beego/orm go get -u github.com/go-sql-driver/mysql go get -u github.com/mattn/go-sqlite3 go get -u github.com/lib/pq +go get -u github.com/pingcap/tidb #### MySQL mysql -u root -e 'create database orm_test;' @@ -390,6 +394,12 @@ psql -c 'create database orm_test;' -U postgres export ORM_DRIVER=postgres export ORM_SOURCE="user=postgres dbname=orm_test sslmode=disable" go test -v github.com/astaxie/beego/orm + +#### TiDB +export ORM_DRIVER=tidb +export ORM_SOURCE='memory://test' +go test -v github.com/astaxie/beego/orm + `) os.Exit(2) } diff --git a/orm/orm_test.go b/orm/orm_test.go index 4342afa7..1d174fa9 100644 --- a/orm/orm_test.go +++ b/orm/orm_test.go @@ -702,7 +702,7 @@ func TestOperators(t *testing.T) { var shouldNum int - if IsSqlite { + if IsSqlite || IsTidb { shouldNum = 2 } else { shouldNum = 0 @@ -740,7 +740,7 @@ func TestOperators(t *testing.T) { throwFail(t, err) throwFail(t, AssertIs(num, 1)) - if IsSqlite { + if IsSqlite || IsTidb { shouldNum = 1 } else { shouldNum = 0 @@ -758,7 +758,7 @@ func TestOperators(t *testing.T) { throwFail(t, err) throwFail(t, AssertIs(num, 2)) - if IsSqlite { + if IsSqlite || IsTidb { shouldNum = 2 } else { shouldNum = 0 @@ -986,6 +986,10 @@ func TestValuesFlat(t *testing.T) { } func TestRelatedSel(t *testing.T) { + if IsTidb { + // Skip it. TiDB does not support relation now. + return + } qs := dORM.QueryTable("user") num, err := qs.Filter("profile__age", 28).Count() throwFail(t, err) diff --git a/orm/qb.go b/orm/qb.go index d7efae81..f5f10ebf 100644 --- a/orm/qb.go +++ b/orm/qb.go @@ -48,6 +48,8 @@ type QueryBuilder interface { func NewQueryBuilder(driver string) (qb QueryBuilder, err error) { if driver == "mysql" { qb = new(MySQLQueryBuilder) + } else if driver == "mysql" { + qb = new(MySQLQueryBuilder) } else if driver == "postgres" { err = errors.New("postgres query builder is not supported yet") } else if driver == "sqlite" { diff --git a/orm/qb_tidb.go b/orm/qb_tidb.go new file mode 100644 index 00000000..348002e1 --- /dev/null +++ b/orm/qb_tidb.go @@ -0,0 +1,151 @@ +// Copyright 2015 TiDB Author. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package orm + +import ( + "fmt" + "strconv" + "strings" +) + +type TiDBQueryBuilder struct { + Tokens []string +} + +func (qb *TiDBQueryBuilder) Select(fields ...string) QueryBuilder { + qb.Tokens = append(qb.Tokens, "SELECT", strings.Join(fields, CommaSpace)) + return qb +} + +func (qb *TiDBQueryBuilder) From(tables ...string) QueryBuilder { + qb.Tokens = append(qb.Tokens, "FROM", strings.Join(tables, CommaSpace)) + return qb +} + +func (qb *TiDBQueryBuilder) InnerJoin(table string) QueryBuilder { + qb.Tokens = append(qb.Tokens, "INNER JOIN", table) + return qb +} + +func (qb *TiDBQueryBuilder) LeftJoin(table string) QueryBuilder { + qb.Tokens = append(qb.Tokens, "LEFT JOIN", table) + return qb +} + +func (qb *TiDBQueryBuilder) RightJoin(table string) QueryBuilder { + qb.Tokens = append(qb.Tokens, "RIGHT JOIN", table) + return qb +} + +func (qb *TiDBQueryBuilder) On(cond string) QueryBuilder { + qb.Tokens = append(qb.Tokens, "ON", cond) + return qb +} + +func (qb *TiDBQueryBuilder) Where(cond string) QueryBuilder { + qb.Tokens = append(qb.Tokens, "WHERE", cond) + return qb +} + +func (qb *TiDBQueryBuilder) And(cond string) QueryBuilder { + qb.Tokens = append(qb.Tokens, "AND", cond) + return qb +} + +func (qb *TiDBQueryBuilder) Or(cond string) QueryBuilder { + qb.Tokens = append(qb.Tokens, "OR", cond) + return qb +} + +func (qb *TiDBQueryBuilder) In(vals ...string) QueryBuilder { + qb.Tokens = append(qb.Tokens, "IN", "(", strings.Join(vals, CommaSpace), ")") + return qb +} + +func (qb *TiDBQueryBuilder) OrderBy(fields ...string) QueryBuilder { + qb.Tokens = append(qb.Tokens, "ORDER BY", strings.Join(fields, CommaSpace)) + return qb +} + +func (qb *TiDBQueryBuilder) Asc() QueryBuilder { + qb.Tokens = append(qb.Tokens, "ASC") + return qb +} + +func (qb *TiDBQueryBuilder) Desc() QueryBuilder { + qb.Tokens = append(qb.Tokens, "DESC") + return qb +} + +func (qb *TiDBQueryBuilder) Limit(limit int) QueryBuilder { + qb.Tokens = append(qb.Tokens, "LIMIT", strconv.Itoa(limit)) + return qb +} + +func (qb *TiDBQueryBuilder) Offset(offset int) QueryBuilder { + qb.Tokens = append(qb.Tokens, "OFFSET", strconv.Itoa(offset)) + return qb +} + +func (qb *TiDBQueryBuilder) GroupBy(fields ...string) QueryBuilder { + qb.Tokens = append(qb.Tokens, "GROUP BY", strings.Join(fields, CommaSpace)) + return qb +} + +func (qb *TiDBQueryBuilder) Having(cond string) QueryBuilder { + qb.Tokens = append(qb.Tokens, "HAVING", cond) + return qb +} + +func (qb *TiDBQueryBuilder) Update(tables ...string) QueryBuilder { + qb.Tokens = append(qb.Tokens, "UPDATE", strings.Join(tables, CommaSpace)) + return qb +} + +func (qb *TiDBQueryBuilder) Set(kv ...string) QueryBuilder { + qb.Tokens = append(qb.Tokens, "SET", strings.Join(kv, CommaSpace)) + return qb +} + +func (qb *TiDBQueryBuilder) Delete(tables ...string) QueryBuilder { + qb.Tokens = append(qb.Tokens, "DELETE") + if len(tables) != 0 { + qb.Tokens = append(qb.Tokens, strings.Join(tables, CommaSpace)) + } + return qb +} + +func (qb *TiDBQueryBuilder) InsertInto(table string, fields ...string) QueryBuilder { + qb.Tokens = append(qb.Tokens, "INSERT INTO", table) + if len(fields) != 0 { + fieldsStr := strings.Join(fields, CommaSpace) + qb.Tokens = append(qb.Tokens, "(", fieldsStr, ")") + } + return qb +} + +func (qb *TiDBQueryBuilder) Values(vals ...string) QueryBuilder { + valsStr := strings.Join(vals, CommaSpace) + qb.Tokens = append(qb.Tokens, "VALUES", "(", valsStr, ")") + return qb +} + +func (qb *TiDBQueryBuilder) Subquery(sub string, alias string) string { + return fmt.Sprintf("(%s) AS %s", sub, alias) +} + +func (qb *TiDBQueryBuilder) String() string { + return strings.Join(qb.Tokens, " ") +} From c841a77ad64823b653b6d07ab23571e7aaea2989 Mon Sep 17 00:00:00 2001 From: ngaut Date: Fri, 11 Sep 2015 11:24:58 +0800 Subject: [PATCH 225/436] Orm: Add tidb for query builder --- orm/models_test.go | 2 +- orm/orm_test.go | 5 ++++- orm/qb.go | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/orm/models_test.go b/orm/models_test.go index 23e2b9e3..2a9962a1 100644 --- a/orm/models_test.go +++ b/orm/models_test.go @@ -397,7 +397,7 @@ go test -v github.com/astaxie/beego/orm #### TiDB export ORM_DRIVER=tidb -export ORM_SOURCE='memory://test' +export ORM_SOURCE='memory://test/test' go test -v github.com/astaxie/beego/orm `) diff --git a/orm/orm_test.go b/orm/orm_test.go index 1d174fa9..dc68da1a 100644 --- a/orm/orm_test.go +++ b/orm/orm_test.go @@ -26,6 +26,8 @@ import ( "strings" "testing" "time" + + "github.com/juju/errors" ) var _ = os.PathSeparator @@ -133,6 +135,7 @@ func throwFail(t *testing.T, err error, args ...interface{}) { } con += " " + strings.Join(parts, ", ") } + t.Error(errors.ErrorStack(err)) t.Error(con) t.Fail() } @@ -172,7 +175,7 @@ func TestSyncDb(t *testing.T) { RegisterModel(new(UserBig)) RegisterModel(new(PostTags)) - err := RunSyncdb("default", true, false) + err := RunSyncdb("default", true, true) throwFail(t, err) modelCache.clean() diff --git a/orm/qb.go b/orm/qb.go index f5f10ebf..9f778916 100644 --- a/orm/qb.go +++ b/orm/qb.go @@ -48,8 +48,8 @@ type QueryBuilder interface { func NewQueryBuilder(driver string) (qb QueryBuilder, err error) { if driver == "mysql" { qb = new(MySQLQueryBuilder) - } else if driver == "mysql" { - qb = new(MySQLQueryBuilder) + } else if driver == "tidb" { + qb = new(TiDBQueryBuilder) } else if driver == "postgres" { err = errors.New("postgres query builder is not supported yet") } else if driver == "sqlite" { From 09b7457ac656aa33be0714112139fc65c1033b0e Mon Sep 17 00:00:00 2001 From: ngaut Date: Thu, 17 Sep 2015 15:41:39 +0800 Subject: [PATCH 226/436] orm_test: Skip relation test --- orm/orm_test.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/orm/orm_test.go b/orm/orm_test.go index dc68da1a..1d174fa9 100644 --- a/orm/orm_test.go +++ b/orm/orm_test.go @@ -26,8 +26,6 @@ import ( "strings" "testing" "time" - - "github.com/juju/errors" ) var _ = os.PathSeparator @@ -135,7 +133,6 @@ func throwFail(t *testing.T, err error, args ...interface{}) { } con += " " + strings.Join(parts, ", ") } - t.Error(errors.ErrorStack(err)) t.Error(con) t.Fail() } @@ -175,7 +172,7 @@ func TestSyncDb(t *testing.T) { RegisterModel(new(UserBig)) RegisterModel(new(PostTags)) - err := RunSyncdb("default", true, true) + err := RunSyncdb("default", true, false) throwFail(t, err) modelCache.clean() From 3df0fa462ddb7be87f27639c4c37766d0b4d9df8 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 17 Sep 2015 23:00:05 +0800 Subject: [PATCH 227/436] golint tidb --- orm/qb_tidb.go | 25 +++++++++++++++++++++++++ session/sess_utils.go | 2 ++ 2 files changed, 27 insertions(+) diff --git a/orm/qb_tidb.go b/orm/qb_tidb.go index 348002e1..c504049e 100644 --- a/orm/qb_tidb.go +++ b/orm/qb_tidb.go @@ -20,105 +20,126 @@ import ( "strings" ) +// TiDBQueryBuilder is the SQL build type TiDBQueryBuilder struct { Tokens []string } +// Select will join the fields func (qb *TiDBQueryBuilder) Select(fields ...string) QueryBuilder { qb.Tokens = append(qb.Tokens, "SELECT", strings.Join(fields, CommaSpace)) return qb } +// From join the tables func (qb *TiDBQueryBuilder) From(tables ...string) QueryBuilder { qb.Tokens = append(qb.Tokens, "FROM", strings.Join(tables, CommaSpace)) return qb } +// InnerJoin INNER JOIN the table func (qb *TiDBQueryBuilder) InnerJoin(table string) QueryBuilder { qb.Tokens = append(qb.Tokens, "INNER JOIN", table) return qb } +// LeftJoin LEFT JOIN the table func (qb *TiDBQueryBuilder) LeftJoin(table string) QueryBuilder { qb.Tokens = append(qb.Tokens, "LEFT JOIN", table) return qb } +// RightJoin RIGHT JOIN the table func (qb *TiDBQueryBuilder) RightJoin(table string) QueryBuilder { qb.Tokens = append(qb.Tokens, "RIGHT JOIN", table) return qb } +// On join with on cond func (qb *TiDBQueryBuilder) On(cond string) QueryBuilder { qb.Tokens = append(qb.Tokens, "ON", cond) return qb } +// Where join the Where cond func (qb *TiDBQueryBuilder) Where(cond string) QueryBuilder { qb.Tokens = append(qb.Tokens, "WHERE", cond) return qb } +// And join the and cond func (qb *TiDBQueryBuilder) And(cond string) QueryBuilder { qb.Tokens = append(qb.Tokens, "AND", cond) return qb } +// Or join the or cond func (qb *TiDBQueryBuilder) Or(cond string) QueryBuilder { qb.Tokens = append(qb.Tokens, "OR", cond) return qb } +// In join the IN (vals) func (qb *TiDBQueryBuilder) In(vals ...string) QueryBuilder { qb.Tokens = append(qb.Tokens, "IN", "(", strings.Join(vals, CommaSpace), ")") return qb } +// OrderBy join the Order by fields func (qb *TiDBQueryBuilder) OrderBy(fields ...string) QueryBuilder { qb.Tokens = append(qb.Tokens, "ORDER BY", strings.Join(fields, CommaSpace)) return qb } +// Asc join the asc func (qb *TiDBQueryBuilder) Asc() QueryBuilder { qb.Tokens = append(qb.Tokens, "ASC") return qb } +// Desc join the desc func (qb *TiDBQueryBuilder) Desc() QueryBuilder { qb.Tokens = append(qb.Tokens, "DESC") return qb } +// Limit join the limit num func (qb *TiDBQueryBuilder) Limit(limit int) QueryBuilder { qb.Tokens = append(qb.Tokens, "LIMIT", strconv.Itoa(limit)) return qb } +// Offset join the offset num func (qb *TiDBQueryBuilder) Offset(offset int) QueryBuilder { qb.Tokens = append(qb.Tokens, "OFFSET", strconv.Itoa(offset)) return qb } +// GroupBy join the Group by fields func (qb *TiDBQueryBuilder) GroupBy(fields ...string) QueryBuilder { qb.Tokens = append(qb.Tokens, "GROUP BY", strings.Join(fields, CommaSpace)) return qb } +// Having join the Having cond func (qb *TiDBQueryBuilder) Having(cond string) QueryBuilder { qb.Tokens = append(qb.Tokens, "HAVING", cond) return qb } +// Update join the update table func (qb *TiDBQueryBuilder) Update(tables ...string) QueryBuilder { qb.Tokens = append(qb.Tokens, "UPDATE", strings.Join(tables, CommaSpace)) return qb } +// Set join the set kv func (qb *TiDBQueryBuilder) Set(kv ...string) QueryBuilder { qb.Tokens = append(qb.Tokens, "SET", strings.Join(kv, CommaSpace)) return qb } +// Delete join the Delete tables func (qb *TiDBQueryBuilder) Delete(tables ...string) QueryBuilder { qb.Tokens = append(qb.Tokens, "DELETE") if len(tables) != 0 { @@ -127,6 +148,7 @@ func (qb *TiDBQueryBuilder) Delete(tables ...string) QueryBuilder { return qb } +// InsertInto join the insert SQL func (qb *TiDBQueryBuilder) InsertInto(table string, fields ...string) QueryBuilder { qb.Tokens = append(qb.Tokens, "INSERT INTO", table) if len(fields) != 0 { @@ -136,16 +158,19 @@ func (qb *TiDBQueryBuilder) InsertInto(table string, fields ...string) QueryBuil return qb } +// Values join the Values(vals) func (qb *TiDBQueryBuilder) Values(vals ...string) QueryBuilder { valsStr := strings.Join(vals, CommaSpace) qb.Tokens = append(qb.Tokens, "VALUES", "(", valsStr, ")") return qb } +// Subquery join the sub as alias func (qb *TiDBQueryBuilder) Subquery(sub string, alias string) string { return fmt.Sprintf("(%s) AS %s", sub, alias) } +// String join all Tokens func (qb *TiDBQueryBuilder) String() string { return strings.Join(qb.Tokens, " ") } diff --git a/session/sess_utils.go b/session/sess_utils.go index 756f3e4a..d7db5ba8 100644 --- a/session/sess_utils.go +++ b/session/sess_utils.go @@ -43,6 +43,7 @@ func init() { gob.Register(map[int]int64{}) } +// EncodeGob encode the obj to gob func EncodeGob(obj map[interface{}]interface{}) ([]byte, error) { for _, v := range obj { gob.Register(v) @@ -56,6 +57,7 @@ func EncodeGob(obj map[interface{}]interface{}) ([]byte, error) { return buf.Bytes(), nil } +// DecodeGob decode data to map func DecodeGob(encoded []byte) (map[interface{}]interface{}, error) { buf := bytes.NewBuffer(encoded) dec := gob.NewDecoder(buf) From bb6062857b717605f8dadbf65f378f8767384f32 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 17 Sep 2015 23:05:45 +0800 Subject: [PATCH 228/436] fix the error refactor --- error.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/error.go b/error.go index e2848e57..60f2098c 100644 --- a/error.go +++ b/error.go @@ -204,7 +204,7 @@ type errorInfo struct { } // map of http handlers for each error string. -var ErrorMaps map[string]*errorInfo = make(map[string]*errorInfo, 10) +var ErrorMaps = make(map[string]*errorInfo, 10) // show 401 unauthorized error. func unauthorized(rw http.ResponseWriter, r *http.Request) { @@ -390,7 +390,7 @@ func ErrorController(c ControllerInterface) *App { // show error string as simple text message. // if error string is empty, show 503 or 500 error as default. func exception(errCode string, ctx *context.Context) { - for ec, _ := range []string{errCode, "503", "500"} { + for _, ec := range []string{errCode, "503", "500"} { code, _ := strconv.Atoi(errCode) if code == 0 { code = 503 From 6e24b78b6289be365f6ae9e35baed1dbf5e16353 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 17 Sep 2015 23:27:34 +0800 Subject: [PATCH 229/436] fix the wrong response --- error.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/error.go b/error.go index 60f2098c..ff060c4d 100644 --- a/error.go +++ b/error.go @@ -390,18 +390,18 @@ func ErrorController(c ControllerInterface) *App { // show error string as simple text message. // if error string is empty, show 503 or 500 error as default. func exception(errCode string, ctx *context.Context) { + code, _ := strconv.Atoi(errCode) + if code == 0 { + code = 503 + } for _, ec := range []string{errCode, "503", "500"} { - code, _ := strconv.Atoi(errCode) - if code == 0 { - code = 503 - } if h, ok := ErrorMaps[ec]; ok { executeError(h, ctx, code) return } } //if 50x error has been removed from errorMap - ctx.ResponseWriter.WriteHeader(503) + ctx.ResponseWriter.WriteHeader(code) ctx.WriteString(errCode) } From 4823a0f1147c28034b80c8416d8a69399525912d Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 17 Sep 2015 23:47:26 +0800 Subject: [PATCH 230/436] remove the dead code --- cache/conv.go | 12 ------------ orm/db_alias.go | 2 +- orm/utils.go | 18 ------------------ session/redis/sess_redis.go | 2 -- templatefunc.go | 1 - utils/debug.go | 14 ++++---------- 6 files changed, 5 insertions(+), 44 deletions(-) diff --git a/cache/conv.go b/cache/conv.go index 16ef1106..dbdff1c7 100644 --- a/cache/conv.go +++ b/cache/conv.go @@ -98,15 +98,3 @@ func GetBool(v interface{}) bool { } return false } - -// getByteArray convert interface to byte slice. -func getByteArray(v interface{}) []byte { - switch result := v.(type) { - case []byte: - return result - case string: - return []byte(result) - default: - return nil - } -} diff --git a/orm/db_alias.go b/orm/db_alias.go index 7918300e..79576b8e 100644 --- a/orm/db_alias.go +++ b/orm/db_alias.go @@ -63,7 +63,7 @@ var ( dbBasers = map[DriverType]dbBaser{ DRMySQL: newdbBaseMysql(), DRSqlite: newdbBaseSqlite(), - DROracle: newdbBaseMysql(), + DROracle: newdbBaseOracle(), DRPostgres: newdbBasePostgres(), DRTiDB: newdbBaseTidb(), } diff --git a/orm/utils.go b/orm/utils.go index f9af2515..99437c7b 100644 --- a/orm/utils.go +++ b/orm/utils.go @@ -249,30 +249,12 @@ func (a argInt) Get(i int, args ...int) (r int) { return } -type argAny []interface{} - -// get interface by index from interface slice -func (a argAny) Get(i int, args ...interface{}) (r interface{}) { - if i >= 0 && i < len(a) { - r = a[i] - } - if len(args) > 0 { - r = args[0] - } - return -} - // parse time to string with location func timeParse(dateString, format string) (time.Time, error) { tp, err := time.ParseInLocation(format, dateString, DefaultTimeLoc) return tp, err } -// format time string -func timeFormat(t time.Time, format string) string { - return t.Format(format) -} - // get pointer indirect type func indirectType(v reflect.Type) reflect.Type { switch v.Kind() { diff --git a/session/redis/sess_redis.go b/session/redis/sess_redis.go index 18e1f888..6e85c449 100644 --- a/session/redis/sess_redis.go +++ b/session/redis/sess_redis.go @@ -48,8 +48,6 @@ var redispder = &Provider{} // redis max pool size var MaxPoolSize = 100 -var redisPool chan redis.Conn - // SessionStore redis session store type SessionStore struct { p *redis.Pool diff --git a/templatefunc.go b/templatefunc.go index 62548659..e944bc73 100644 --- a/templatefunc.go +++ b/templatefunc.go @@ -518,7 +518,6 @@ const ( complexKind intKind floatKind - integerKind stringKind uintKind ) diff --git a/utils/debug.go b/utils/debug.go index 2462e980..93c27b70 100644 --- a/utils/debug.go +++ b/utils/debug.go @@ -26,12 +26,6 @@ var ( dunno = []byte("???") centerDot = []byte("·") dot = []byte(".") - lbr = []byte("{") - lbrn = []byte("{\n") - com = []byte(",") - comn = []byte(",\n") - rbr = []byte("}") - comnrbr = []byte(",\n}") ) type pointerInfo struct { @@ -376,8 +370,8 @@ func printKeyValue(buf *bytes.Buffer, val reflect.Value, pointers **pointerInfo, } } -// dump pointer value -func printPointerInfo(buf *bytes.Buffer, headlen int, pointers *pointerInfo) { +// PrintPointerInfo dump pointer value +func PrintPointerInfo(buf *bytes.Buffer, headlen int, pointers *pointerInfo) { var anyused = false var pointerNum = 0 @@ -444,8 +438,8 @@ func printPointerInfo(buf *bytes.Buffer, headlen int, pointers *pointerInfo) { } } -// get stack bytes -func stack(skip int, indent string) []byte { +// Stack get stack bytes +func Stack(skip int, indent string) []byte { var buf = new(bytes.Buffer) for i := skip; ; i++ { From ead635e62ff0198b29d9a01cebfbae3a169ccaa4 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Fri, 18 Sep 2015 10:31:10 +0800 Subject: [PATCH 231/436] default exception handler --- error.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/error.go b/error.go index ff060c4d..ee21cee9 100644 --- a/error.go +++ b/error.go @@ -390,18 +390,19 @@ func ErrorController(c ControllerInterface) *App { // show error string as simple text message. // if error string is empty, show 503 or 500 error as default. func exception(errCode string, ctx *context.Context) { - code, _ := strconv.Atoi(errCode) - if code == 0 { - code = 503 - } for _, ec := range []string{errCode, "503", "500"} { + code, _ := strconv.Atoi(ec) + if code == 0 { + code = 503 + } if h, ok := ErrorMaps[ec]; ok { executeError(h, ctx, code) return } } //if 50x error has been removed from errorMap - ctx.ResponseWriter.WriteHeader(code) + //set 503 as default + ctx.ResponseWriter.WriteHeader(503) ctx.WriteString(errCode) } From 8df2cca627441eeb0a7a2723337a39479f88089b Mon Sep 17 00:00:00 2001 From: JessonChan Date: Fri, 18 Sep 2015 10:32:21 +0800 Subject: [PATCH 232/436] add comment --- error.go | 1 + 1 file changed, 1 insertion(+) diff --git a/error.go b/error.go index ee21cee9..1e047234 100644 --- a/error.go +++ b/error.go @@ -204,6 +204,7 @@ type errorInfo struct { } // map of http handlers for each error string. +// there is 10 kinds default error(40x and 50x) var ErrorMaps = make(map[string]*errorInfo, 10) // show 401 unauthorized error. From 2a96f33543a8a52902e2cfa64423d1998258611a Mon Sep 17 00:00:00 2001 From: JessonChan Date: Fri, 18 Sep 2015 10:36:16 +0800 Subject: [PATCH 233/436] more clean code --- beego.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/beego.go b/beego.go index 329e0713..7c0a7ca7 100644 --- a/beego.go +++ b/beego.go @@ -15,6 +15,7 @@ package beego import ( + "fmt" "os" "path/filepath" "strconv" @@ -45,14 +46,11 @@ func AddAPPStartHook(hf hookfunc) { func Run(params ...string) { initBeforeHTTPRun() - if len(params) > 0 && params[0] != "" { - strs := strings.Split(params[0], ":") - if len(strs) > 0 && strs[0] != "" { - HTTPAddr = strs[0] - } - if len(strs) > 1 && strs[1] != "" { - HTTPPort, _ = strconv.Atoi(strs[1]) - } + params = append(params, fmt.Sprintf("%s:%d", HTTPAddr, HTTPPort)) + addr := strings.Split(params[0], ":") + if len(addr) == 2 { + HTTPAddr = addr[0] + HTTPPort, _ = strconv.Atoi(addr[1]) } BeeApp.Run() From fda28fa2ff4617b918438de4c45e4e53dcfec7ad Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 18 Sep 2015 12:11:48 +0800 Subject: [PATCH 234/436] fix the conv test case --- cache/conv_test.go | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/cache/conv_test.go b/cache/conv_test.go index c87ffe84..cf792fa6 100644 --- a/cache/conv_test.go +++ b/cache/conv_test.go @@ -130,21 +130,6 @@ func TestGetBool(t *testing.T) { } } -func TestGetByteArray(t *testing.T) { - var b = []byte("test") - var t1 = []byte("test") - if !byteArrayEquals(b, getByteArray(t1)) { - t.Error("get byte array from byte array error") - } - var t2 = "test" - if !byteArrayEquals(b, getByteArray(t2)) { - t.Error("get byte array from string error") - } - if nil != getByteArray(nil) { - t.Error("get byte array from nil error") - } -} - func byteArrayEquals(a []byte, b []byte) bool { if len(a) != len(b) { return false From cb0400dcd463806055b51199ddbee316a9461925 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 18 Sep 2015 12:12:02 +0800 Subject: [PATCH 235/436] file add the config for Perm --- logs/file.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/logs/file.go b/logs/file.go index f201caf9..9596258c 100644 --- a/logs/file.go +++ b/logs/file.go @@ -53,6 +53,8 @@ type fileLogWriter struct { startLock sync.Mutex // Only one log can write to the file Level int `json:"level"` + + Perm os.FileMode `json:"perm"` } // MuxWriter is an *os.File writer with locker. @@ -86,6 +88,7 @@ func newFileWriter() Logger { Maxdays: 7, Rotate: true, Level: LevelTrace, + Perm: 0660, } // use MuxWriter instead direct use os.File for lock write when rotate w.mw = new(MuxWriter) @@ -102,7 +105,8 @@ func newFileWriter() Logger { // "maxsize":1<<30, // "daily":true, // "maxdays":15, -// "rotate":true +// "rotate":true, +// "perm":0600 // } func (w *fileLogWriter) Init(jsonconfig string) error { err := json.Unmarshal([]byte(jsonconfig), w) @@ -154,7 +158,7 @@ func (w *fileLogWriter) WriteMsg(msg string, level int) error { func (w *fileLogWriter) createLogFile() (*os.File, error) { // Open the log file - fd, err := os.OpenFile(w.Filename, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0660) + fd, err := os.OpenFile(w.Filename, os.O_WRONLY|os.O_APPEND|os.O_CREATE, w.Perm) return fd, err } From cc5abc6b306ec035316c266a6484fb7725cbec32 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Fri, 18 Sep 2015 17:03:00 +0800 Subject: [PATCH 236/436] default atoi func to handle exception --- error.go | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/error.go b/error.go index 1e047234..435c5d77 100644 --- a/error.go +++ b/error.go @@ -391,19 +391,22 @@ func ErrorController(c ControllerInterface) *App { // show error string as simple text message. // if error string is empty, show 503 or 500 error as default. func exception(errCode string, ctx *context.Context) { - for _, ec := range []string{errCode, "503", "500"} { - code, _ := strconv.Atoi(ec) - if code == 0 { - code = 503 + atoi := func(code string) int { + v, err := strconv.Atoi(code) + if err == nil { + return v } + return 503 + } + + for _, ec := range []string{errCode, "503", "500"} { if h, ok := ErrorMaps[ec]; ok { - executeError(h, ctx, code) + executeError(h, ctx, atoi(ec)) return } } //if 50x error has been removed from errorMap - //set 503 as default - ctx.ResponseWriter.WriteHeader(503) + ctx.ResponseWriter.WriteHeader(atoi(errCode)) ctx.WriteString(errCode) } From 0ac690d2c87496a18b4354972d68ac41e6865b69 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Fri, 18 Sep 2015 17:59:28 +0800 Subject: [PATCH 237/436] method name refactor --- error.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/error.go b/error.go index 435c5d77..2a1a861d 100644 --- a/error.go +++ b/error.go @@ -376,13 +376,14 @@ func ErrorController(c ControllerInterface) *App { rt := reflectVal.Type() ct := reflect.Indirect(reflectVal).Type() for i := 0; i < rt.NumMethod(); i++ { - if !utils.InSlice(rt.Method(i).Name, exceptMethod) && strings.HasPrefix(rt.Method(i).Name, "Error") { + methodName := rt.Method(i).Name + if !utils.InSlice(methodName, exceptMethod) && strings.HasPrefix(methodName, "Error") { errinfo := &errorInfo{} errinfo.errorType = errorTypeController errinfo.controllerType = ct - errinfo.method = rt.Method(i).Name - errname := strings.TrimPrefix(rt.Method(i).Name, "Error") - ErrorMaps[errname] = errinfo + errinfo.method = methodName + errName := strings.TrimPrefix(methodName, "Error") + ErrorMaps[errName] = errinfo } } return BeeApp From 40cb8e0cf14546c20418a65b2a1a290ac22229d0 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Fri, 18 Sep 2015 18:18:12 +0800 Subject: [PATCH 238/436] use reflect to ensure all methods been except --- router.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/router.go b/router.go index efb1a1f3..57addd4e 100644 --- a/router.go +++ b/router.go @@ -63,13 +63,14 @@ var ( "CONNECT": "CONNECT", } // these beego.Controller's methods shouldn't reflect to AutoRouter - exceptMethod = []string{"Init", "Prepare", "Finish", "Render", "RenderString", - "RenderBytes", "Redirect", "Abort", "StopRun", "UrlFor", "ServeJson", "ServeJsonp", - "ServeXml", "Input", "ParseForm", "GetString", "GetStrings", "GetInt", "GetBool", - "GetFloat", "GetFile", "SaveToFile", "StartSession", "SetSession", "GetSession", - "DelSession", "SessionRegenerateID", "DestroySession", "IsAjax", "GetSecureCookie", - "SetSecureCookie", "XsrfToken", "CheckXsrfCookie", "XsrfFormHtml", - "GetControllerAndAction"} + exceptMethod = func() []string { + methods := []string{} + rv := reflect.TypeOf(&Controller{}) + for i := 0; i < rv.NumMethod(); i++ { + methods = append(methods, rv.Method(i).Name) + } + return methods + }() urlPlaceholder = "{{placeholder}}" // DefaultAccessLogFilter will skip the accesslog if return true From 56032c67af2c343a04904d0bcc5f0bcc7c9d7422 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Fri, 18 Sep 2015 18:31:06 +0800 Subject: [PATCH 239/436] runFunction camel name --- router.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/router.go b/router.go index 57addd4e..d2f9a4b5 100644 --- a/router.go +++ b/router.go @@ -109,7 +109,7 @@ type controllerInfo struct { controllerType reflect.Type methods map[string]string handler http.Handler - runfunction FilterFunc + runFunction FilterFunc routerType int } @@ -325,7 +325,7 @@ func (p *ControllerRegister) AddMethod(method, pattern string, f FilterFunc) { route := &controllerInfo{} route.pattern = pattern route.routerType = routerTypeRESTFul - route.runfunction = f + route.runFunction = f methods := make(map[string]string) if method == "*" { for _, val := range HTTPMETHOD { @@ -726,7 +726,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) if routerInfo.routerType == routerTypeRESTFul { if _, ok := routerInfo.methods[r.Method]; ok { isRunable = true - routerInfo.runfunction(context) + routerInfo.runFunction(context) } else { exception("405", context) goto Admin From 983bac986a2eaff63b6910cef811048651337f6f Mon Sep 17 00:00:00 2001 From: JessonChan Date: Fri, 18 Sep 2015 18:34:07 +0800 Subject: [PATCH 240/436] runFunction camel name --- router.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/router.go b/router.go index d2f9a4b5..4f9d07e0 100644 --- a/router.go +++ b/router.go @@ -109,7 +109,7 @@ type controllerInfo struct { controllerType reflect.Type methods map[string]string handler http.Handler - runFunction FilterFunc + runFunction FilterFunc routerType int } From caf37144950796dd0ff924dff96e69077e15aacc Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sat, 19 Sep 2015 05:41:10 +0800 Subject: [PATCH 241/436] revert exceptMethod --- router.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/router.go b/router.go index 4f9d07e0..c0a50988 100644 --- a/router.go +++ b/router.go @@ -63,14 +63,13 @@ var ( "CONNECT": "CONNECT", } // these beego.Controller's methods shouldn't reflect to AutoRouter - exceptMethod = func() []string { - methods := []string{} - rv := reflect.TypeOf(&Controller{}) - for i := 0; i < rv.NumMethod(); i++ { - methods = append(methods, rv.Method(i).Name) - } - return methods - }() + exceptMethod = []string{"Init", "Prepare", "Finish", "Render", "RenderString", + "RenderBytes", "Redirect", "Abort", "StopRun", "UrlFor", "ServeJson", "ServeJsonp", + "ServeXml", "Input", "ParseForm", "GetString", "GetStrings", "GetInt", "GetBool", + "GetFloat", "GetFile", "SaveToFile", "StartSession", "SetSession", "GetSession", + "DelSession", "SessionRegenerateID", "DestroySession", "IsAjax", "GetSecureCookie", + "SetSecureCookie", "XsrfToken", "CheckXsrfCookie", "XsrfFormHtml", + "GetControllerAndAction"} urlPlaceholder = "{{placeholder}}" // DefaultAccessLogFilter will skip the accesslog if return true From 69bee9ef3c94f901b84b643cb1b1bf785954fa6d Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sat, 19 Sep 2015 05:52:52 +0800 Subject: [PATCH 242/436] // beego.Run("localhost") --- beego.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/beego.go b/beego.go index 7c0a7ca7..bcbf0496 100644 --- a/beego.go +++ b/beego.go @@ -15,11 +15,11 @@ package beego import ( - "fmt" "os" "path/filepath" "strconv" "strings" + "net/http" ) // beego web framework version. @@ -41,16 +41,20 @@ func AddAPPStartHook(hf hookfunc) { // Run beego application. // beego.Run() default run on HttpPort +// beego.Run("localhost") // beego.Run(":8089") // beego.Run("127.0.0.1:8089") func Run(params ...string) { initBeforeHTTPRun() - params = append(params, fmt.Sprintf("%s:%d", HTTPAddr, HTTPPort)) - addr := strings.Split(params[0], ":") - if len(addr) == 2 { - HTTPAddr = addr[0] - HTTPPort, _ = strconv.Atoi(addr[1]) + if len(params) > 0 && params[0] != "" { + strs := strings.Split(params[0], ":") + if len(strs) > 0 && strs[0] != "" { + HTTPAddr = strs[0] + } + if len(strs) > 1 && strs[1] != "" { + HTTPPort, _ = strconv.Atoi(strs[1]) + } } BeeApp.Run() From 07a424581db160732347b33f0b65cd1dfd9d9b40 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sat, 19 Sep 2015 05:53:28 +0800 Subject: [PATCH 243/436] // beego.Run("localhost") --- beego.go | 1 - 1 file changed, 1 deletion(-) diff --git a/beego.go b/beego.go index bcbf0496..6c964d5a 100644 --- a/beego.go +++ b/beego.go @@ -19,7 +19,6 @@ import ( "path/filepath" "strconv" "strings" - "net/http" ) // beego web framework version. From e26720496fedc0540f4c982e13137e46c5ea9bb8 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sat, 19 Sep 2015 20:05:57 +0800 Subject: [PATCH 244/436] remove the dupl --- admin.go | 126 +++++++++++++++---------------------------------------- 1 file changed, 33 insertions(+), 93 deletions(-) diff --git a/admin.go b/admin.go index 93087e12..fa4b1db0 100644 --- a/admin.go +++ b/admin.go @@ -65,24 +65,15 @@ func init() { // AdminIndex is the default http.Handler for admin module. // it matches url pattern "/". func adminIndex(rw http.ResponseWriter, r *http.Request) { - tmpl := template.Must(template.New("dashboard").Parse(dashboardTpl)) - tmpl = template.Must(tmpl.Parse(indexTpl)) - tmpl = template.Must(tmpl.Parse(defaultScriptsTpl)) - data := make(map[interface{}]interface{}) - tmpl.Execute(rw, data) + execTpl(rw, map[interface{}]interface{}{}, indexTpl, defaultScriptsTpl) } // QpsIndex is the http.Handler for writing qbs statistics map result info in http.ResponseWriter. // it's registered with url pattern "/qbs" in admin module. func qpsIndex(rw http.ResponseWriter, r *http.Request) { - tmpl := template.Must(template.New("dashboard").Parse(dashboardTpl)) - tmpl = template.Must(tmpl.Parse(qpsTpl)) - tmpl = template.Must(tmpl.Parse(defaultScriptsTpl)) data := make(map[interface{}]interface{}) data["Content"] = toolbox.StatisticsMap.GetMap() - - tmpl.Execute(rw, data) - + execTpl(rw, data, qpsTpl, defaultScriptsTpl) } // ListConf is the http.Handler of displaying all beego configuration values as key/value pair. @@ -167,11 +158,7 @@ func listConf(rw http.ResponseWriter, r *http.Request) { content["Methods"] = methods data["Content"] = content data["Title"] = "Routers" - - tmpl := template.Must(template.New("dashboard").Parse(dashboardTpl)) - tmpl = template.Must(tmpl.Parse(routerAndFilterTpl)) - tmpl = template.Must(tmpl.Parse(defaultScriptsTpl)) - tmpl.Execute(rw, data) + execTpl(rw, data, routerAndFilterTpl, defaultScriptsTpl) case "filter": content := make(map[string]interface{}) @@ -186,65 +173,25 @@ func listConf(rw http.ResponseWriter, r *http.Request) { if BeeApp.Handlers.enableFilter { var filterType string - - if bf, ok := BeeApp.Handlers.filters[BeforeRouter]; ok { - filterType = "Before Router" - filterTypes = append(filterTypes, filterType) - resultList := new([][]string) - for _, f := range bf { - - var result = []string{ - fmt.Sprintf("%s", f.pattern), - fmt.Sprintf("%s", utils.GetFuncName(f.filterFunc)), + for k, fr := range map[int]string{ + BeforeStatic: "Before Static", + BeforeRouter: "Before Router", + BeforeExec: "Before Exec", + AfterExec: "After Exec", + FinishRouter: "Finish Router"} { + if bf, ok := BeeApp.Handlers.filters[k]; ok { + filterType = fr + filterTypes = append(filterTypes, filterType) + resultList := new([][]string) + for _, f := range bf { + var result = []string{ + fmt.Sprintf("%s", f.pattern), + fmt.Sprintf("%s", utils.GetFuncName(f.filterFunc)), + } + *resultList = append(*resultList, result) } - *resultList = append(*resultList, result) + filterTypeData[filterType] = resultList } - filterTypeData[filterType] = resultList - } - - if bf, ok := BeeApp.Handlers.filters[BeforeExec]; ok { - filterType = "Before Exec" - filterTypes = append(filterTypes, filterType) - resultList := new([][]string) - for _, f := range bf { - - var result = []string{ - fmt.Sprintf("%s", f.pattern), - fmt.Sprintf("%s", utils.GetFuncName(f.filterFunc)), - } - *resultList = append(*resultList, result) - } - filterTypeData[filterType] = resultList - } - - if bf, ok := BeeApp.Handlers.filters[AfterExec]; ok { - filterType = "After Exec" - filterTypes = append(filterTypes, filterType) - resultList := new([][]string) - for _, f := range bf { - - var result = []string{ - fmt.Sprintf("%s", f.pattern), - fmt.Sprintf("%s", utils.GetFuncName(f.filterFunc)), - } - *resultList = append(*resultList, result) - } - filterTypeData[filterType] = resultList - } - - if bf, ok := BeeApp.Handlers.filters[FinishRouter]; ok { - filterType = "Finish Router" - filterTypes = append(filterTypes, filterType) - resultList := new([][]string) - for _, f := range bf { - - var result = []string{ - fmt.Sprintf("%s", f.pattern), - fmt.Sprintf("%s", utils.GetFuncName(f.filterFunc)), - } - *resultList = append(*resultList, result) - } - filterTypeData[filterType] = resultList } } @@ -253,11 +200,7 @@ func listConf(rw http.ResponseWriter, r *http.Request) { data["Content"] = content data["Title"] = "Filters" - tmpl := template.Must(template.New("dashboard").Parse(dashboardTpl)) - tmpl = template.Must(tmpl.Parse(routerAndFilterTpl)) - tmpl = template.Must(tmpl.Parse(defaultScriptsTpl)) - tmpl.Execute(rw, data) - + execTpl(rw, data, routerAndFilterTpl, defaultScriptsTpl) default: rw.Write([]byte("command not support")) } @@ -306,7 +249,7 @@ func profIndex(rw http.ResponseWriter, r *http.Request) { r.ParseForm() command := r.Form.Get("command") format := r.Form.Get("format") - data := make(map[string]interface{}) + data := make(map[interface{}]interface{}) var result bytes.Buffer if command != "" { @@ -326,15 +269,11 @@ func profIndex(rw http.ResponseWriter, r *http.Request) { } data["Title"] = command - tmpl := template.Must(template.New("dashboard").Parse(dashboardTpl)) - tmpl = template.Must(tmpl.Parse(profillingTpl)) + defaultTpl := defaultScriptsTpl if command == "gc summary" { - tmpl = template.Must(tmpl.Parse(gcAjaxTpl)) - } else { - - tmpl = template.Must(tmpl.Parse(defaultScriptsTpl)) + defaultTpl = gcAjaxTpl } - tmpl.Execute(rw, data) + execTpl(rw, data, profillingTpl, defaultTpl) } } @@ -376,11 +315,7 @@ func healthcheck(rw http.ResponseWriter, req *http.Request) { content["Data"] = resultList data["Content"] = content data["Title"] = "Health Check" - tmpl := template.Must(template.New("dashboard").Parse(dashboardTpl)) - tmpl = template.Must(tmpl.Parse(healthCheckTpl)) - tmpl = template.Must(tmpl.Parse(defaultScriptsTpl)) - tmpl.Execute(rw, data) - + execTpl(rw, data, healthCheckTpl, defaultScriptsTpl) } // TaskStatus is a http.Handler with running task status (task name, status and the last execution). @@ -429,9 +364,14 @@ func taskStatus(rw http.ResponseWriter, req *http.Request) { content["Data"] = resultList data["Content"] = content data["Title"] = "Tasks" + execTpl(rw, data, tasksTpl, defaultScriptsTpl) +} + +func execTpl(rw http.ResponseWriter, data map[interface{}]interface{}, tpls ...string) { tmpl := template.Must(template.New("dashboard").Parse(dashboardTpl)) - tmpl = template.Must(tmpl.Parse(tasksTpl)) - tmpl = template.Must(tmpl.Parse(defaultScriptsTpl)) + for _, tpl := range tpls { + tmpl = template.Must(tmpl.Parse(tpl)) + } tmpl.Execute(rw, data) } From eb85e8e32897f70c55af6c8c3070139488524160 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 20 Sep 2015 19:59:30 +0800 Subject: [PATCH 245/436] path.Clean can't clean window separate .." " --- staticfile.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/staticfile.go b/staticfile.go index c85f17e0..1ce9e561 100644 --- a/staticfile.go +++ b/staticfile.go @@ -18,6 +18,7 @@ import ( "net/http" "os" "path" + "path/filepath" "strconv" "strings" @@ -29,7 +30,7 @@ func serverStaticRouter(ctx *context.Context) { if ctx.Input.Method() != "GET" && ctx.Input.Method() != "HEAD" { return } - requestPath := path.Clean(ctx.Input.Request.URL.Path) + requestPath := filepath.Clean(ctx.Input.Request.URL.Path) i := 0 for prefix, staticDir := range StaticDir { if len(prefix) == 0 { From 95ef4c7136d3a02d183d22e964cbc41a74ee37cd Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 21 Sep 2015 23:56:24 +0800 Subject: [PATCH 246/436] server index.html in beego with ServeContent --- staticfile.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/staticfile.go b/staticfile.go index 1ce9e561..fa8a56d4 100644 --- a/staticfile.go +++ b/staticfile.go @@ -74,7 +74,15 @@ func serverStaticRouter(ctx *context.Context) { } else if strings.HasSuffix(requestPath, "/index.html") { file := path.Join(staticDir, requestPath) if utils.FileExists(file) { - http.ServeFile(ctx.ResponseWriter, ctx.Request, file) + oFile, err := os.Open(file) + if err != nil { + if RunMode == "dev" { + Warn("Can't open the file:", file, err) + } + http.NotFound(ctx.ResponseWriter, ctx.Request) + } + defer oFile.Close() + http.ServeContent(ctx.ResponseWriter, ctx.Request, file, finfo.ModTime(), oFile) return } } From b9fb3a62f56f910292c566609bf1453628798662 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 22 Sep 2015 11:59:48 +0800 Subject: [PATCH 247/436] static file name default lower case --- config.go | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/config.go b/config.go index 6f87fed1..4751b7e4 100644 --- a/config.go +++ b/config.go @@ -523,18 +523,16 @@ func ParseConfig() (err error) { if sgz := AppConfig.String("StaticExtensionsToGzip"); sgz != "" { extensions := strings.Split(sgz, ",") - if len(extensions) > 0 { - StaticExtensionsToGzip = []string{} - for _, ext := range extensions { - if len(ext) == 0 { - continue - } - extWithDot := ext - if extWithDot[:1] != "." { - extWithDot = "." + extWithDot - } - StaticExtensionsToGzip = append(StaticExtensionsToGzip, extWithDot) + for _, ext := range extensions { + ext = strings.TrimSpace(ext) + if ext == "" { + continue } + ext = strings.ToLower(ext) + if !strings.HasPrefix(ext, ".") { + ext = "." + ext + } + StaticExtensionsToGzip = append(StaticExtensionsToGzip, ext) } } From dc38b324e0522b9053b25eb37bb02e9a1fcb3841 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 22 Sep 2015 12:19:31 +0800 Subject: [PATCH 248/436] code bug fixed --- staticfile.go | 112 ++++++++++++++++++++++++++++---------------------- 1 file changed, 62 insertions(+), 50 deletions(-) diff --git a/staticfile.go b/staticfile.go index fa8a56d4..18b44234 100644 --- a/staticfile.go +++ b/staticfile.go @@ -31,98 +31,110 @@ func serverStaticRouter(ctx *context.Context) { return } requestPath := filepath.Clean(ctx.Input.Request.URL.Path) - i := 0 - for prefix, staticDir := range StaticDir { - if len(prefix) == 0 { - continue + + // special processing : favicon.ico/robots.txt can be in any static dir + if requestPath == "/favicon.ico" || requestPath == "/robots.txt" { + + if utils.FileExists("./" + requestPath) { + http.ServeFile(ctx.ResponseWriter, ctx.Request, "./"+requestPath) + return } - if requestPath == "/favicon.ico" || requestPath == "/robots.txt" { + + for _, staticDir := range StaticDir { file := path.Join(staticDir, requestPath) if utils.FileExists(file) { http.ServeFile(ctx.ResponseWriter, ctx.Request, file) return } - i++ - if i == len(StaticDir) { - http.NotFound(ctx.ResponseWriter, ctx.Request) - return - } + } + + http.NotFound(ctx.ResponseWriter, ctx.Request) + return + } + + for prefix, staticDir := range StaticDir { + if len(prefix) == 0 { continue } if strings.HasPrefix(requestPath, prefix) { if len(requestPath) > len(prefix) && requestPath[len(prefix)] != '/' { continue } - file := path.Join(staticDir, requestPath[len(prefix):]) - finfo, err := os.Stat(file) + filePath := path.Join(staticDir, requestPath[len(prefix):]) + fileInfo, err := os.Stat(filePath) if err != nil { if RunMode == "dev" { - Warn("Can't find the file:", file, err) + Warn("Can't find the file:", filePath, err) } http.NotFound(ctx.ResponseWriter, ctx.Request) return } //if the request is dir and DirectoryIndex is false then - if finfo.IsDir() { + if fileInfo.IsDir() { if !DirectoryIndex { exception("403", ctx) return - } else if ctx.Input.Request.URL.Path[len(ctx.Input.Request.URL.Path)-1] != '/' { + } + if ctx.Input.Request.URL.Path[len(ctx.Input.Request.URL.Path)-1] != '/' { http.Redirect(ctx.ResponseWriter, ctx.Request, ctx.Input.Request.URL.Path+"/", 302) return } - } else if strings.HasSuffix(requestPath, "/index.html") { - file := path.Join(staticDir, requestPath) - if utils.FileExists(file) { - oFile, err := os.Open(file) + } + + if strings.HasSuffix(requestPath, "/index.html") { + if utils.FileExists(filePath) { + fileReader, err := os.Open(filePath) if err != nil { if RunMode == "dev" { - Warn("Can't open the file:", file, err) + Warn("Can't open the file:", filePath, err) } http.NotFound(ctx.ResponseWriter, ctx.Request) + return } - defer oFile.Close() - http.ServeContent(ctx.ResponseWriter, ctx.Request, file, finfo.ModTime(), oFile) + defer fileReader.Close() + http.ServeContent(ctx.ResponseWriter, ctx.Request, filePath, fileInfo.ModTime(), fileReader) return } } - //This block obtained from (https://github.com/smithfox/beego) - it should probably get merged into astaxie/beego after a pull request isStaticFileToCompress := false - if StaticExtensionsToGzip != nil && len(StaticExtensionsToGzip) > 0 { - for _, statExtension := range StaticExtensionsToGzip { - if strings.HasSuffix(strings.ToLower(file), strings.ToLower(statExtension)) { - isStaticFileToCompress = true - break - } + lowerFileName := strings.ToLower(filePath) + for _, statExtension := range StaticExtensionsToGzip { + if strings.HasSuffix(lowerFileName, statExtension) { + isStaticFileToCompress = true + break } } - if isStaticFileToCompress { - var contentEncoding string - if EnableGzip { - contentEncoding = getAcceptEncodingZip(ctx.Request) + if !isStaticFileToCompress { + http.ServeFile(ctx.ResponseWriter, ctx.Request, filePath) + return + } + + //to compress file + var contentEncoding string + if EnableGzip { + contentEncoding = getAcceptEncodingZip(ctx.Request) + } + + memZipFile, err := openMemZipFile(filePath, contentEncoding) + if err != nil { + if RunMode == "dev" { + Warn("Can't compress the file:", filePath, err) } + http.NotFound(ctx.ResponseWriter, ctx.Request) + return + } - memzipfile, err := openMemZipFile(file, contentEncoding) - if err != nil { - return - } - - if contentEncoding == "gzip" { - ctx.Output.Header("Content-Encoding", "gzip") - } else if contentEncoding == "deflate" { - ctx.Output.Header("Content-Encoding", "deflate") - } else { - ctx.Output.Header("Content-Length", strconv.FormatInt(finfo.Size(), 10)) - } - - http.ServeContent(ctx.ResponseWriter, ctx.Request, file, finfo.ModTime(), memzipfile) - + if contentEncoding == "gzip" { + ctx.Output.Header("Content-Encoding", "gzip") + } else if contentEncoding == "deflate" { + ctx.Output.Header("Content-Encoding", "deflate") } else { - http.ServeFile(ctx.ResponseWriter, ctx.Request, file) + ctx.Output.Header("Content-Length", strconv.FormatInt(fileInfo.Size(), 10)) } - return + + http.ServeContent(ctx.ResponseWriter, ctx.Request, filePath, fileInfo.ModTime(), memZipFile) } } } From f708ce0299f0082faf8a8f275d122321f7cf4f25 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 22 Sep 2015 12:24:52 +0800 Subject: [PATCH 249/436] =?UTF-8?q?=E5=BD=93=E6=9C=89=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=9A=84=E5=8E=8B=E7=BC=A9=E7=B1=BB=E5=9E=8B=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=B8=A2=E5=BC=83=E9=BB=98=E8=AE=A4=E7=B1=BB=E5=9E=8B(css,js)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.go | 1 + 1 file changed, 1 insertion(+) diff --git a/config.go b/config.go index 4751b7e4..c79437b1 100644 --- a/config.go +++ b/config.go @@ -523,6 +523,7 @@ func ParseConfig() (err error) { if sgz := AppConfig.String("StaticExtensionsToGzip"); sgz != "" { extensions := strings.Split(sgz, ",") + StaticExtensionsToGzip = []string{} for _, ext := range extensions { ext = strings.TrimSpace(ext) if ext == "" { From 936cb735e18e42428d86ad0fdaf36d62cfe527d4 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 22 Sep 2015 13:27:35 +0800 Subject: [PATCH 250/436] file extensions bug fixed --- config.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/config.go b/config.go index c79437b1..c2f23f67 100644 --- a/config.go +++ b/config.go @@ -523,7 +523,7 @@ func ParseConfig() (err error) { if sgz := AppConfig.String("StaticExtensionsToGzip"); sgz != "" { extensions := strings.Split(sgz, ",") - StaticExtensionsToGzip = []string{} + fileExts := []string{} for _, ext := range extensions { ext = strings.TrimSpace(ext) if ext == "" { @@ -533,7 +533,10 @@ func ParseConfig() (err error) { if !strings.HasPrefix(ext, ".") { ext = "." + ext } - StaticExtensionsToGzip = append(StaticExtensionsToGzip, ext) + fileExts = append(fileExts, ext) + } + if len(fileExts) > 0 { + StaticExtensionsToGzip = fileExts } } From 4995f9154780cf2690838658f4c84fa93934af35 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 22 Sep 2015 13:46:20 +0800 Subject: [PATCH 251/436] code refactor --- staticfile.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/staticfile.go b/staticfile.go index 18b44234..5822882d 100644 --- a/staticfile.go +++ b/staticfile.go @@ -34,9 +34,9 @@ func serverStaticRouter(ctx *context.Context) { // special processing : favicon.ico/robots.txt can be in any static dir if requestPath == "/favicon.ico" || requestPath == "/robots.txt" { - - if utils.FileExists("./" + requestPath) { - http.ServeFile(ctx.ResponseWriter, ctx.Request, "./"+requestPath) + file := path.Join(".", requestPath) + if utils.FileExists(file) { + http.ServeFile(ctx.ResponseWriter, ctx.Request, file) return } From 9c17f73489316dde49f037206273d63f6ff0b916 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 22 Sep 2015 13:48:34 +0800 Subject: [PATCH 252/436] code refactor --- staticfile.go | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/staticfile.go b/staticfile.go index 5822882d..1c9d775a 100644 --- a/staticfile.go +++ b/staticfile.go @@ -82,19 +82,17 @@ func serverStaticRouter(ctx *context.Context) { } if strings.HasSuffix(requestPath, "/index.html") { - if utils.FileExists(filePath) { - fileReader, err := os.Open(filePath) - if err != nil { - if RunMode == "dev" { - Warn("Can't open the file:", filePath, err) - } - http.NotFound(ctx.ResponseWriter, ctx.Request) - return + fileReader, err := os.Open(filePath) + if err != nil { + if RunMode == "dev" { + Warn("Can't open the file:", filePath, err) } - defer fileReader.Close() - http.ServeContent(ctx.ResponseWriter, ctx.Request, filePath, fileInfo.ModTime(), fileReader) + http.NotFound(ctx.ResponseWriter, ctx.Request) return } + defer fileReader.Close() + http.ServeContent(ctx.ResponseWriter, ctx.Request, filePath, fileInfo.ModTime(), fileReader) + return } isStaticFileToCompress := false From 6ad215a9bba3b95f8b2137d132d1e5a955937ef6 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 22 Sep 2015 14:11:02 +0800 Subject: [PATCH 253/436] mem zip file var refactor --- memzipfile.go | 58 +++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/memzipfile.go b/memzipfile.go index 0fff44b6..594f1060 100644 --- a/memzipfile.go +++ b/memzipfile.go @@ -29,72 +29,72 @@ import ( ) var ( - gmfim = make(map[string]*memFileInfo) - lock sync.RWMutex + menFileInfoMap = make(map[string]*memFileInfo) + lock sync.RWMutex ) -// OpenMemZipFile returns MemFile object with a compressed static file. +// openMemZipFile returns MemFile object with a compressed static file. // it's used for serve static file if gzip enable. func openMemZipFile(path string, zip string) (*memFile, error) { - osfile, e := os.Open(path) + osFile, e := os.Open(path) if e != nil { return nil, e } - defer osfile.Close() + defer osFile.Close() - osfileinfo, e := osfile.Stat() + osFileInfo, e := osFile.Stat() if e != nil { return nil, e } - modtime := osfileinfo.ModTime() - fileSize := osfileinfo.Size() + modTime := osFileInfo.ModTime() + fileSize := osFileInfo.Size() lock.RLock() - cfi, ok := gmfim[zip+":"+path] + cfi, ok := menFileInfoMap[zip+":"+path] lock.RUnlock() - if !(ok && cfi.ModTime() == modtime && cfi.fileSize == fileSize) { + if !(ok && cfi.ModTime() == modTime && cfi.fileSize == fileSize) { var content []byte if zip == "gzip" { - var zipbuf bytes.Buffer - gzipwriter, e := gzip.NewWriterLevel(&zipbuf, gzip.BestCompression) + var zipBuf bytes.Buffer + gzipWriter, e := gzip.NewWriterLevel(&zipBuf, gzip.BestCompression) if e != nil { return nil, e } - _, e = io.Copy(gzipwriter, osfile) - gzipwriter.Close() + _, e = io.Copy(gzipWriter, osFile) + gzipWriter.Close() if e != nil { return nil, e } - content, e = ioutil.ReadAll(&zipbuf) + content, e = ioutil.ReadAll(&zipBuf) if e != nil { return nil, e } } else if zip == "deflate" { - var zipbuf bytes.Buffer - deflatewriter, e := flate.NewWriter(&zipbuf, flate.BestCompression) + var zipBuf bytes.Buffer + deflateWriter, e := flate.NewWriter(&zipBuf, flate.BestCompression) if e != nil { return nil, e } - _, e = io.Copy(deflatewriter, osfile) - deflatewriter.Close() + _, e = io.Copy(deflateWriter, osFile) + deflateWriter.Close() if e != nil { return nil, e } - content, e = ioutil.ReadAll(&zipbuf) + content, e = ioutil.ReadAll(&zipBuf) if e != nil { return nil, e } } else { - content, e = ioutil.ReadAll(osfile) + content, e = ioutil.ReadAll(osFile) if e != nil { return nil, e } } - cfi = &memFileInfo{osfileinfo, modtime, content, int64(len(content)), fileSize} + cfi = &memFileInfo{osFileInfo, modTime, content, int64(len(content)), fileSize} lock.Lock() defer lock.Unlock() - gmfim[zip+":"+path] = cfi + menFileInfoMap[zip+":"+path] = cfi } return &memFile{fi: cfi, offset: 0}, nil } @@ -139,7 +139,7 @@ func (fi *memFileInfo) Sys() interface{} { return nil } -// MemFile contains MemFileInfo and bytes offset when reading. +// memFile contains MemFileInfo and bytes offset when reading. // it implements io.Reader,io.ReadCloser and io.Seeker. type memFile struct { fi *memFileInfo @@ -198,7 +198,7 @@ func (f *memFile) Seek(offset int64, whence int) (ret int64, err error) { return f.offset, nil } -// GetAcceptEncodingZip returns accept encoding format in http header. +// getAcceptEncodingZip returns accept encoding format in http header. // zip is first, then deflate if both accepted. // If no accepted, return empty string. func getAcceptEncodingZip(r *http.Request) string { @@ -206,9 +206,9 @@ func getAcceptEncodingZip(r *http.Request) string { ss = strings.ToLower(ss) if strings.Contains(ss, "gzip") { return "gzip" - } else if strings.Contains(ss, "deflate") { - return "deflate" - } else { - return "" } + if strings.Contains(ss, "deflate") { + return "deflate" + } + return "" } From d4f3dfd5274d1b5d57f76486ec48003b95f622df Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 22 Sep 2015 14:15:41 +0800 Subject: [PATCH 254/436] return when find static path --- staticfile.go | 1 + 1 file changed, 1 insertion(+) diff --git a/staticfile.go b/staticfile.go index 1c9d775a..e1fc4f73 100644 --- a/staticfile.go +++ b/staticfile.go @@ -133,6 +133,7 @@ func serverStaticRouter(ctx *context.Context) { } http.ServeContent(ctx.ResponseWriter, ctx.Request, filePath, fileInfo.ModTime(), memZipFile) + return } } } From 1abf85ed2adb615f348ba2a11dfd7277df032f5c Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 22 Sep 2015 15:18:24 +0800 Subject: [PATCH 255/436] simplify the switch code --- context/output.go | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/context/output.go b/context/output.go index 743beb96..a4bb3d09 100644 --- a/context/output.go +++ b/context/output.go @@ -103,22 +103,10 @@ func (output *BeegoOutput) Cookie(name string, value string, others ...interface //fix cookie not work in IE if len(others) > 0 { switch v := others[0].(type) { - case int: + case int, int32, int64: if v > 0 { fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v)*time.Second).UTC().Format(time.RFC1123), v) - } else if v < 0 { - fmt.Fprintf(&b, "; Max-Age=0") - } - case int64: - if v > 0 { - fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v)*time.Second).UTC().Format(time.RFC1123), v) - } else if v < 0 { - fmt.Fprintf(&b, "; Max-Age=0") - } - case int32: - if v > 0 { - fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v)*time.Second).UTC().Format(time.RFC1123), v) - } else if v < 0 { + } else if v <= 0 { fmt.Fprintf(&b, "; Max-Age=0") } } From cfcce4f5dcdcd7167eaa93a88f113370c90519f1 Mon Sep 17 00:00:00 2001 From: Pelle Johnsen Date: Tue, 22 Sep 2015 12:23:51 +0200 Subject: [PATCH 256/436] Fix handling of rel(fk) to model with string pk --- orm/cmd_utils.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/orm/cmd_utils.go b/orm/cmd_utils.go index 5b40fd07..bddada7c 100644 --- a/orm/cmd_utils.go +++ b/orm/cmd_utils.go @@ -45,13 +45,14 @@ func getDbDropSQL(al *alias) (sqls []string) { func getColumnTyp(al *alias, fi *fieldInfo) (col string) { T := al.DbBaser.DbTypes() fieldType := fi.fieldType + fieldSize := fi.size checkColumn: switch fieldType { case TypeBooleanField: col = T["bool"] case TypeCharField: - col = fmt.Sprintf(T["string"], fi.size) + col = fmt.Sprintf(T["string"], fieldSize) case TypeTextField: col = T["string-text"] case TypeDateField: @@ -89,6 +90,7 @@ checkColumn: } case RelForeignKey, RelOneToOne: fieldType = fi.relModelInfo.fields.pk.fieldType + fieldSize = fi.relModelInfo.fields.pk.size goto checkColumn } From 1f2f0b30f482904991bc9fb872b1cab31ec26623 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 22 Sep 2015 22:02:56 +0800 Subject: [PATCH 257/436] mem zip file refactor and test --- memzipfile.go | 97 ++++++++++++++++++++++++++-------------------- memzipfile_test.go | 66 +++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 42 deletions(-) create mode 100644 memzipfile_test.go diff --git a/memzipfile.go b/memzipfile.go index 594f1060..1e5239f5 100644 --- a/memzipfile.go +++ b/memzipfile.go @@ -15,6 +15,7 @@ package beego import ( + "bufio" "bytes" "compress/flate" "compress/gzip" @@ -49,57 +50,26 @@ func openMemZipFile(path string, zip string) (*memFile, error) { modTime := osFileInfo.ModTime() fileSize := osFileInfo.Size() + mapKey := zip + ":" + path lock.RLock() - cfi, ok := menFileInfoMap[zip+":"+path] + cfi, ok := menFileInfoMap[mapKey] lock.RUnlock() if !(ok && cfi.ModTime() == modTime && cfi.fileSize == fileSize) { - var content []byte - if zip == "gzip" { - var zipBuf bytes.Buffer - gzipWriter, e := gzip.NewWriterLevel(&zipBuf, gzip.BestCompression) - if e != nil { - return nil, e - } - _, e = io.Copy(gzipWriter, osFile) - gzipWriter.Close() - if e != nil { - return nil, e - } - content, e = ioutil.ReadAll(&zipBuf) - if e != nil { - return nil, e - } - } else if zip == "deflate" { - var zipBuf bytes.Buffer - deflateWriter, e := flate.NewWriter(&zipBuf, flate.BestCompression) - if e != nil { - return nil, e - } - _, e = io.Copy(deflateWriter, osFile) - deflateWriter.Close() - if e != nil { - return nil, e - } - content, e = ioutil.ReadAll(&zipBuf) - if e != nil { - return nil, e - } - } else { - content, e = ioutil.ReadAll(osFile) - if e != nil { - return nil, e - } - } - - cfi = &memFileInfo{osFileInfo, modTime, content, int64(len(content)), fileSize} lock.Lock() defer lock.Unlock() - menFileInfoMap[zip+":"+path] = cfi + if cfi, ok = menFileInfoMap[mapKey]; !ok { + cfi, e = newMenFileInfo(osFile, osFileInfo, zip) + if e != nil { + return nil, e + } + menFileInfoMap[mapKey] = cfi + } } + return &memFile{fi: cfi, offset: 0}, nil } -// MemFileInfo contains a compressed file bytes and file information. +// memFileInfo contains a compressed file bytes and file information. // it implements os.FileInfo interface. type memFileInfo struct { os.FileInfo @@ -109,6 +79,49 @@ type memFileInfo struct { fileSize int64 } +// newMenFileInfo return a memFileInfo from file by zip type +func newMenFileInfo(file *os.File, fileInfo os.FileInfo, zip string) (*memFileInfo, error) { + var content []byte + var zipBuf bytes.Buffer + var fileWriter io.Writer + var err error + + switch zip { + case "gzip": + fileWriter, err = gzip.NewWriterLevel(&zipBuf, gzip.BestCompression) + case "deflate": + fileWriter, err = flate.NewWriter(&zipBuf, flate.BestCompression) + default: + fileWriter = bufio.NewWriter(&zipBuf) + } + if err != nil { + return nil, err + } + + _, err = io.Copy(fileWriter, file) + if err != nil { + return nil, err + } + + switch fileWriter.(type) { + case io.WriteCloser: + fileWriter.(io.WriteCloser).Close() + } + + content, err = ioutil.ReadAll(&zipBuf) + if err != nil { + return nil, err + } + + return &memFileInfo{ + FileInfo: fileInfo, + modTime: fileInfo.ModTime(), + content: content, + contentSize: int64(len(content)), + fileSize: fileInfo.Size(), + }, nil +} + // Name returns the compressed filename. func (fi *memFileInfo) Name() string { return fi.Name() diff --git a/memzipfile_test.go b/memzipfile_test.go new file mode 100644 index 00000000..a8c67ead --- /dev/null +++ b/memzipfile_test.go @@ -0,0 +1,66 @@ +package beego + +import ( + "bytes" + "compress/flate" + "compress/gzip" + "io" + "io/ioutil" + "os" + "testing" +) + +const licenseFile = "./LICENSE" + +func TestOpenMemZipFile_1(t *testing.T) { + mf, err := openMemZipFile(licenseFile, "") + if err != nil { + t.Fail() + } + file, _ := os.Open(licenseFile) + content, _ := ioutil.ReadAll(file) + assetMenFileAndContent(mf, content, t) +} + +func assetMenFileAndContent(mf *memFile, content []byte, t *testing.T) { + if mf.fi.contentSize != int64(len(content)) { + t.Log("content size not same") + t.Fail() + } + for i, v := range content { + if v != mf.fi.content[i] { + t.Log("content not same") + t.Fail() + } + } + if len(menFileInfoMap) == 0 { + t.Log("men map is empty") + t.Fail() + } +} +func TestOpenMemZipFile_2(t *testing.T) { + mf, err := openMemZipFile(licenseFile, "gzip") + if err != nil { + t.Fail() + } + file, _ := os.Open(licenseFile) + var zipBuf bytes.Buffer + fileWriter, _ := gzip.NewWriterLevel(&zipBuf, gzip.BestCompression) + io.Copy(fileWriter, file) + fileWriter.Close() + content, _ := ioutil.ReadAll(&zipBuf) + assetMenFileAndContent(mf, content, t) +} +func TestOpenMemZipFile_3(t *testing.T) { + mf, err := openMemZipFile(licenseFile, "deflate") + if err != nil { + t.Fail() + } + file, _ := os.Open(licenseFile) + var zipBuf bytes.Buffer + fileWriter, _ := flate.NewWriter(&zipBuf, flate.BestCompression) + io.Copy(fileWriter, file) + fileWriter.Close() + content, _ := ioutil.ReadAll(&zipBuf) + assetMenFileAndContent(mf, content, t) +} From 174e758d19cad49094aac236494c2b5d5aa5cb18 Mon Sep 17 00:00:00 2001 From: Pelle Johnsen Date: Mon, 28 Sep 2015 14:07:35 +0200 Subject: [PATCH 258/436] Fix dbBase.Update not returning error --- orm/db.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/orm/db.go b/orm/db.go index 2f2c52da..b62c165b 100644 --- a/orm/db.go +++ b/orm/db.go @@ -488,7 +488,8 @@ func (d *dbBase) Update(q dbQuerier, mi *modelInfo, ind reflect.Value, tz *time. d.ins.ReplaceMarks(&query) - if res, err := q.Exec(query, setValues...); err == nil { + res, err := q.Exec(query, setValues...) + if err == nil { return res.RowsAffected() } return 0, err From 4ba50e5df52c2b850a463d859542ec81808190db Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 12 Oct 2015 20:50:58 +0800 Subject: [PATCH 259/436] fix #1385 --- validation/validators.go | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/validation/validators.go b/validation/validators.go index ec1545fb..2662b701 100644 --- a/validation/validators.go +++ b/validation/validators.go @@ -74,6 +74,33 @@ func (r Required) IsSatisfied(obj interface{}) bool { if i, ok := obj.(int); ok { return i != 0 } + if i, ok := obj.(uint); ok { + return i != 0 + } + if i, ok := obj.(int8); ok { + return i != 0 + } + if i, ok := obj.(uint8); ok { + return i != 0 + } + if i, ok := obj.(int16); ok { + return i != 0 + } + if i, ok := obj.(uint16); ok { + return i != 0 + } + if i, ok := obj.(uint32); ok { + return i != 0 + } + if i, ok := obj.(int32); ok { + return i != 0 + } + if i, ok := obj.(int64); ok { + return i != 0 + } + if i, ok := obj.(uint64); ok { + return i != 0 + } if t, ok := obj.(time.Time); ok { return !t.IsZero() } From 912abe3272b513ff195e762f8297e751c9b33b73 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 12 Oct 2015 21:26:18 +0800 Subject: [PATCH 260/436] fix #1388 --- router.go | 2 +- router_test.go | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/router.go b/router.go index c0a50988..bb6bb786 100644 --- a/router.go +++ b/router.go @@ -353,7 +353,7 @@ func (p *ControllerRegister) Handler(pattern string, h http.Handler, options ... route.handler = h if len(options) > 0 { if _, ok := options[0].(bool); ok { - pattern = path.Join(pattern, "?:all") + pattern = path.Join(pattern, "?:all(.*)") } } for _, m := range HTTPMETHOD { diff --git a/router_test.go b/router_test.go index c6ec9c92..9598f99c 100644 --- a/router_test.go +++ b/router_test.go @@ -333,6 +333,18 @@ func TestRouterHandler(t *testing.T) { } } +func TestRouterHandlerAll(t *testing.T) { + r, _ := http.NewRequest("POST", "/sayhi/a/b/c", nil) + w := httptest.NewRecorder() + + handler := NewControllerRegister() + handler.Handler("/sayhi", http.HandlerFunc(sayhello), true) + handler.ServeHTTP(w, r) + if w.Body.String() != "sayhello" { + t.Errorf("TestRouterHandler can't run") + } +} + // // Benchmarks NewApp: // From 5d18a7466c0b08aa91930e4076d799769cb5471c Mon Sep 17 00:00:00 2001 From: Mikhail Devyatov Date: Tue, 27 Oct 2015 20:16:47 +0300 Subject: [PATCH 261/436] XSRFFormHtml() should also generate XSRF token. --- controller.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controller.go b/controller.go index 7fbf6dc5..0750daf4 100644 --- a/controller.go +++ b/controller.go @@ -647,8 +647,8 @@ func (c *Controller) CheckXSRFCookie() bool { // XSRFFormHTML writes an input field contains xsrf token value. func (c *Controller) XSRFFormHTML() string { - return "" + return `` } // GetControllerAndAction gets the executing controller name and action name. From f81929c28ca023d349f3f52a7d1b0b3cd810d89c Mon Sep 17 00:00:00 2001 From: shaoguang Date: Tue, 3 Nov 2015 14:53:26 +0800 Subject: [PATCH 262/436] bugfix: graceful failed when both enable http and https --- app.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app.go b/app.go index d10d436c..772fb172 100644 --- a/app.go +++ b/app.go @@ -89,6 +89,7 @@ func (app *App) Run() { } } else { if Graceful { + httpsAddr := addr app.Server.Addr = addr app.Server.Handler = app.Handlers app.Server.ReadTimeout = time.Duration(HTTPServerTimeOut) * time.Second @@ -97,11 +98,12 @@ func (app *App) Run() { go func() { time.Sleep(20 * time.Microsecond) if HTTPSPort != 0 { - addr = fmt.Sprintf("%s:%d", HTTPAddr, HTTPSPort) - app.Server.Addr = addr + httpsAddr = fmt.Sprintf("%s:%d", HTTPAddr, HTTPSPort) + app.Server.Addr = httpsAddr } - server := grace.NewServer(addr, app.Handlers) - server.Server = app.Server + server := grace.NewServer(httpsAddr, app.Handlers) + server.Server.ReadTimeout = app.Server.ReadTimeout + server.Server.WriteTimeout = app.Server.WriteTimeout err := server.ListenAndServeTLS(HTTPCertFile, HTTPKeyFile) if err != nil { BeeLogger.Critical("ListenAndServeTLS: ", err, fmt.Sprintf("%d", os.Getpid())) @@ -113,7 +115,8 @@ func (app *App) Run() { if EnableHTTPListen { go func() { server := grace.NewServer(addr, app.Handlers) - server.Server = app.Server + server.Server.ReadTimeout = app.Server.ReadTimeout + server.Server.WriteTimeout = app.Server.WriteTimeout if ListenTCP4 && HTTPAddr == "" { server.Network = "tcp4" } From 205de8418d43973faf54ef9d41ead6a5c9ba3513 Mon Sep 17 00:00:00 2001 From: John Deng Date: Tue, 3 Nov 2015 23:43:34 +0800 Subject: [PATCH 263/436] Fixed typos --- admin.go | 2 +- app.go | 2 +- config.go | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/admin.go b/admin.go index fa4b1db0..ddc936ef 100644 --- a/admin.go +++ b/admin.go @@ -107,7 +107,7 @@ func listConf(rw http.ResponseWriter, r *http.Request) { m["SessionGCMaxLifetime"] = SessionGCMaxLifetime m["SessionProviderConfig"] = SessionProviderConfig m["SessionCookieLifeTime"] = SessionCookieLifeTime - m["EnabelFcgi"] = EnabelFcgi + m["EnableFcgi"] = EnableFcgi m["MaxMemory"] = MaxMemory m["EnableGzip"] = EnableGzip m["DirectoryIndex"] = DirectoryIndex diff --git a/app.go b/app.go index d10d436c..019d6ff4 100644 --- a/app.go +++ b/app.go @@ -64,7 +64,7 @@ func (app *App) Run() { ) endRunning := make(chan bool, 1) - if EnabelFcgi { + if EnableFcgi { if EnableStdIo { err = fcgi.Serve(nil, app.Handlers) // standard I/O if err == nil { diff --git a/config.go b/config.go index 6f87fed1..d4a0f0e2 100644 --- a/config.go +++ b/config.go @@ -60,15 +60,15 @@ var ( EnableDocs bool // EnableErrorsShow wheather show errors in page. if true, show error and trace info in page rendered with error template. EnableErrorsShow bool - // EnabelFcgi turn on the fcgi Listen, default is false - EnabelFcgi bool + // EnableFcgi turn on the fcgi Listen, default is false + EnableFcgi bool // EnableGzip means gzip the response EnableGzip bool // EnableHTTPListen represent whether turn on the HTTP, default is true EnableHTTPListen bool // EnableHTTPTLS represent whether turn on the HTTPS, default is true EnableHTTPTLS bool - // EnableStdIo works with EnabelFcgi Use FCGI via standard I/O + // EnableStdIo works with EnableFcgi Use FCGI via standard I/O EnableStdIo bool // EnableXSRF whether turn on xsrf. default is false EnableXSRF bool @@ -435,8 +435,8 @@ func ParseConfig() (err error) { SessionCookieLifeTime = sesscookielifetime } - if enabelFcgi, err := AppConfig.Bool("EnabelFcgi"); err == nil { - EnabelFcgi = enabelFcgi + if enableFcgi, err := AppConfig.Bool("EnableFcgi"); err == nil { + EnableFcgi = enableFcgi } if enablegzip, err := AppConfig.Bool("EnableGzip"); err == nil { From fd4630c6dd1d3c90bee500e06795febf3745a8aa Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 4 Nov 2015 23:52:42 +0800 Subject: [PATCH 264/436] impove the ResponseWriter. fix #1410 --- router.go | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/router.go b/router.go index bb6bb786..1e8144bf 100644 --- a/router.go +++ b/router.go @@ -15,10 +15,7 @@ package beego import ( - "bufio" - "errors" "fmt" - "net" "net/http" "os" "path" @@ -581,7 +578,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) var runMethod string var routerInfo *controllerInfo - w := &responseWriter{writer: rw} + w := &responseWriter{rw, false, 0} if RunMode == "dev" { w.Header().Set("Server", BeegoServerName) @@ -856,7 +853,7 @@ Admin: // Call WriteHeader if status code has been set changed if context.Output.Status != 0 { - w.writer.WriteHeader(context.Output.Status) + w.WriteHeader(context.Output.Status) } } @@ -895,14 +892,14 @@ func (p *ControllerRegister) recoverPanic(context *beecontext.Context) { //responseWriter is a wrapper for the http.ResponseWriter //started set to true if response was written to then don't execute other handler type responseWriter struct { - writer http.ResponseWriter + http.ResponseWriter started bool status int } // Header returns the header map that will be sent by WriteHeader. func (w *responseWriter) Header() http.Header { - return w.writer.Header() + return w.ResponseWriter.Header() } // Write writes the data to the connection as part of an HTTP reply, @@ -910,7 +907,7 @@ func (w *responseWriter) Header() http.Header { // started means the response has sent out. func (w *responseWriter) Write(p []byte) (int, error) { w.started = true - return w.writer.Write(p) + return w.ResponseWriter.Write(p) } // WriteHeader sends an HTTP response header with status code, @@ -918,23 +915,7 @@ func (w *responseWriter) Write(p []byte) (int, error) { func (w *responseWriter) WriteHeader(code int) { w.status = code w.started = true - w.writer.WriteHeader(code) -} - -// hijacker for http -func (w *responseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) { - hj, ok := w.writer.(http.Hijacker) - if !ok { - return nil, nil, errors.New("webserver doesn't support hijacking") - } - return hj.Hijack() -} - -func (w *responseWriter) Flush() { - f, ok := w.writer.(http.Flusher) - if ok { - f.Flush() - } + w.ResponseWriter.WriteHeader(code) } func tourl(params map[string]string) string { From a26dee556d3ae4c583f5495d6273c472f1ad8cbb Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 5 Nov 2015 00:19:09 +0800 Subject: [PATCH 265/436] fix #1335 --- app.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.go b/app.go index 4978e5b1..ed57b978 100644 --- a/app.go +++ b/app.go @@ -117,7 +117,7 @@ func (app *App) Run() { server := grace.NewServer(addr, app.Handlers) server.Server.ReadTimeout = app.Server.ReadTimeout server.Server.WriteTimeout = app.Server.WriteTimeout - if ListenTCP4 && HTTPAddr == "" { + if ListenTCP4 { server.Network = "tcp4" } err := server.ListenAndServe() @@ -154,7 +154,7 @@ func (app *App) Run() { go func() { app.Server.Addr = addr BeeLogger.Info("http server Running on %s", app.Server.Addr) - if ListenTCP4 && HTTPAddr == "" { + if ListenTCP4 { ln, err := net.Listen("tcp4", app.Server.Addr) if err != nil { BeeLogger.Critical("ListenAndServe: ", err) From b8fc42d38dcaac48284bca16a5137881e6b85ff4 Mon Sep 17 00:00:00 2001 From: Yongzheng Lai Date: Thu, 5 Nov 2015 21:20:57 +0800 Subject: [PATCH 266/436] Update context.go all this status was setting in error.go, this line will cause multi-resp --- context/context.go | 1 - 1 file changed, 1 deletion(-) diff --git a/context/context.go b/context/context.go index f6aa85d6..30a47c02 100644 --- a/context/context.go +++ b/context/context.go @@ -54,7 +54,6 @@ func (ctx *Context) Redirect(status int, localurl string) { // Abort stops this request. // if beego.ErrorMaps exists, panic body. func (ctx *Context) Abort(status int, body string) { - ctx.ResponseWriter.WriteHeader(status) panic(body) } From 860568cb6c457a203157804569fcbb031313c75b Mon Sep 17 00:00:00 2001 From: JessonChan Date: Fri, 6 Nov 2015 18:51:53 +0800 Subject: [PATCH 267/436] modified as astaxie reviews https://github.com/astaxie/beego/pull/1376 --- config.go | 1 - memzipfile.go | 6 +++--- staticfile.go | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/config.go b/config.go index c2f23f67..e8370f4f 100644 --- a/config.go +++ b/config.go @@ -529,7 +529,6 @@ func ParseConfig() (err error) { if ext == "" { continue } - ext = strings.ToLower(ext) if !strings.HasPrefix(ext, ".") { ext = "." + ext } diff --git a/memzipfile.go b/memzipfile.go index 594f1060..b61e87f2 100644 --- a/memzipfile.go +++ b/memzipfile.go @@ -206,9 +206,9 @@ func getAcceptEncodingZip(r *http.Request) string { ss = strings.ToLower(ss) if strings.Contains(ss, "gzip") { return "gzip" - } - if strings.Contains(ss, "deflate") { + } else if strings.Contains(ss, "deflate") { return "deflate" + } else { + return "" } - return "" } diff --git a/staticfile.go b/staticfile.go index e1fc4f73..de530b0c 100644 --- a/staticfile.go +++ b/staticfile.go @@ -96,9 +96,8 @@ func serverStaticRouter(ctx *context.Context) { } isStaticFileToCompress := false - lowerFileName := strings.ToLower(filePath) for _, statExtension := range StaticExtensionsToGzip { - if strings.HasSuffix(lowerFileName, statExtension) { + if strings.HasSuffix(strings.ToLower(filePath), strings.ToLower(statExtension)) { isStaticFileToCompress = true break } From 821b2f832ead32422b92a675d089f9710028be0d Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 9 Nov 2015 11:03:57 +0800 Subject: [PATCH 268/436] fix the type assert --- context/output.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/context/output.go b/context/output.go index a4bb3d09..d132e392 100644 --- a/context/output.go +++ b/context/output.go @@ -103,7 +103,19 @@ func (output *BeegoOutput) Cookie(name string, value string, others ...interface //fix cookie not work in IE if len(others) > 0 { switch v := others[0].(type) { - case int, int32, int64: + case int: + if v > 0 { + fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v)*time.Second).UTC().Format(time.RFC1123), v) + } else if v <= 0 { + fmt.Fprintf(&b, "; Max-Age=0") + } + case int64: + if v > 0 { + fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v)*time.Second).UTC().Format(time.RFC1123), v) + } else if v <= 0 { + fmt.Fprintf(&b, "; Max-Age=0") + } + case int32: if v > 0 { fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v)*time.Second).UTC().Format(time.RFC1123), v) } else if v <= 0 { From 3872c48349f3a26a4b7f0458f4cce779d85970f1 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 10 Nov 2015 10:55:47 +0800 Subject: [PATCH 269/436] accept encoding refactor and bug fixed --- acceptencoder/acceptencoder.go | 118 ++++++++++++++++++++++++++++ acceptencoder/acceptencoder_test.go | 42 ++++++++++ context/output.go | 36 ++------- memzipfile.go | 42 +--------- staticfile.go | 11 ++- 5 files changed, 174 insertions(+), 75 deletions(-) create mode 100644 acceptencoder/acceptencoder.go create mode 100644 acceptencoder/acceptencoder_test.go diff --git a/acceptencoder/acceptencoder.go b/acceptencoder/acceptencoder.go new file mode 100644 index 00000000..70fd6183 --- /dev/null +++ b/acceptencoder/acceptencoder.go @@ -0,0 +1,118 @@ +// Copyright 2015 beego Author. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package acceptencoder + +import ( + "compress/flate" + "compress/gzip" + "io" + "net/http" + "os" + "strconv" + "strings" + + "gopkg.in/bufio.v1" +) + +type q struct { + name string + value float64 +} + +// WriteFile reads from file and writes to writer by the specific encoding(gzip/deflate) + +func WriteFile(encoding string, writer io.Writer, file *os.File) (bool, string, error) { + return writeLevel(encoding, writer, file, flate.BestCompression) +} + +// WriteBody reads writes content to writer by the specific encoding(gzip/deflate) + +func WriteBody(encoding string, writer io.Writer, content []byte) (bool, string, error) { + return writeLevel(encoding, writer, bufio.NewBuffer(content), flate.BestSpeed) +} + +// writeLevel reads from reader,writes to writer by specific encoding and compress level +// the compress level is defined by deflate package + +func writeLevel(encoding string, writer io.Writer, reader io.Reader, level int) (bool, string, error) { + var outputWriter io.Writer + var err error + switch encoding { + case "gzip": + outputWriter, err = gzip.NewWriterLevel(writer, level) + case "deflate": + outputWriter, err = flate.NewWriter(writer, level) + default: + outputWriter = writer.(io.Writer) + } + if err != nil { + return false, "", err + } + if _, err = io.Copy(outputWriter, reader); err != nil { + return false, "", err + } + switch outputWriter.(type) { + case io.WriteCloser: + outputWriter.(io.WriteCloser).Close() + } + return encoding != "", encoding, nil +} + +// ParseEncoding will extract the right encoding for response +// the Accept-Encoding's sec is here: +// http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.3 + +func ParseEncoding(r *http.Request) string { + if r == nil { + return "" + } + return parseEncoding(r) +} + + +func parseEncoding(r *http.Request) string { + acceptEncoding := r.Header.Get("Accept-Encoding") + if acceptEncoding == "" { + return "" + } + var lastQ q + for _, v := range strings.Split(acceptEncoding, ",") { + v = strings.TrimSpace(v) + if v == "" { + continue + } + vs := strings.Split(v, ";") + if len(vs) == 1 { + lastQ = q{vs[0], 1} + break + } + if len(vs) == 2 { + f, _ := strconv.ParseFloat(strings.Replace(vs[1], "q=", "", -1), 64) + if f == 0 { + continue + } + if f > lastQ.value { + lastQ = q{vs[0], f} + } + } + } + if lastQ.name == "*" { + return "gzip" + } + if lastQ.name == "identity" { + return "" + } + return lastQ.name +} diff --git a/acceptencoder/acceptencoder_test.go b/acceptencoder/acceptencoder_test.go new file mode 100644 index 00000000..7b73b587 --- /dev/null +++ b/acceptencoder/acceptencoder_test.go @@ -0,0 +1,42 @@ +// Copyright 2015 beego Author. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package acceptencoder + +import "testing" + +func Test_ExtractEncoding(t *testing.T) { + if parseEncoding("gzip,deflate") != "gzip" { + t.Fail() + } + if parseEncoding("deflate,gzip") != "deflate" { + t.Fail() + } + + if parseEncoding("gzip;q=.5,deflate") != "deflate" { + t.Fail() + } + + if parseEncoding("gzip;q=0,deflate") != "deflate" { + t.Fail() + } + + if parseEncoding("deflate;q=0.5,gzip;q=0.5,identity") != "identity" { + t.Fail() + } + + if parseEncoding("*") != "gzip" { + t.Fail() + } +} diff --git a/context/output.go b/context/output.go index d132e392..a72c6f74 100644 --- a/context/output.go +++ b/context/output.go @@ -15,9 +15,8 @@ package context import ( + "beego/acceptencoder" "bytes" - "compress/flate" - "compress/gzip" "encoding/json" "encoding/xml" "errors" @@ -55,25 +54,12 @@ func (output *BeegoOutput) Header(key, val string) { // it sends out response body directly. func (output *BeegoOutput) Body(content []byte) { outputWriter := output.Context.ResponseWriter.(io.Writer) - if output.EnableGzip == true && output.Context.Input.Header("Accept-Encoding") != "" { - splitted := strings.SplitN(output.Context.Input.Header("Accept-Encoding"), ",", -1) - encodings := make([]string, len(splitted)) - - for i, val := range splitted { - encodings[i] = strings.TrimSpace(val) - } - for _, val := range encodings { - if val == "gzip" { - output.Header("Content-Encoding", "gzip") - outputWriter, _ = gzip.NewWriterLevel(output.Context.ResponseWriter, gzip.BestSpeed) - - break - } else if val == "deflate" { - output.Header("Content-Encoding", "deflate") - outputWriter, _ = flate.NewWriter(output.Context.ResponseWriter, flate.BestSpeed) - break - } - } + var encoding string + if output.EnableGzip { + encoding = acceptencoder.ParseEncoding(output.Context.Input.Request) + } + if b, n, _ := acceptencoder.WriteBody(encoding, outputWriter, content); b { + output.Header("Content-Encoding", n) } else { output.Header("Content-Length", strconv.Itoa(len(content))) } @@ -84,14 +70,6 @@ func (output *BeegoOutput) Body(content []byte) { output.Context.ResponseWriter.WriteHeader(output.Status) output.Status = 0 } - - outputWriter.Write(content) - switch outputWriter.(type) { - case *gzip.Writer: - outputWriter.(*gzip.Writer).Close() - case *flate.Writer: - outputWriter.(*flate.Writer).Close() - } } // Cookie sets cookie value via given key. diff --git a/memzipfile.go b/memzipfile.go index 376a1ae9..12b63eae 100644 --- a/memzipfile.go +++ b/memzipfile.go @@ -15,16 +15,12 @@ package beego import ( - "bufio" + "beego/acceptencoder" "bytes" - "compress/flate" - "compress/gzip" "errors" "io" "io/ioutil" - "net/http" "os" - "strings" "sync" "time" ) @@ -83,36 +79,17 @@ type memFileInfo struct { func newMenFileInfo(file *os.File, fileInfo os.FileInfo, zip string) (*memFileInfo, error) { var content []byte var zipBuf bytes.Buffer - var fileWriter io.Writer var err error - switch zip { - case "gzip": - fileWriter, err = gzip.NewWriterLevel(&zipBuf, gzip.BestCompression) - case "deflate": - fileWriter, err = flate.NewWriter(&zipBuf, flate.BestCompression) - default: - fileWriter = bufio.NewWriter(&zipBuf) - } + _, _, err = acceptencoder.WriteFile(zip, &zipBuf, file) if err != nil { return nil, err } - _, err = io.Copy(fileWriter, file) - if err != nil { - return nil, err - } - - switch fileWriter.(type) { - case io.WriteCloser: - fileWriter.(io.WriteCloser).Close() - } - content, err = ioutil.ReadAll(&zipBuf) if err != nil { return nil, err } - return &memFileInfo{ FileInfo: fileInfo, modTime: fileInfo.ModTime(), @@ -210,18 +187,3 @@ func (f *memFile) Seek(offset int64, whence int) (ret int64, err error) { f.offset = offset return f.offset, nil } - -// getAcceptEncodingZip returns accept encoding format in http header. -// zip is first, then deflate if both accepted. -// If no accepted, return empty string. -func getAcceptEncodingZip(r *http.Request) string { - ss := r.Header.Get("Accept-Encoding") - ss = strings.ToLower(ss) - if strings.Contains(ss, "gzip") { - return "gzip" - } else if strings.Contains(ss, "deflate") { - return "deflate" - } else { - return "" - } -} diff --git a/staticfile.go b/staticfile.go index de530b0c..20f7c519 100644 --- a/staticfile.go +++ b/staticfile.go @@ -15,6 +15,7 @@ package beego import ( + "beego/acceptencoder" "net/http" "os" "path" @@ -111,7 +112,7 @@ func serverStaticRouter(ctx *context.Context) { //to compress file var contentEncoding string if EnableGzip { - contentEncoding = getAcceptEncodingZip(ctx.Request) + contentEncoding = acceptencoder.ParseEncoding(ctx.Request) } memZipFile, err := openMemZipFile(filePath, contentEncoding) @@ -123,12 +124,10 @@ func serverStaticRouter(ctx *context.Context) { return } - if contentEncoding == "gzip" { - ctx.Output.Header("Content-Encoding", "gzip") - } else if contentEncoding == "deflate" { - ctx.Output.Header("Content-Encoding", "deflate") - } else { + if contentEncoding == "" { ctx.Output.Header("Content-Length", strconv.FormatInt(fileInfo.Size(), 10)) + } else { + ctx.Output.Header("Content-Encoding", contentEncoding) } http.ServeContent(ctx.ResponseWriter, ctx.Request, filePath, fileInfo.ModTime(), memZipFile) From 0bc70e88f03c87072680af971ad876a5e9e1f835 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 10 Nov 2015 11:00:29 +0800 Subject: [PATCH 270/436] ignore the other compress method --- acceptencoder/acceptencoder.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/acceptencoder/acceptencoder.go b/acceptencoder/acceptencoder.go index 70fd6183..65b5f2db 100644 --- a/acceptencoder/acceptencoder.go +++ b/acceptencoder/acceptencoder.go @@ -26,11 +26,6 @@ import ( "gopkg.in/bufio.v1" ) -type q struct { - name string - value float64 -} - // WriteFile reads from file and writes to writer by the specific encoding(gzip/deflate) func WriteFile(encoding string, writer io.Writer, file *os.File) (bool, string, error) { @@ -55,6 +50,9 @@ func writeLevel(encoding string, writer io.Writer, reader io.Reader, level int) case "deflate": outputWriter, err = flate.NewWriter(writer, level) default: + // all the other compress methods will ignore + // such as the deprecated compress and chrome-only sdch + encoding = "" outputWriter = writer.(io.Writer) } if err != nil { @@ -81,6 +79,10 @@ func ParseEncoding(r *http.Request) string { return parseEncoding(r) } +type q struct { + name string + value float64 +} func parseEncoding(r *http.Request) string { acceptEncoding := r.Header.Get("Accept-Encoding") From 891be34fc657e11aa475a6cf8d856e76adb15038 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 10 Nov 2015 11:20:13 +0800 Subject: [PATCH 271/436] encoding should be specify --- acceptencoder/acceptencoder.go | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/acceptencoder/acceptencoder.go b/acceptencoder/acceptencoder.go index 65b5f2db..10d4ca31 100644 --- a/acceptencoder/acceptencoder.go +++ b/acceptencoder/acceptencoder.go @@ -23,7 +23,7 @@ import ( "strconv" "strings" - "gopkg.in/bufio.v1" + "bytes" ) // WriteFile reads from file and writes to writer by the specific encoding(gzip/deflate) @@ -35,7 +35,7 @@ func WriteFile(encoding string, writer io.Writer, file *os.File) (bool, string, // WriteBody reads writes content to writer by the specific encoding(gzip/deflate) func WriteBody(encoding string, writer io.Writer, content []byte) (bool, string, error) { - return writeLevel(encoding, writer, bufio.NewBuffer(content), flate.BestSpeed) + return writeLevel(encoding, writer, bytes.NewBuffer(content), flate.BestSpeed) } // writeLevel reads from reader,writes to writer by specific encoding and compress level @@ -84,6 +84,15 @@ type q struct { value float64 } +var ( + encodingMap = map[string]string{ // all the other compress methods will ignore + "gzip": "gzip", + "deflate": "deflate", + "*": "gzip", // * means any compress will accept,we prefer gzip + "identity": "", // identity means none-compress + } +) + func parseEncoding(r *http.Request) string { acceptEncoding := r.Header.Get("Accept-Encoding") if acceptEncoding == "" { @@ -110,11 +119,5 @@ func parseEncoding(r *http.Request) string { } } } - if lastQ.name == "*" { - return "gzip" - } - if lastQ.name == "identity" { - return "" - } - return lastQ.name + return encodingMap[lastQ.name] } From 8f42193610c6f772835f49efec58abdfe99a69ed Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 10 Nov 2015 11:32:18 +0800 Subject: [PATCH 272/436] better compress func design --- acceptencoder/acceptencoder.go | 40 +++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/acceptencoder/acceptencoder.go b/acceptencoder/acceptencoder.go index 10d4ca31..a79ede94 100644 --- a/acceptencoder/acceptencoder.go +++ b/acceptencoder/acceptencoder.go @@ -44,16 +44,11 @@ func WriteBody(encoding string, writer io.Writer, content []byte) (bool, string, func writeLevel(encoding string, writer io.Writer, reader io.Reader, level int) (bool, string, error) { var outputWriter io.Writer var err error - switch encoding { - case "gzip": - outputWriter, err = gzip.NewWriterLevel(writer, level) - case "deflate": - outputWriter, err = flate.NewWriter(writer, level) - default: - // all the other compress methods will ignore - // such as the deprecated compress and chrome-only sdch + if cf, ok := encodingCompressMap[encoding]; ok { + outputWriter, err = cf(writer, level) + } else { encoding = "" - outputWriter = writer.(io.Writer) + outputWriter, err = noneCompress(writer, level) } if err != nil { return false, "", err @@ -83,13 +78,24 @@ type q struct { name string value float64 } +type compressFunc func(io.Writer, int) (io.Writer, error) + +func noneCompress(wr io.Writer, level int) (io.Writer, error) { + return wr, nil +} +func gzipCompress(wr io.Writer, level int) (io.Writer, error) { + return gzip.NewWriterLevel(wr, level) +} +func deflateCompress(wr io.Writer, level int) (io.Writer, error) { + return flate.NewWriter(wr, level) +} var ( - encodingMap = map[string]string{ // all the other compress methods will ignore - "gzip": "gzip", - "deflate": "deflate", - "*": "gzip", // * means any compress will accept,we prefer gzip - "identity": "", // identity means none-compress + encodingCompressMap = map[string]compressFunc{ // all the other compress methods will ignore + "gzip": gzipCompress, + "deflate": deflateCompress, + "*": gzipCompress, // * means any compress will accept,we prefer gzip + "identity": noneCompress, // identity means none-compress } ) @@ -119,5 +125,9 @@ func parseEncoding(r *http.Request) string { } } } - return encodingMap[lastQ.name] + if _, ok := encodingCompressMap[lastQ.name]; ok { + return lastQ.name + } else { + return "" + } } From 83ec39d02efb06d098b6f7becedb1be34a6fd3ce Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 10 Nov 2015 11:47:10 +0800 Subject: [PATCH 273/436] refactor max age cookies setting --- context/output.go | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/context/output.go b/context/output.go index a72c6f74..6ffc5072 100644 --- a/context/output.go +++ b/context/output.go @@ -80,25 +80,21 @@ func (output *BeegoOutput) Cookie(name string, value string, others ...interface //fix cookie not work in IE if len(others) > 0 { + var maxAge int64 + switch v := others[0].(type) { case int: - if v > 0 { - fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v)*time.Second).UTC().Format(time.RFC1123), v) - } else if v <= 0 { - fmt.Fprintf(&b, "; Max-Age=0") - } - case int64: - if v > 0 { - fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v)*time.Second).UTC().Format(time.RFC1123), v) - } else if v <= 0 { - fmt.Fprintf(&b, "; Max-Age=0") - } + maxAge = int64(v) case int32: - if v > 0 { - fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(v)*time.Second).UTC().Format(time.RFC1123), v) - } else if v <= 0 { - fmt.Fprintf(&b, "; Max-Age=0") - } + maxAge = int64(v) + case int64: + maxAge = v + } + + if maxAge > 0 { + fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(maxAge)*time.Second).UTC().Format(time.RFC1123), maxAge) + } else if maxAge <= 0 { + fmt.Fprintf(&b, "; Max-Age=0") } } From 07c93cd32c4fa411526176523fd9a0a70a793603 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 10 Nov 2015 11:59:32 +0800 Subject: [PATCH 274/436] mem zip file test ,add license --- memzipfile_test.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/memzipfile_test.go b/memzipfile_test.go index a8c67ead..82511634 100644 --- a/memzipfile_test.go +++ b/memzipfile_test.go @@ -1,3 +1,17 @@ +// Copyright 2015 beego Author. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package beego import ( From 8603127c81d126b6aaf4f5f568626d41566efef9 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 10 Nov 2015 13:10:42 +0800 Subject: [PATCH 275/436] beego package file path rewrite --- context/output.go | 3 ++- memzipfile.go | 3 ++- staticfile.go | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/context/output.go b/context/output.go index 6ffc5072..60912313 100644 --- a/context/output.go +++ b/context/output.go @@ -15,7 +15,6 @@ package context import ( - "beego/acceptencoder" "bytes" "encoding/json" "encoding/xml" @@ -29,6 +28,8 @@ import ( "strconv" "strings" "time" + + "github.com/astaxie/beego/acceptencoder" ) // BeegoOutput does work for sending response header. diff --git a/memzipfile.go b/memzipfile.go index 12b63eae..79e20a6c 100644 --- a/memzipfile.go +++ b/memzipfile.go @@ -15,7 +15,6 @@ package beego import ( - "beego/acceptencoder" "bytes" "errors" "io" @@ -23,6 +22,8 @@ import ( "os" "sync" "time" + + "github.com/astaxie/beego/acceptencoder" ) var ( diff --git a/staticfile.go b/staticfile.go index 20f7c519..ec6a74ab 100644 --- a/staticfile.go +++ b/staticfile.go @@ -15,7 +15,6 @@ package beego import ( - "beego/acceptencoder" "net/http" "os" "path" @@ -23,6 +22,7 @@ import ( "strconv" "strings" + "github.com/astaxie/beego/acceptencoder" "github.com/astaxie/beego/context" "github.com/astaxie/beego/utils" ) From 7964f7f163114217e6a4e0e7581f76ab725d20f3 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 10 Nov 2015 13:16:16 +0800 Subject: [PATCH 276/436] test bug fixed --- acceptencoder/acceptencoder_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acceptencoder/acceptencoder_test.go b/acceptencoder/acceptencoder_test.go index 7b73b587..39786626 100644 --- a/acceptencoder/acceptencoder_test.go +++ b/acceptencoder/acceptencoder_test.go @@ -32,7 +32,7 @@ func Test_ExtractEncoding(t *testing.T) { t.Fail() } - if parseEncoding("deflate;q=0.5,gzip;q=0.5,identity") != "identity" { + if parseEncoding("deflate;q=0.5,gzip;q=0.5,identity") != "" { t.Fail() } From 7ccf049a50433cf75a2065797fd3eaec3899eb61 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 10 Nov 2015 13:27:33 +0800 Subject: [PATCH 277/436] bug fixed --- acceptencoder/acceptencoder_test.go | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/acceptencoder/acceptencoder_test.go b/acceptencoder/acceptencoder_test.go index 39786626..31cbc283 100644 --- a/acceptencoder/acceptencoder_test.go +++ b/acceptencoder/acceptencoder_test.go @@ -14,29 +14,32 @@ package acceptencoder -import "testing" +import ( + "net/http" + "testing" +) func Test_ExtractEncoding(t *testing.T) { - if parseEncoding("gzip,deflate") != "gzip" { + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"gzip,deflate"}}}) != "gzip" { t.Fail() } - if parseEncoding("deflate,gzip") != "deflate" { + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"deflate,gzip"}}}) != "deflate" { + t.Fail() + } + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"gzip;q=.5,deflate"}}}) != "deflate" { + t.Fail() + } + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"gzip;q=.5,deflate;q=0.3"}}}) != "gzip" { t.Fail() } - if parseEncoding("gzip;q=.5,deflate") != "deflate" { + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"gzip;q=0,deflate"}}}) != "deflate" { t.Fail() } - - if parseEncoding("gzip;q=0,deflate") != "deflate" { + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"deflate;q=0.5,gzip;q=0.5,identity"}}}) != "identity" { t.Fail() } - - if parseEncoding("deflate;q=0.5,gzip;q=0.5,identity") != "" { - t.Fail() - } - - if parseEncoding("*") != "gzip" { + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"*"}}}) != "*" { t.Fail() } } From 39e29caf9b3deb52c30ed095d566746fe55ab4d6 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 10 Nov 2015 13:42:10 +0800 Subject: [PATCH 278/436] refactor to fix encoder type bug --- acceptencoder/acceptencoder.go | 24 ++++++++++++++---------- acceptencoder/acceptencoder_test.go | 4 ++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/acceptencoder/acceptencoder.go b/acceptencoder/acceptencoder.go index a79ede94..974e7468 100644 --- a/acceptencoder/acceptencoder.go +++ b/acceptencoder/acceptencoder.go @@ -44,8 +44,8 @@ func WriteBody(encoding string, writer io.Writer, content []byte) (bool, string, func writeLevel(encoding string, writer io.Writer, reader io.Reader, level int) (bool, string, error) { var outputWriter io.Writer var err error - if cf, ok := encodingCompressMap[encoding]; ok { - outputWriter, err = cf(writer, level) + if cf, ok := encoderMap[encoding]; ok { + outputWriter, err = cf.encode(writer, level) } else { encoding = "" outputWriter, err = noneCompress(writer, level) @@ -78,7 +78,6 @@ type q struct { name string value float64 } -type compressFunc func(io.Writer, int) (io.Writer, error) func noneCompress(wr io.Writer, level int) (io.Writer, error) { return wr, nil @@ -90,12 +89,17 @@ func deflateCompress(wr io.Writer, level int) (io.Writer, error) { return flate.NewWriter(wr, level) } +type acceptEncoder struct { + name string + encode func(io.Writer, int) (io.Writer, error) +} + var ( - encodingCompressMap = map[string]compressFunc{ // all the other compress methods will ignore - "gzip": gzipCompress, - "deflate": deflateCompress, - "*": gzipCompress, // * means any compress will accept,we prefer gzip - "identity": noneCompress, // identity means none-compress + encoderMap = map[string]acceptEncoder{ // all the other compress methods will ignore + "gzip": acceptEncoder{"gzip", gzipCompress}, + "deflate": acceptEncoder{"deflate", deflateCompress}, + "*": acceptEncoder{"gzip", gzipCompress}, // * means any compress will accept,we prefer gzip + "identity": acceptEncoder{"", noneCompress}, // identity means none-compress } ) @@ -125,8 +129,8 @@ func parseEncoding(r *http.Request) string { } } } - if _, ok := encodingCompressMap[lastQ.name]; ok { - return lastQ.name + if cf, ok := encoderMap[lastQ.name]; ok { + return cf.name } else { return "" } diff --git a/acceptencoder/acceptencoder_test.go b/acceptencoder/acceptencoder_test.go index 31cbc283..6022e553 100644 --- a/acceptencoder/acceptencoder_test.go +++ b/acceptencoder/acceptencoder_test.go @@ -36,10 +36,10 @@ func Test_ExtractEncoding(t *testing.T) { if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"gzip;q=0,deflate"}}}) != "deflate" { t.Fail() } - if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"deflate;q=0.5,gzip;q=0.5,identity"}}}) != "identity" { + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"deflate;q=0.5,gzip;q=0.5,identity"}}}) != "" { t.Fail() } - if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"*"}}}) != "*" { + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"*"}}}) != "gzip" { t.Fail() } } From 7ef9b3d55bda195b05fb9f545b05d1aaeded6452 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 10 Nov 2015 14:07:26 +0800 Subject: [PATCH 279/436] runnable typo fixed --- router.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/router.go b/router.go index 1e8144bf..7952663e 100644 --- a/router.go +++ b/router.go @@ -717,18 +717,18 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) if doFilter(BeforeExec) { goto Admin } - isRunable := false + isRunnable := false if routerInfo != nil { if routerInfo.routerType == routerTypeRESTFul { if _, ok := routerInfo.methods[r.Method]; ok { - isRunable = true + isRunnable = true routerInfo.runFunction(context) } else { exception("405", context) goto Admin } } else if routerInfo.routerType == routerTypeHandler { - isRunable = true + isRunnable = true routerInfo.handler.ServeHTTP(rw, r) } else { runrouter = routerInfo.controllerType @@ -750,7 +750,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) } // also defined runrouter & runMethod from filter - if !isRunable { + if !isRunnable { //Invoke the request handler vc := reflect.New(runrouter) execController, ok := vc.Interface().(ControllerInterface) From f457ea0fe939d821e9ecdc1cafa8916ddfd5d3cb Mon Sep 17 00:00:00 2001 From: JessonChan Date: Wed, 11 Nov 2015 13:47:36 +0800 Subject: [PATCH 280/436] refactor encoder package --- context/acceptencoder.go | 137 ++++++++++++++++++++++++++++++++++ context/acceptencoder_test.go | 45 +++++++++++ 2 files changed, 182 insertions(+) create mode 100644 context/acceptencoder.go create mode 100644 context/acceptencoder_test.go diff --git a/context/acceptencoder.go b/context/acceptencoder.go new file mode 100644 index 00000000..9985bf36 --- /dev/null +++ b/context/acceptencoder.go @@ -0,0 +1,137 @@ +// Copyright 2015 beego Author. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package context + +import ( + "compress/flate" + "compress/gzip" + "io" + "net/http" + "os" + "strconv" + "strings" + + "bytes" +) + +// WriteFile reads from file and writes to writer by the specific encoding(gzip/deflate) + +func WriteFile(encoding string, writer io.Writer, file *os.File) (bool, string, error) { + return writeLevel(encoding, writer, file, flate.BestCompression) +} + +// WriteBody reads writes content to writer by the specific encoding(gzip/deflate) + +func WriteBody(encoding string, writer io.Writer, content []byte) (bool, string, error) { + return writeLevel(encoding, writer, bytes.NewBuffer(content), flate.BestSpeed) +} + +// writeLevel reads from reader,writes to writer by specific encoding and compress level +// the compress level is defined by deflate package + +func writeLevel(encoding string, writer io.Writer, reader io.Reader, level int) (bool, string, error) { + var outputWriter io.Writer + var err error + if cf, ok := encoderMap[encoding]; ok { + outputWriter, err = cf.encode(writer, level) + } else { + encoding = "" + outputWriter, err = noneCompress(writer, level) + } + if err != nil { + return false, "", err + } + if _, err = io.Copy(outputWriter, reader); err != nil { + return false, "", err + } + switch outputWriter.(type) { + case io.WriteCloser: + outputWriter.(io.WriteCloser).Close() + } + return encoding != "", encoding, nil +} + +// ParseEncoding will extract the right encoding for response +// the Accept-Encoding's sec is here: +// http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.3 + +func ParseEncoding(r *http.Request) string { + if r == nil { + return "" + } + return parseEncoding(r) +} + +type q struct { + name string + value float64 +} + +func noneCompress(wr io.Writer, level int) (io.Writer, error) { + return wr, nil +} +func gzipCompress(wr io.Writer, level int) (io.Writer, error) { + return gzip.NewWriterLevel(wr, level) +} +func deflateCompress(wr io.Writer, level int) (io.Writer, error) { + return flate.NewWriter(wr, level) +} + +type acceptEncoder struct { + name string + encode func(io.Writer, int) (io.Writer, error) +} + +var ( + encoderMap = map[string]acceptEncoder{ // all the other compress methods will ignore + "gzip": acceptEncoder{"gzip", gzipCompress}, + "deflate": acceptEncoder{"deflate", deflateCompress}, + "*": acceptEncoder{"gzip", gzipCompress}, // * means any compress will accept,we prefer gzip + "identity": acceptEncoder{"", noneCompress}, // identity means none-compress + } +) + +func parseEncoding(r *http.Request) string { + acceptEncoding := r.Header.Get("Accept-Encoding") + if acceptEncoding == "" { + return "" + } + var lastQ q + for _, v := range strings.Split(acceptEncoding, ",") { + v = strings.TrimSpace(v) + if v == "" { + continue + } + vs := strings.Split(v, ";") + if len(vs) == 1 { + lastQ = q{vs[0], 1} + break + } + if len(vs) == 2 { + f, _ := strconv.ParseFloat(strings.Replace(vs[1], "q=", "", -1), 64) + if f == 0 { + continue + } + if f > lastQ.value { + lastQ = q{vs[0], f} + } + } + } + if cf, ok := encoderMap[lastQ.name]; ok { + return cf.name + } else { + return "" + } +} diff --git a/context/acceptencoder_test.go b/context/acceptencoder_test.go new file mode 100644 index 00000000..147313c5 --- /dev/null +++ b/context/acceptencoder_test.go @@ -0,0 +1,45 @@ +// Copyright 2015 beego Author. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package context + +import ( + "net/http" + "testing" +) + +func Test_ExtractEncoding(t *testing.T) { + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"gzip,deflate"}}}) != "gzip" { + t.Fail() + } + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"deflate,gzip"}}}) != "deflate" { + t.Fail() + } + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"gzip;q=.5,deflate"}}}) != "deflate" { + t.Fail() + } + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"gzip;q=.5,deflate;q=0.3"}}}) != "gzip" { + t.Fail() + } + + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"gzip;q=0,deflate"}}}) != "deflate" { + t.Fail() + } + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"deflate;q=0.5,gzip;q=0.5,identity"}}}) != "" { + t.Fail() + } + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"*"}}}) != "gzip" { + t.Fail() + } +} From e4c6e5d2e1ee9d9de4f6d07a7470f0e727dddc10 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Wed, 11 Nov 2015 13:47:47 +0800 Subject: [PATCH 281/436] change package --- context/output.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/context/output.go b/context/output.go index 60912313..454d132e 100644 --- a/context/output.go +++ b/context/output.go @@ -28,8 +28,6 @@ import ( "strconv" "strings" "time" - - "github.com/astaxie/beego/acceptencoder" ) // BeegoOutput does work for sending response header. @@ -57,9 +55,9 @@ func (output *BeegoOutput) Body(content []byte) { outputWriter := output.Context.ResponseWriter.(io.Writer) var encoding string if output.EnableGzip { - encoding = acceptencoder.ParseEncoding(output.Context.Input.Request) + encoding = ParseEncoding(output.Context.Input.Request) } - if b, n, _ := acceptencoder.WriteBody(encoding, outputWriter, content); b { + if b, n, _ := WriteBody(encoding, outputWriter, content); b { output.Header("Content-Encoding", n) } else { output.Header("Content-Length", strconv.Itoa(len(content))) From 15b0b9b66dacb4f72c4939c0c58c08c16a6c659e Mon Sep 17 00:00:00 2001 From: JessonChan Date: Wed, 11 Nov 2015 16:21:04 +0800 Subject: [PATCH 282/436] delete old static file code --- memzipfile.go | 190 --------------------------------------------- memzipfile_test.go | 80 ------------------- 2 files changed, 270 deletions(-) delete mode 100644 memzipfile.go delete mode 100644 memzipfile_test.go diff --git a/memzipfile.go b/memzipfile.go deleted file mode 100644 index 79e20a6c..00000000 --- a/memzipfile.go +++ /dev/null @@ -1,190 +0,0 @@ -// Copyright 2014 beego Author. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package beego - -import ( - "bytes" - "errors" - "io" - "io/ioutil" - "os" - "sync" - "time" - - "github.com/astaxie/beego/acceptencoder" -) - -var ( - menFileInfoMap = make(map[string]*memFileInfo) - lock sync.RWMutex -) - -// openMemZipFile returns MemFile object with a compressed static file. -// it's used for serve static file if gzip enable. -func openMemZipFile(path string, zip string) (*memFile, error) { - osFile, e := os.Open(path) - if e != nil { - return nil, e - } - defer osFile.Close() - - osFileInfo, e := osFile.Stat() - if e != nil { - return nil, e - } - - modTime := osFileInfo.ModTime() - fileSize := osFileInfo.Size() - mapKey := zip + ":" + path - lock.RLock() - cfi, ok := menFileInfoMap[mapKey] - lock.RUnlock() - if !(ok && cfi.ModTime() == modTime && cfi.fileSize == fileSize) { - lock.Lock() - defer lock.Unlock() - if cfi, ok = menFileInfoMap[mapKey]; !ok { - cfi, e = newMenFileInfo(osFile, osFileInfo, zip) - if e != nil { - return nil, e - } - menFileInfoMap[mapKey] = cfi - } - } - - return &memFile{fi: cfi, offset: 0}, nil -} - -// memFileInfo contains a compressed file bytes and file information. -// it implements os.FileInfo interface. -type memFileInfo struct { - os.FileInfo - modTime time.Time - content []byte - contentSize int64 - fileSize int64 -} - -// newMenFileInfo return a memFileInfo from file by zip type -func newMenFileInfo(file *os.File, fileInfo os.FileInfo, zip string) (*memFileInfo, error) { - var content []byte - var zipBuf bytes.Buffer - var err error - - _, _, err = acceptencoder.WriteFile(zip, &zipBuf, file) - if err != nil { - return nil, err - } - - content, err = ioutil.ReadAll(&zipBuf) - if err != nil { - return nil, err - } - return &memFileInfo{ - FileInfo: fileInfo, - modTime: fileInfo.ModTime(), - content: content, - contentSize: int64(len(content)), - fileSize: fileInfo.Size(), - }, nil -} - -// Name returns the compressed filename. -func (fi *memFileInfo) Name() string { - return fi.Name() -} - -// Size returns the raw file content size, not compressed size. -func (fi *memFileInfo) Size() int64 { - return fi.contentSize -} - -// Mode returns file mode. -func (fi *memFileInfo) Mode() os.FileMode { - return fi.Mode() -} - -// ModTime returns the last modified time of raw file. -func (fi *memFileInfo) ModTime() time.Time { - return fi.modTime -} - -// IsDir returns the compressing file is a directory or not. -func (fi *memFileInfo) IsDir() bool { - return fi.IsDir() -} - -// return nil. implement the os.FileInfo interface method. -func (fi *memFileInfo) Sys() interface{} { - return nil -} - -// memFile contains MemFileInfo and bytes offset when reading. -// it implements io.Reader,io.ReadCloser and io.Seeker. -type memFile struct { - fi *memFileInfo - offset int64 -} - -// Close memfile. -func (f *memFile) Close() error { - return nil -} - -// Get os.FileInfo of memfile. -func (f *memFile) Stat() (os.FileInfo, error) { - return f.fi, nil -} - -// read os.FileInfo of files in directory of memfile. -// it returns empty slice. -func (f *memFile) Readdir(count int) ([]os.FileInfo, error) { - infos := []os.FileInfo{} - - return infos, nil -} - -// Read bytes from the compressed file bytes. -func (f *memFile) Read(p []byte) (n int, err error) { - if len(f.fi.content)-int(f.offset) >= len(p) { - n = len(p) - } else { - n = len(f.fi.content) - int(f.offset) - err = io.EOF - } - copy(p, f.fi.content[f.offset:f.offset+int64(n)]) - f.offset += int64(n) - return -} - -var errWhence = errors.New("Seek: invalid whence") -var errOffset = errors.New("Seek: invalid offset") - -// Read bytes from the compressed file bytes by seeker. -func (f *memFile) Seek(offset int64, whence int) (ret int64, err error) { - switch whence { - default: - return 0, errWhence - case os.SEEK_SET: - case os.SEEK_CUR: - offset += f.offset - case os.SEEK_END: - offset += int64(len(f.fi.content)) - } - if offset < 0 || int(offset) > len(f.fi.content) { - return 0, errOffset - } - f.offset = offset - return f.offset, nil -} diff --git a/memzipfile_test.go b/memzipfile_test.go deleted file mode 100644 index 82511634..00000000 --- a/memzipfile_test.go +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright 2015 beego Author. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package beego - -import ( - "bytes" - "compress/flate" - "compress/gzip" - "io" - "io/ioutil" - "os" - "testing" -) - -const licenseFile = "./LICENSE" - -func TestOpenMemZipFile_1(t *testing.T) { - mf, err := openMemZipFile(licenseFile, "") - if err != nil { - t.Fail() - } - file, _ := os.Open(licenseFile) - content, _ := ioutil.ReadAll(file) - assetMenFileAndContent(mf, content, t) -} - -func assetMenFileAndContent(mf *memFile, content []byte, t *testing.T) { - if mf.fi.contentSize != int64(len(content)) { - t.Log("content size not same") - t.Fail() - } - for i, v := range content { - if v != mf.fi.content[i] { - t.Log("content not same") - t.Fail() - } - } - if len(menFileInfoMap) == 0 { - t.Log("men map is empty") - t.Fail() - } -} -func TestOpenMemZipFile_2(t *testing.T) { - mf, err := openMemZipFile(licenseFile, "gzip") - if err != nil { - t.Fail() - } - file, _ := os.Open(licenseFile) - var zipBuf bytes.Buffer - fileWriter, _ := gzip.NewWriterLevel(&zipBuf, gzip.BestCompression) - io.Copy(fileWriter, file) - fileWriter.Close() - content, _ := ioutil.ReadAll(&zipBuf) - assetMenFileAndContent(mf, content, t) -} -func TestOpenMemZipFile_3(t *testing.T) { - mf, err := openMemZipFile(licenseFile, "deflate") - if err != nil { - t.Fail() - } - file, _ := os.Open(licenseFile) - var zipBuf bytes.Buffer - fileWriter, _ := flate.NewWriter(&zipBuf, flate.BestCompression) - io.Copy(fileWriter, file) - fileWriter.Close() - content, _ := ioutil.ReadAll(&zipBuf) - assetMenFileAndContent(mf, content, t) -} From 82c50b972d684e30b4f99e4f6a046cca30a766ec Mon Sep 17 00:00:00 2001 From: JessonChan Date: Wed, 11 Nov 2015 16:22:05 +0800 Subject: [PATCH 283/436] new test file --- staticfile_test.go | 71 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 staticfile_test.go diff --git a/staticfile_test.go b/staticfile_test.go new file mode 100644 index 00000000..e635fcc6 --- /dev/null +++ b/staticfile_test.go @@ -0,0 +1,71 @@ +package beego + +import ( + "bytes" + "compress/flate" + "compress/gzip" + "io" + "io/ioutil" + "os" + "testing" +) + +const licenseFile = "./LICENSE" + +func testOpenFile(encoding string, content []byte, t *testing.T) { + fi, _ := os.Stat(licenseFile) + b, n, sch, err := openFile(licenseFile, fi, encoding) + if err != nil { + t.Log(err) + t.Fail() + } + + t.Log("open static file encoding "+n, b) + + assetOpenFileAndContent(sch, content, t) +} +func TestOpenStaticFile_1(t *testing.T) { + file, _ := os.Open(licenseFile) + content, _ := ioutil.ReadAll(file) + testOpenFile("", content, t) +} + +func TestOpenStaticFileGzip_1(t *testing.T) { + file, _ := os.Open(licenseFile) + var zipBuf bytes.Buffer + fileWriter, _ := gzip.NewWriterLevel(&zipBuf, gzip.BestCompression) + io.Copy(fileWriter, file) + fileWriter.Close() + content, _ := ioutil.ReadAll(&zipBuf) + + testOpenFile("gzip", content, t) +} +func TestOpenStaticFileDeflate_1(t *testing.T) { + file, _ := os.Open(licenseFile) + var zipBuf bytes.Buffer + fileWriter, _ := flate.NewWriter(&zipBuf, flate.BestCompression) + io.Copy(fileWriter, file) + fileWriter.Close() + content, _ := ioutil.ReadAll(&zipBuf) + + testOpenFile("deflate", content, t) +} + +func assetOpenFileAndContent(sch *serveContentHolder, content []byte, t *testing.T) { + t.Log(sch.size, len(content)) + if sch.size != int64(len(content)) { + t.Log("static content file size not same") + t.Fail() + } + bs, _ := ioutil.ReadAll(sch) + for i, v := range content { + if v != bs[i] { + t.Log("content not same") + t.Fail() + } + } + if len(staticFileMap) == 0 { + t.Log("men map is empty") + t.Fail() + } +} From d2c60619fa857c99a3ab9416b08719b321e583e7 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Wed, 11 Nov 2015 16:22:40 +0800 Subject: [PATCH 284/436] new static file support code --- staticfile.go | 228 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 139 insertions(+), 89 deletions(-) diff --git a/staticfile.go b/staticfile.go index ec6a74ab..cbe2b26a 100644 --- a/staticfile.go +++ b/staticfile.go @@ -15,123 +15,173 @@ package beego import ( + "bytes" "net/http" "os" "path" "path/filepath" "strconv" "strings" + "sync" + + "errors" + + "time" - "github.com/astaxie/beego/acceptencoder" "github.com/astaxie/beego/context" - "github.com/astaxie/beego/utils" ) +var notStaticRequestErr = errors.New("request not a static file request") + func serverStaticRouter(ctx *context.Context) { if ctx.Input.Method() != "GET" && ctx.Input.Method() != "HEAD" { return } - requestPath := filepath.Clean(ctx.Input.Request.URL.Path) + forbidden, filePath, fileInfo, err := lookupFile(ctx) + if err == notStaticRequestErr { + return + } + + if forbidden { + exception("403", ctx) + return + } + + if filePath == "" || fileInfo == nil { + if RunMode == "dev" { + Warn("Can't find/open the file:", filePath, err) + } + http.NotFound(ctx.ResponseWriter, ctx.Request) + return + } + if fileInfo.IsDir() { + //serveFile will list dir + http.ServeFile(ctx.ResponseWriter, ctx.Request, filePath) + return + } + + var enableCompress = EnableGzip && isStaticCompress(filePath) + var acceptEncoding string + if enableCompress { + acceptEncoding = context.ParseEncoding(ctx.Request) + } + b, n, sch, err := openFile(filePath, fileInfo, acceptEncoding) + if err != nil { + if RunMode == "dev" { + Warn("Can't compress the file:", filePath, err) + } + http.NotFound(ctx.ResponseWriter, ctx.Request) + return + } + + if b { + ctx.Output.Header("Content-Encoding", n) + } else { + ctx.Output.Header("Content-Length", strconv.FormatInt(sch.size, 10)) + } + + http.ServeContent(ctx.ResponseWriter, ctx.Request, filePath, sch.modTime, sch) + return + +} + +type serveContentHolder struct { + *strings.Reader + modTime time.Time + size int64 + encoding string +} + +var ( + staticFileMap = make(map[string]*serveContentHolder) + mapLock sync.Mutex +) + +func openFile(filePath string, fi os.FileInfo, acceptEncoding string) (bool, string, *serveContentHolder, error) { + mapKey := acceptEncoding + ":" + filePath + mapFile, ok := staticFileMap[mapKey] + if ok { + if mapFile.modTime == fi.ModTime() && mapFile.size == fi.Size() { + return mapFile.encoding != "", mapFile.encoding, mapFile, nil + } + } + mapLock.Lock() + delete(staticFileMap, mapKey) + defer mapLock.Unlock() + if mapFile, ok = staticFileMap[mapKey]; !ok { + file, err := os.Open(filePath) + if err != nil { + return false, "", nil, err + } + defer file.Close() + var bufferWriter bytes.Buffer + _, n, err := context.WriteFile(acceptEncoding, &bufferWriter, file) + if err != nil { + return false, "", nil, err + } + mapFile = &serveContentHolder{Reader: strings.NewReader(string(bufferWriter.Bytes())), modTime: fi.ModTime(), size: int64(bufferWriter.Len()), encoding: n} + staticFileMap[mapKey] = mapFile + } + + return mapFile.encoding != "", mapFile.encoding, mapFile, nil +} + +func isStaticCompress(filePath string) bool { + for _, statExtension := range StaticExtensionsToGzip { + if strings.HasSuffix(strings.ToLower(filePath), strings.ToLower(statExtension)) { + return true + } + } + return false +} + +func searchFile(ctx *context.Context) (string, os.FileInfo, error) { + requestPath := filepath.Clean(ctx.Input.Request.URL.Path) // special processing : favicon.ico/robots.txt can be in any static dir if requestPath == "/favicon.ico" || requestPath == "/robots.txt" { file := path.Join(".", requestPath) - if utils.FileExists(file) { - http.ServeFile(ctx.ResponseWriter, ctx.Request, file) - return + if fi, _ := os.Stat(file); fi != nil { + return file, fi, nil } - for _, staticDir := range StaticDir { - file := path.Join(staticDir, requestPath) - if utils.FileExists(file) { - http.ServeFile(ctx.ResponseWriter, ctx.Request, file) - return + filePath := path.Join(staticDir, requestPath) + if fi, _ := os.Stat(filePath); fi != nil { + return filePath, fi, nil } } - - http.NotFound(ctx.ResponseWriter, ctx.Request) - return + return "", nil, errors.New(requestPath + " file not find") } for prefix, staticDir := range StaticDir { if len(prefix) == 0 { continue } - if strings.HasPrefix(requestPath, prefix) { - if len(requestPath) > len(prefix) && requestPath[len(prefix)] != '/' { - continue - } - filePath := path.Join(staticDir, requestPath[len(prefix):]) - fileInfo, err := os.Stat(filePath) - if err != nil { - if RunMode == "dev" { - Warn("Can't find the file:", filePath, err) - } - http.NotFound(ctx.ResponseWriter, ctx.Request) - return - } - //if the request is dir and DirectoryIndex is false then - if fileInfo.IsDir() { - if !DirectoryIndex { - exception("403", ctx) - return - } - if ctx.Input.Request.URL.Path[len(ctx.Input.Request.URL.Path)-1] != '/' { - http.Redirect(ctx.ResponseWriter, ctx.Request, ctx.Input.Request.URL.Path+"/", 302) - return - } - } - - if strings.HasSuffix(requestPath, "/index.html") { - fileReader, err := os.Open(filePath) - if err != nil { - if RunMode == "dev" { - Warn("Can't open the file:", filePath, err) - } - http.NotFound(ctx.ResponseWriter, ctx.Request) - return - } - defer fileReader.Close() - http.ServeContent(ctx.ResponseWriter, ctx.Request, filePath, fileInfo.ModTime(), fileReader) - return - } - - isStaticFileToCompress := false - for _, statExtension := range StaticExtensionsToGzip { - if strings.HasSuffix(strings.ToLower(filePath), strings.ToLower(statExtension)) { - isStaticFileToCompress = true - break - } - } - - if !isStaticFileToCompress { - http.ServeFile(ctx.ResponseWriter, ctx.Request, filePath) - return - } - - //to compress file - var contentEncoding string - if EnableGzip { - contentEncoding = acceptencoder.ParseEncoding(ctx.Request) - } - - memZipFile, err := openMemZipFile(filePath, contentEncoding) - if err != nil { - if RunMode == "dev" { - Warn("Can't compress the file:", filePath, err) - } - http.NotFound(ctx.ResponseWriter, ctx.Request) - return - } - - if contentEncoding == "" { - ctx.Output.Header("Content-Length", strconv.FormatInt(fileInfo.Size(), 10)) - } else { - ctx.Output.Header("Content-Encoding", contentEncoding) - } - - http.ServeContent(ctx.ResponseWriter, ctx.Request, filePath, fileInfo.ModTime(), memZipFile) - return + if !strings.Contains(requestPath, prefix) { + continue + } + if len(requestPath) > len(prefix) && requestPath[len(prefix)] != '/' { + continue + } + filePath := path.Join(staticDir, requestPath[len(prefix):]) + if fi, err := os.Stat(filePath); fi != nil { + return filePath, fi, err } } + return "", nil, notStaticRequestErr +} + +func lookupFile(ctx *context.Context) (bool, string, os.FileInfo, error) { + fp, fi, err := searchFile(ctx) + if fp == "" || fi == nil { + return false, "", nil, err + } + if !fi.IsDir() { + return false, fp, fi, err + } + ifp := filepath.Join(fp, "index.html") + if ifi, _ := os.Stat(ifp); ifi != nil && ifi.Mode().IsRegular() { + return false, ifp, ifi, err + } + return !DirectoryIndex, fp, fi, err } From b25a1355f9e49b771f7aee321ed9365c1c52cdfa Mon Sep 17 00:00:00 2001 From: JessonChan Date: Wed, 11 Nov 2015 16:27:41 +0800 Subject: [PATCH 285/436] remove old code --- acceptencoder/acceptencoder.go | 137 ---------------------------- acceptencoder/acceptencoder_test.go | 45 --------- 2 files changed, 182 deletions(-) delete mode 100644 acceptencoder/acceptencoder.go delete mode 100644 acceptencoder/acceptencoder_test.go diff --git a/acceptencoder/acceptencoder.go b/acceptencoder/acceptencoder.go deleted file mode 100644 index 974e7468..00000000 --- a/acceptencoder/acceptencoder.go +++ /dev/null @@ -1,137 +0,0 @@ -// Copyright 2015 beego Author. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package acceptencoder - -import ( - "compress/flate" - "compress/gzip" - "io" - "net/http" - "os" - "strconv" - "strings" - - "bytes" -) - -// WriteFile reads from file and writes to writer by the specific encoding(gzip/deflate) - -func WriteFile(encoding string, writer io.Writer, file *os.File) (bool, string, error) { - return writeLevel(encoding, writer, file, flate.BestCompression) -} - -// WriteBody reads writes content to writer by the specific encoding(gzip/deflate) - -func WriteBody(encoding string, writer io.Writer, content []byte) (bool, string, error) { - return writeLevel(encoding, writer, bytes.NewBuffer(content), flate.BestSpeed) -} - -// writeLevel reads from reader,writes to writer by specific encoding and compress level -// the compress level is defined by deflate package - -func writeLevel(encoding string, writer io.Writer, reader io.Reader, level int) (bool, string, error) { - var outputWriter io.Writer - var err error - if cf, ok := encoderMap[encoding]; ok { - outputWriter, err = cf.encode(writer, level) - } else { - encoding = "" - outputWriter, err = noneCompress(writer, level) - } - if err != nil { - return false, "", err - } - if _, err = io.Copy(outputWriter, reader); err != nil { - return false, "", err - } - switch outputWriter.(type) { - case io.WriteCloser: - outputWriter.(io.WriteCloser).Close() - } - return encoding != "", encoding, nil -} - -// ParseEncoding will extract the right encoding for response -// the Accept-Encoding's sec is here: -// http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.3 - -func ParseEncoding(r *http.Request) string { - if r == nil { - return "" - } - return parseEncoding(r) -} - -type q struct { - name string - value float64 -} - -func noneCompress(wr io.Writer, level int) (io.Writer, error) { - return wr, nil -} -func gzipCompress(wr io.Writer, level int) (io.Writer, error) { - return gzip.NewWriterLevel(wr, level) -} -func deflateCompress(wr io.Writer, level int) (io.Writer, error) { - return flate.NewWriter(wr, level) -} - -type acceptEncoder struct { - name string - encode func(io.Writer, int) (io.Writer, error) -} - -var ( - encoderMap = map[string]acceptEncoder{ // all the other compress methods will ignore - "gzip": acceptEncoder{"gzip", gzipCompress}, - "deflate": acceptEncoder{"deflate", deflateCompress}, - "*": acceptEncoder{"gzip", gzipCompress}, // * means any compress will accept,we prefer gzip - "identity": acceptEncoder{"", noneCompress}, // identity means none-compress - } -) - -func parseEncoding(r *http.Request) string { - acceptEncoding := r.Header.Get("Accept-Encoding") - if acceptEncoding == "" { - return "" - } - var lastQ q - for _, v := range strings.Split(acceptEncoding, ",") { - v = strings.TrimSpace(v) - if v == "" { - continue - } - vs := strings.Split(v, ";") - if len(vs) == 1 { - lastQ = q{vs[0], 1} - break - } - if len(vs) == 2 { - f, _ := strconv.ParseFloat(strings.Replace(vs[1], "q=", "", -1), 64) - if f == 0 { - continue - } - if f > lastQ.value { - lastQ = q{vs[0], f} - } - } - } - if cf, ok := encoderMap[lastQ.name]; ok { - return cf.name - } else { - return "" - } -} diff --git a/acceptencoder/acceptencoder_test.go b/acceptencoder/acceptencoder_test.go deleted file mode 100644 index 6022e553..00000000 --- a/acceptencoder/acceptencoder_test.go +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright 2015 beego Author. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package acceptencoder - -import ( - "net/http" - "testing" -) - -func Test_ExtractEncoding(t *testing.T) { - if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"gzip,deflate"}}}) != "gzip" { - t.Fail() - } - if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"deflate,gzip"}}}) != "deflate" { - t.Fail() - } - if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"gzip;q=.5,deflate"}}}) != "deflate" { - t.Fail() - } - if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"gzip;q=.5,deflate;q=0.3"}}}) != "gzip" { - t.Fail() - } - - if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"gzip;q=0,deflate"}}}) != "deflate" { - t.Fail() - } - if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"deflate;q=0.5,gzip;q=0.5,identity"}}}) != "" { - t.Fail() - } - if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"*"}}}) != "gzip" { - t.Fail() - } -} From 1200b7c34785cd3167049751a4236623dd4d5c90 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Wed, 11 Nov 2015 18:06:18 +0800 Subject: [PATCH 286/436] method refactor --- context/acceptencoder.go | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/context/acceptencoder.go b/context/acceptencoder.go index 9985bf36..2d568fc0 100644 --- a/context/acceptencoder.go +++ b/context/acceptencoder.go @@ -23,28 +23,34 @@ import ( "strconv" "strings" - "bytes" + "fmt" + "io/ioutil" ) // WriteFile reads from file and writes to writer by the specific encoding(gzip/deflate) func WriteFile(encoding string, writer io.Writer, file *os.File) (bool, string, error) { - return writeLevel(encoding, writer, file, flate.BestCompression) + content, err := ioutil.ReadAll(file) + if err != nil { + return false, "", err + } + return writeLevel(encoding, writer, content, flate.BestCompression) } // WriteBody reads writes content to writer by the specific encoding(gzip/deflate) func WriteBody(encoding string, writer io.Writer, content []byte) (bool, string, error) { - return writeLevel(encoding, writer, bytes.NewBuffer(content), flate.BestSpeed) + return writeLevel(encoding, writer, content, flate.BestSpeed) } // writeLevel reads from reader,writes to writer by specific encoding and compress level // the compress level is defined by deflate package -func writeLevel(encoding string, writer io.Writer, reader io.Reader, level int) (bool, string, error) { +func writeLevel(encoding string, writer io.Writer, content []byte, level int) (bool, string, error) { var outputWriter io.Writer var err error if cf, ok := encoderMap[encoding]; ok { + fmt.Println("write level", encoding) outputWriter, err = cf.encode(writer, level) } else { encoding = "" @@ -53,9 +59,7 @@ func writeLevel(encoding string, writer io.Writer, reader io.Reader, level int) if err != nil { return false, "", err } - if _, err = io.Copy(outputWriter, reader); err != nil { - return false, "", err - } + outputWriter.Write(content) switch outputWriter.(type) { case io.WriteCloser: outputWriter.(io.WriteCloser).Close() From a9881388f7e42d893c386b59c94c66fb6c4d1e74 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Thu, 12 Nov 2015 10:08:57 +0800 Subject: [PATCH 287/436] accept encoder header setting fixed --- context/acceptencoder.go | 2 -- context/output.go | 7 ++++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/context/acceptencoder.go b/context/acceptencoder.go index 2d568fc0..c2a79fa1 100644 --- a/context/acceptencoder.go +++ b/context/acceptencoder.go @@ -23,7 +23,6 @@ import ( "strconv" "strings" - "fmt" "io/ioutil" ) @@ -50,7 +49,6 @@ func writeLevel(encoding string, writer io.Writer, content []byte, level int) (b var outputWriter io.Writer var err error if cf, ok := encoderMap[encoding]; ok { - fmt.Println("write level", encoding) outputWriter, err = cf.encode(writer, level) } else { encoding = "" diff --git a/context/output.go b/context/output.go index 454d132e..4d902487 100644 --- a/context/output.go +++ b/context/output.go @@ -52,23 +52,24 @@ func (output *BeegoOutput) Header(key, val string) { // if EnableGzip, compress content string. // it sends out response body directly. func (output *BeegoOutput) Body(content []byte) { - outputWriter := output.Context.ResponseWriter.(io.Writer) var encoding string + var buf = &bytes.Buffer{} if output.EnableGzip { encoding = ParseEncoding(output.Context.Input.Request) } - if b, n, _ := WriteBody(encoding, outputWriter, content); b { + if b, n, _ := WriteBody(encoding, buf, content); b { output.Header("Content-Encoding", n) } else { output.Header("Content-Length", strconv.Itoa(len(content))) } - // Write status code if it has been set manually // Set it to 0 afterwards to prevent "multiple response.WriteHeader calls" if output.Status != 0 { output.Context.ResponseWriter.WriteHeader(output.Status) output.Status = 0 } + + io.Copy(output.Context.ResponseWriter, buf) } // Cookie sets cookie value via given key. From f8db8ae9c35ba27a8ad20e3f08fd80e42dd0fece Mon Sep 17 00:00:00 2001 From: JessonChan Date: Thu, 12 Nov 2015 10:48:36 +0800 Subject: [PATCH 288/436] add some comments --- staticfile.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/staticfile.go b/staticfile.go index cbe2b26a..894d5c8d 100644 --- a/staticfile.go +++ b/staticfile.go @@ -127,6 +127,8 @@ func openFile(filePath string, fi os.FileInfo, acceptEncoding string) (bool, str return mapFile.encoding != "", mapFile.encoding, mapFile, nil } +// isStaticCompress detect static files + func isStaticCompress(filePath string) bool { for _, statExtension := range StaticExtensionsToGzip { if strings.HasSuffix(strings.ToLower(filePath), strings.ToLower(statExtension)) { @@ -136,6 +138,8 @@ func isStaticCompress(filePath string) bool { return false } +// searchFile search the file by url path +// if none the static file prefix matches ,return notStaticRequestErr func searchFile(ctx *context.Context) (string, os.FileInfo, error) { requestPath := filepath.Clean(ctx.Input.Request.URL.Path) // special processing : favicon.ico/robots.txt can be in any static dir @@ -171,6 +175,10 @@ func searchFile(ctx *context.Context) (string, os.FileInfo, error) { return "", nil, notStaticRequestErr } +// lookupFile find the file to serve +// if the file is dir ,search the index.html as default file( MUST NOT A DIR also) +// if the index.html not exist or is a dir, give a forbidden response depending on DirectoryIndex + func lookupFile(ctx *context.Context) (bool, string, os.FileInfo, error) { fp, fi, err := searchFile(ctx) if fp == "" || fi == nil { From 214030fad4b4601fdaf0c17e0f4c548f20e40fbf Mon Sep 17 00:00:00 2001 From: JessonChan Date: Thu, 12 Nov 2015 11:44:29 +0800 Subject: [PATCH 289/436] bytes reader replace string reader --- context/acceptencoder.go | 15 +++++---------- staticfile.go | 4 ++-- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/context/acceptencoder.go b/context/acceptencoder.go index c2a79fa1..c252cf6b 100644 --- a/context/acceptencoder.go +++ b/context/acceptencoder.go @@ -15,6 +15,7 @@ package context import ( + "bytes" "compress/flate" "compress/gzip" "io" @@ -22,30 +23,24 @@ import ( "os" "strconv" "strings" - - "io/ioutil" ) // WriteFile reads from file and writes to writer by the specific encoding(gzip/deflate) func WriteFile(encoding string, writer io.Writer, file *os.File) (bool, string, error) { - content, err := ioutil.ReadAll(file) - if err != nil { - return false, "", err - } - return writeLevel(encoding, writer, content, flate.BestCompression) + return writeLevel(encoding, writer, file, flate.BestCompression) } // WriteBody reads writes content to writer by the specific encoding(gzip/deflate) func WriteBody(encoding string, writer io.Writer, content []byte) (bool, string, error) { - return writeLevel(encoding, writer, content, flate.BestSpeed) + return writeLevel(encoding, writer, bytes.NewReader(content), flate.BestSpeed) } // writeLevel reads from reader,writes to writer by specific encoding and compress level // the compress level is defined by deflate package -func writeLevel(encoding string, writer io.Writer, content []byte, level int) (bool, string, error) { +func writeLevel(encoding string, writer io.Writer, reader io.Reader, level int) (bool, string, error) { var outputWriter io.Writer var err error if cf, ok := encoderMap[encoding]; ok { @@ -57,7 +52,7 @@ func writeLevel(encoding string, writer io.Writer, content []byte, level int) (b if err != nil { return false, "", err } - outputWriter.Write(content) + io.Copy(outputWriter, reader) switch outputWriter.(type) { case io.WriteCloser: outputWriter.(io.WriteCloser).Close() diff --git a/staticfile.go b/staticfile.go index 894d5c8d..5dae81ac 100644 --- a/staticfile.go +++ b/staticfile.go @@ -87,7 +87,7 @@ func serverStaticRouter(ctx *context.Context) { } type serveContentHolder struct { - *strings.Reader + *bytes.Reader modTime time.Time size int64 encoding string @@ -120,7 +120,7 @@ func openFile(filePath string, fi os.FileInfo, acceptEncoding string) (bool, str if err != nil { return false, "", nil, err } - mapFile = &serveContentHolder{Reader: strings.NewReader(string(bufferWriter.Bytes())), modTime: fi.ModTime(), size: int64(bufferWriter.Len()), encoding: n} + mapFile = &serveContentHolder{Reader: bytes.NewReader(bufferWriter.Bytes()), modTime: fi.ModTime(), size: int64(bufferWriter.Len()), encoding: n} staticFileMap[mapKey] = mapFile } From 46fbeaadad21ae1361ff8b71ccc9e7facf2fae9e Mon Sep 17 00:00:00 2001 From: JessonChan Date: Thu, 12 Nov 2015 12:03:53 +0800 Subject: [PATCH 290/436] refactor accept encoder ,simplify the struct --- context/acceptencoder.go | 61 +++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/context/acceptencoder.go b/context/acceptencoder.go index c252cf6b..887459e1 100644 --- a/context/acceptencoder.go +++ b/context/acceptencoder.go @@ -25,6 +25,26 @@ import ( "strings" ) +type acceptEncoder struct { + name string + encode func(io.Writer, int) (io.Writer, error) +} + +var ( + noneCompressEncoder = acceptEncoder{"", func(wr io.Writer, level int) (io.Writer, error) { return wr, nil }} + gzipCompressEncoder = acceptEncoder{"gzip", func(wr io.Writer, level int) (io.Writer, error) { return gzip.NewWriterLevel(wr, level) }} + deflateCompressEncoder = acceptEncoder{"deflate", func(wr io.Writer, level int) (io.Writer, error) { return flate.NewWriter(wr, level) }} +) + +var ( + encoderMap = map[string]acceptEncoder{ // all the other compress methods will ignore + "gzip": gzipCompressEncoder, + "deflate": deflateCompressEncoder, + "*": gzipCompressEncoder, // * means any compress will accept,we prefer gzip + "identity": noneCompressEncoder, // identity means none-compress + } +) + // WriteFile reads from file and writes to writer by the specific encoding(gzip/deflate) func WriteFile(encoding string, writer io.Writer, file *os.File) (bool, string, error) { @@ -43,16 +63,23 @@ func WriteBody(encoding string, writer io.Writer, content []byte) (bool, string, func writeLevel(encoding string, writer io.Writer, reader io.Reader, level int) (bool, string, error) { var outputWriter io.Writer var err error + var ce = noneCompressEncoder + if cf, ok := encoderMap[encoding]; ok { - outputWriter, err = cf.encode(writer, level) - } else { - encoding = "" - outputWriter, err = noneCompress(writer, level) + ce = cf } + encoding = ce.name + outputWriter, err = ce.encode(writer, level) + if err != nil { return false, "", err } - io.Copy(outputWriter, reader) + + _, err = io.Copy(outputWriter, reader) + if err != nil { + return false, "", err + } + switch outputWriter.(type) { case io.WriteCloser: outputWriter.(io.WriteCloser).Close() @@ -76,30 +103,6 @@ type q struct { value float64 } -func noneCompress(wr io.Writer, level int) (io.Writer, error) { - return wr, nil -} -func gzipCompress(wr io.Writer, level int) (io.Writer, error) { - return gzip.NewWriterLevel(wr, level) -} -func deflateCompress(wr io.Writer, level int) (io.Writer, error) { - return flate.NewWriter(wr, level) -} - -type acceptEncoder struct { - name string - encode func(io.Writer, int) (io.Writer, error) -} - -var ( - encoderMap = map[string]acceptEncoder{ // all the other compress methods will ignore - "gzip": acceptEncoder{"gzip", gzipCompress}, - "deflate": acceptEncoder{"deflate", deflateCompress}, - "*": acceptEncoder{"gzip", gzipCompress}, // * means any compress will accept,we prefer gzip - "identity": acceptEncoder{"", noneCompress}, // identity means none-compress - } -) - func parseEncoding(r *http.Request) string { acceptEncoding := r.Header.Get("Accept-Encoding") if acceptEncoding == "" { From bc2195b07f0a1d8d8c6bfabd0308a3de4abd8dca Mon Sep 17 00:00:00 2001 From: JessonChan Date: Thu, 12 Nov 2015 16:59:07 +0800 Subject: [PATCH 291/436] code simplify --- context/output.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/context/output.go b/context/output.go index 4d902487..f0d66f36 100644 --- a/context/output.go +++ b/context/output.go @@ -93,7 +93,7 @@ func (output *BeegoOutput) Cookie(name string, value string, others ...interface if maxAge > 0 { fmt.Fprintf(&b, "; Expires=%s; Max-Age=%d", time.Now().Add(time.Duration(maxAge)*time.Second).UTC().Format(time.RFC1123), maxAge) - } else if maxAge <= 0 { + } else { fmt.Fprintf(&b, "; Max-Age=0") } } From d963bb79bd20c74495132d89b9dd84c051377c87 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Mon, 16 Nov 2015 10:31:27 +0800 Subject: [PATCH 292/436] avoid map-lock delete --- staticfile.go | 1 - 1 file changed, 1 deletion(-) diff --git a/staticfile.go b/staticfile.go index 5dae81ac..80162e74 100644 --- a/staticfile.go +++ b/staticfile.go @@ -107,7 +107,6 @@ func openFile(filePath string, fi os.FileInfo, acceptEncoding string) (bool, str } } mapLock.Lock() - delete(staticFileMap, mapKey) defer mapLock.Unlock() if mapFile, ok = staticFileMap[mapKey]; !ok { file, err := os.Open(filePath) From 5d01afe3a62e965e806a03f5289504148f11b3fc Mon Sep 17 00:00:00 2001 From: JessonChan Date: Mon, 16 Nov 2015 14:05:05 +0800 Subject: [PATCH 293/436] isOk to check whether the file is latest --- staticfile.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/staticfile.go b/staticfile.go index 80162e74..cb57b133 100644 --- a/staticfile.go +++ b/staticfile.go @@ -100,15 +100,13 @@ var ( func openFile(filePath string, fi os.FileInfo, acceptEncoding string) (bool, string, *serveContentHolder, error) { mapKey := acceptEncoding + ":" + filePath - mapFile, ok := staticFileMap[mapKey] - if ok { - if mapFile.modTime == fi.ModTime() && mapFile.size == fi.Size() { - return mapFile.encoding != "", mapFile.encoding, mapFile, nil - } + mapFile, _ := staticFileMap[mapKey] + if isOk(mapFile, fi) { + return mapFile.encoding != "", mapFile.encoding, mapFile, nil } mapLock.Lock() defer mapLock.Unlock() - if mapFile, ok = staticFileMap[mapKey]; !ok { + if mapFile, _ = staticFileMap[mapKey]; !isOk(mapFile, fi) { file, err := os.Open(filePath) if err != nil { return false, "", nil, err @@ -126,6 +124,13 @@ func openFile(filePath string, fi os.FileInfo, acceptEncoding string) (bool, str return mapFile.encoding != "", mapFile.encoding, mapFile, nil } +func isOk(s *serveContentHolder, fi os.FileInfo) bool { + if s == nil { + return false + } + return s.modTime == fi.ModTime() && s.size == fi.Size() +} + // isStaticCompress detect static files func isStaticCompress(filePath string) bool { From 29ac961c10694864b6d03569697c4c6d68bd6108 Mon Sep 17 00:00:00 2001 From: Steeve Chailloux Date: Mon, 9 Nov 2015 19:39:47 -0600 Subject: [PATCH 294/436] fix postgres syntax error during migration --- migration/migration.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migration/migration.go b/migration/migration.go index 2206569c..1591bc50 100644 --- a/migration/migration.go +++ b/migration/migration.go @@ -104,7 +104,7 @@ func (m *Migration) addOrUpdateRecord(name, status string) error { o := orm.NewOrm() if status == "down" { status = "rollback" - p, err := o.Raw("update migrations set `status` = ?, `rollback_statements` = ?, `created_at` = ? where name = ?").Prepare() + p, err := o.Raw("update migrations set status = ?, rollback_statements = ?, created_at = ? where name = ?").Prepare() if err != nil { return nil } @@ -112,7 +112,7 @@ func (m *Migration) addOrUpdateRecord(name, status string) error { return err } status = "update" - p, err := o.Raw("insert into migrations(`name`, `created_at`, `statements`, `status`) values(?,?,?,?)").Prepare() + p, err := o.Raw("insert into migrations(name, created_at, statements, status) values(?,?,?,?)").Prepare() if err != nil { return err } From ca37557a26809b6089cb48a11e56b8c624ceebce Mon Sep 17 00:00:00 2001 From: gobenon Date: Thu, 19 Nov 2015 14:30:14 +0200 Subject: [PATCH 295/436] Update orm_querym2m.go --- orm/orm_querym2m.go | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/orm/orm_querym2m.go b/orm/orm_querym2m.go index 1eaccf72..1d8fea3e 100644 --- a/orm/orm_querym2m.go +++ b/orm/orm_querym2m.go @@ -44,7 +44,15 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) { dbase := orm.alias.DbBaser var models []interface{} - + last_md_col_name := mi.fields.dbcols[len(mi.fields.dbcols)-1] + last_md := mds[len(mds)-1] + var v3 interface{} + var names []string + var values []interface{} + if reflect.Indirect(reflect.ValueOf(last_md)).Kind() != reflect.Struct { + v3 = (last_md) + mds = mds[:len(mds)-1] + } for _, md := range mds { val := reflect.ValueOf(md) if val.Kind() == reflect.Slice || val.Kind() == reflect.Array { @@ -63,15 +71,18 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) { if exist == false { panic(ErrMissPK) } + if v3 != nil { + names = []string{mfi.column, rfi.column, last_md_col_name} - names := []string{mfi.column, rfi.column} - - values := make([]interface{}, 0, len(models)*2) + values = make([]interface{}, 0, len(models)*3) + } else { + names = []string{mfi.column, rfi.column} + values = make([]interface{}, 0, len(models)*2) + } for _, md := range models { ind := reflect.Indirect(reflect.ValueOf(md)) - var v2 interface{} if ind.Kind() != reflect.Struct { v2 = ind.Interface() @@ -81,14 +92,17 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) { panic(ErrMissPK) } } - - values = append(values, v1, v2) + if v3 == nil { + values = append(values, v1, v2) + } else { + values = append(values, v1, v2, v3) + } } - return dbase.InsertValue(orm.db, mi, true, names, values) } + // remove models following the origin model relationship func (o *queryM2M) Remove(mds ...interface{}) (int64, error) { fi := o.fi From efd30bdba743923a533e0fc5441a25091596c629 Mon Sep 17 00:00:00 2001 From: gobenon Date: Thu, 19 Nov 2015 16:46:14 +0200 Subject: [PATCH 296/436] Update orm_querym2m.go --- orm/orm_querym2m.go | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/orm/orm_querym2m.go b/orm/orm_querym2m.go index 1d8fea3e..36c5e95f 100644 --- a/orm/orm_querym2m.go +++ b/orm/orm_querym2m.go @@ -44,14 +44,19 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) { dbase := orm.alias.DbBaser var models []interface{} - last_md_col_name := mi.fields.dbcols[len(mi.fields.dbcols)-1] - last_md := mds[len(mds)-1] - var v3 interface{} - var names []string - var values []interface{} - if reflect.Indirect(reflect.ValueOf(last_md)).Kind() != reflect.Struct { - v3 = (last_md) - mds = mds[:len(mds)-1] + var other_values []interface{} + var other_names []string + + for _, colname := range mi.fields.dbcols { + if colname != mfi.column && colname != rfi.column && colname != fi.mi.fields.pk.column { + other_names = append(other_names, colname) + } + } + for i, md := range mds { + if reflect.Indirect(reflect.ValueOf(md)).Kind() != reflect.Struct && i > 0 { + other_values = append(other_values, md) + mds = append(mds[:i], mds[i+1:]...) + } } for _, md := range mds { val := reflect.ValueOf(md) @@ -71,15 +76,10 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) { if exist == false { panic(ErrMissPK) } - if v3 != nil { - names = []string{mfi.column, rfi.column, last_md_col_name} - values = make([]interface{}, 0, len(models)*3) - } else { - names = []string{mfi.column, rfi.column} + names := []string{mfi.column, rfi.column} - values = make([]interface{}, 0, len(models)*2) - } + values := make([]interface{}, 0, len(models)*2) for _, md := range models { ind := reflect.Indirect(reflect.ValueOf(md)) @@ -92,17 +92,14 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) { panic(ErrMissPK) } } - if v3 == nil { - values = append(values, v1, v2) - } else { - values = append(values, v1, v2, v3) - } + values = append(values, v1, v2) } + names = append(names, other_names...) + values = append(values, other_values...) return dbase.InsertValue(orm.db, mi, true, names, values) } - // remove models following the origin model relationship func (o *queryM2M) Remove(mds ...interface{}) (int64, error) { fi := o.fi From 83696a40f6d37af56caadde97b90032937817237 Mon Sep 17 00:00:00 2001 From: nkbai Date: Fri, 20 Nov 2015 11:18:45 +0800 Subject: [PATCH 297/436] fix #1433 --- memzipfile.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/memzipfile.go b/memzipfile.go index cc5e3851..33152ba6 100644 --- a/memzipfile.go +++ b/memzipfile.go @@ -109,7 +109,7 @@ type memFileInfo struct { // Name returns the compressed filename. func (fi *memFileInfo) Name() string { - return fi.Name() + return fi.FileInfo.Name() } // Size returns the raw file content size, not compressed size. @@ -119,7 +119,7 @@ func (fi *memFileInfo) Size() int64 { // Mode returns file mode. func (fi *memFileInfo) Mode() os.FileMode { - return fi.Mode() + return fi.FileInfo.Mode() } // ModTime returns the last modified time of raw file. @@ -129,7 +129,7 @@ func (fi *memFileInfo) ModTime() time.Time { // IsDir returns the compressing file is a directory or not. func (fi *memFileInfo) IsDir() bool { - return fi.IsDir() + return fi.FileInfo.IsDir() } // return nil. implement the os.FileInfo interface method. From 50132df809e73105b1f4a96971627f9ea94e63ef Mon Sep 17 00:00:00 2001 From: nkbai Date: Fri, 20 Nov 2015 21:34:01 +0800 Subject: [PATCH 298/436] =?UTF-8?q?=E8=BF=99=E7=A7=8Dif=E5=9E=8B=E7=9A=84?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=98=AF=E6=9C=89=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs.go b/docs.go index 1dbed6cc..a660ddeb 100644 --- a/docs.go +++ b/docs.go @@ -21,12 +21,10 @@ import ( ) // GlobalDocAPI store the swagger api documents -var GlobalDocAPI map[string]interface{} +var GlobalDocAPI map[string]interface{}=make(map[string]interface{}) func init() { - if EnableDocs { - GlobalDocAPI = make(map[string]interface{}) - } + } func serverDocs(ctx *context.Context) { From 9170b91075fe0019df7861fd77b8332d0ba0c988 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sat, 21 Nov 2015 08:46:19 +0800 Subject: [PATCH 299/436] go style format (remove the blank after comments) --- context/acceptencoder.go | 4 ---- staticfile.go | 2 -- 2 files changed, 6 deletions(-) diff --git a/context/acceptencoder.go b/context/acceptencoder.go index 887459e1..1bd2cc3d 100644 --- a/context/acceptencoder.go +++ b/context/acceptencoder.go @@ -46,20 +46,17 @@ var ( ) // WriteFile reads from file and writes to writer by the specific encoding(gzip/deflate) - func WriteFile(encoding string, writer io.Writer, file *os.File) (bool, string, error) { return writeLevel(encoding, writer, file, flate.BestCompression) } // WriteBody reads writes content to writer by the specific encoding(gzip/deflate) - func WriteBody(encoding string, writer io.Writer, content []byte) (bool, string, error) { return writeLevel(encoding, writer, bytes.NewReader(content), flate.BestSpeed) } // writeLevel reads from reader,writes to writer by specific encoding and compress level // the compress level is defined by deflate package - func writeLevel(encoding string, writer io.Writer, reader io.Reader, level int) (bool, string, error) { var outputWriter io.Writer var err error @@ -90,7 +87,6 @@ func writeLevel(encoding string, writer io.Writer, reader io.Reader, level int) // ParseEncoding will extract the right encoding for response // the Accept-Encoding's sec is here: // http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.3 - func ParseEncoding(r *http.Request) string { if r == nil { return "" diff --git a/staticfile.go b/staticfile.go index cb57b133..e1d88b87 100644 --- a/staticfile.go +++ b/staticfile.go @@ -132,7 +132,6 @@ func isOk(s *serveContentHolder, fi os.FileInfo) bool { } // isStaticCompress detect static files - func isStaticCompress(filePath string) bool { for _, statExtension := range StaticExtensionsToGzip { if strings.HasSuffix(strings.ToLower(filePath), strings.ToLower(statExtension)) { @@ -182,7 +181,6 @@ func searchFile(ctx *context.Context) (string, os.FileInfo, error) { // lookupFile find the file to serve // if the file is dir ,search the index.html as default file( MUST NOT A DIR also) // if the index.html not exist or is a dir, give a forbidden response depending on DirectoryIndex - func lookupFile(ctx *context.Context) (bool, string, os.FileInfo, error) { fp, fi, err := searchFile(ctx) if fp == "" || fi == nil { From 5e915cb614c1e8590c146a398cf08638de797b96 Mon Sep 17 00:00:00 2001 From: nkbai Date: Tue, 24 Nov 2015 14:55:59 +0800 Subject: [PATCH 300/436] =?UTF-8?q?controller=5Ftest.go=20=E6=97=A2?= =?UTF-8?q?=E7=84=B6=E5=8F=ABtest=EF=BC=8C=E9=82=A3=E5=B0=B1=E6=8C=89?= =?UTF-8?q?=E7=85=A7go=E7=9A=84=E8=A7=84=E5=88=99=E8=BF=9B=E8=A1=8Ctest?= =?UTF-8?q?=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller_test.go | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/controller_test.go b/controller_test.go index 15938cdc..4156bd29 100644 --- a/controller_test.go +++ b/controller_test.go @@ -17,42 +17,48 @@ package beego import ( "fmt" "github.com/astaxie/beego/context" + "testing" ) -func ExampleGetInt() { +func TestGetInt(t *testing.T) { i := &context.BeegoInput{Params: map[string]string{"age": "40"}} ctx := &context.Context{Input: i} ctrlr := Controller{Ctx: ctx} val, _ := ctrlr.GetInt("age") - fmt.Printf("%T", val) - //Output: int + + if (val != 40) { + t.Errorf("TestGetInt expect 40,get %T,%v", val, val) + } } -func ExampleGetInt8() { +func TestGetInt8(t *testing.T) { i := &context.BeegoInput{Params: map[string]string{"age": "40"}} ctx := &context.Context{Input: i} ctrlr := Controller{Ctx: ctx} val, _ := ctrlr.GetInt8("age") - fmt.Printf("%T", val) + if val != 40 { + t.Errorf("TestGetInt8 expect 40,get %T,%v", val, val) + } //Output: int8 } -func ExampleGetInt16() { +func TestGetInt16(t *testing.T) { i := &context.BeegoInput{Params: map[string]string{"age": "40"}} ctx := &context.Context{Input: i} ctrlr := Controller{Ctx: ctx} val, _ := ctrlr.GetInt16("age") - fmt.Printf("%T", val) - //Output: int16 + if val != 40 { + t.Errorf("TestGetInt16 expect 40,get %T,%v", val, val) + } } -func ExampleGetInt32() { +func TestGetInt32(t *testing.T) { i := &context.BeegoInput{Params: map[string]string{"age": "40"}} ctx := &context.Context{Input: i} @@ -60,16 +66,19 @@ func ExampleGetInt32() { val, _ := ctrlr.GetInt32("age") fmt.Printf("%T", val) - //Output: int32 + if val != 40 { + t.Errorf("TestGetInt32 expect 40,get %T,%v", val, val) + } } -func ExampleGetInt64() { +func TestGetInt64(t *testing.T) { i := &context.BeegoInput{Params: map[string]string{"age": "40"}} ctx := &context.Context{Input: i} ctrlr := Controller{Ctx: ctx} val, _ := ctrlr.GetInt64("age") - fmt.Printf("%T", val) - //Output: int64 + if val != 40 { + t.Errorf("TestGeetInt64 expect 40,get %T,%v", val, val) + } } From b7fcd4f0b95164fa5cb1114fa5ee56cba6ae1844 Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 24 Nov 2015 23:00:07 +0800 Subject: [PATCH 301/436] Revert "Adding support for junction tables with other fields which arent FK and PK." --- orm/orm_querym2m.go | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/orm/orm_querym2m.go b/orm/orm_querym2m.go index 36c5e95f..1eaccf72 100644 --- a/orm/orm_querym2m.go +++ b/orm/orm_querym2m.go @@ -44,20 +44,7 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) { dbase := orm.alias.DbBaser var models []interface{} - var other_values []interface{} - var other_names []string - for _, colname := range mi.fields.dbcols { - if colname != mfi.column && colname != rfi.column && colname != fi.mi.fields.pk.column { - other_names = append(other_names, colname) - } - } - for i, md := range mds { - if reflect.Indirect(reflect.ValueOf(md)).Kind() != reflect.Struct && i > 0 { - other_values = append(other_values, md) - mds = append(mds[:i], mds[i+1:]...) - } - } for _, md := range mds { val := reflect.ValueOf(md) if val.Kind() == reflect.Slice || val.Kind() == reflect.Array { @@ -80,9 +67,11 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) { names := []string{mfi.column, rfi.column} values := make([]interface{}, 0, len(models)*2) + for _, md := range models { ind := reflect.Indirect(reflect.ValueOf(md)) + var v2 interface{} if ind.Kind() != reflect.Struct { v2 = ind.Interface() @@ -92,11 +81,11 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) { panic(ErrMissPK) } } + values = append(values, v1, v2) } - names = append(names, other_names...) - values = append(values, other_values...) + return dbase.InsertValue(orm.db, mi, true, names, values) } From f0474214fec6bc6643f3a4bd83333c59e5feb430 Mon Sep 17 00:00:00 2001 From: nkbai Date: Wed, 25 Nov 2015 23:39:26 +0800 Subject: [PATCH 302/436] =?UTF-8?q?GetInt=E7=AD=89=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E7=A8=8D=E5=BE=AE=E7=AE=80=E5=8C=96=E4=B8=80=E4=B8=8B,?= =?UTF-8?q?=E8=BF=99=E6=A0=B7=E7=9C=8B=E4=B8=8A=E5=8E=BB=E6=9B=B4=E5=90=88?= =?UTF-8?q?=E7=90=86=E4=B8=80=E4=BA=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller.go | 71 +++++++++++++++++---------------------------------- 1 file changed, 24 insertions(+), 47 deletions(-) diff --git a/controller.go b/controller.go index 0750daf4..79f3349b 100644 --- a/controller.go +++ b/controller.go @@ -413,91 +413,68 @@ func (c *Controller) GetStrings(key string, def ...[]string) []string { // GetInt returns input as an int or the default value while it's present and input is blank func (c *Controller) GetInt(key string, def ...int) (int, error) { - if strv := c.Ctx.Input.Query(key); strv != "" { - return strconv.Atoi(strv) - } else if len(def) > 0 { + strv := c.Ctx.Input.Query(key) + if len(strv) == 0 && len(def) > 0 { return def[0], nil - } else { - return strconv.Atoi(strv) } + return strconv.Atoi(strv) } // GetInt8 return input as an int8 or the default value while it's present and input is blank func (c *Controller) GetInt8(key string, def ...int8) (int8, error) { - if strv := c.Ctx.Input.Query(key); strv != "" { - i64, err := strconv.ParseInt(strv, 10, 8) - i8 := int8(i64) - return i8, err - } else if len(def) > 0 { + strv := c.Ctx.Input.Query(key) + if len(strv) == 0 && len(def) > 0 { return def[0], nil - } else { - i64, err := strconv.ParseInt(strv, 10, 8) - i8 := int8(i64) - return i8, err } + i64, err := strconv.ParseInt(strv, 10, 8) + return int8(i64), err } // GetInt16 returns input as an int16 or the default value while it's present and input is blank func (c *Controller) GetInt16(key string, def ...int16) (int16, error) { - if strv := c.Ctx.Input.Query(key); strv != "" { - i64, err := strconv.ParseInt(strv, 10, 16) - i16 := int16(i64) - return i16, err - } else if len(def) > 0 { + strv := c.Ctx.Input.Query(key) + if len(strv) == 0 && len(def) > 0 { return def[0], nil - } else { - i64, err := strconv.ParseInt(strv, 10, 16) - i16 := int16(i64) - return i16, err } + i64, err := strconv.ParseInt(strv, 10, 16) + return int16(i64), err } // GetInt32 returns input as an int32 or the default value while it's present and input is blank func (c *Controller) GetInt32(key string, def ...int32) (int32, error) { - if strv := c.Ctx.Input.Query(key); strv != "" { - i64, err := strconv.ParseInt(c.Ctx.Input.Query(key), 10, 32) - i32 := int32(i64) - return i32, err - } else if len(def) > 0 { + strv := c.Ctx.Input.Query(key) + if len(strv) == 0 && len(def) > 0 { return def[0], nil - } else { - i64, err := strconv.ParseInt(c.Ctx.Input.Query(key), 10, 32) - i32 := int32(i64) - return i32, err } + i64, err := strconv.ParseInt(strv, 10, 32) + return int32(i64), err } // GetInt64 returns input value as int64 or the default value while it's present and input is blank. func (c *Controller) GetInt64(key string, def ...int64) (int64, error) { - if strv := c.Ctx.Input.Query(key); strv != "" { - return strconv.ParseInt(strv, 10, 64) - } else if len(def) > 0 { + strv := c.Ctx.Input.Query(key) + if len(strv) == 0 && len(def) > 0 { return def[0], nil - } else { - return strconv.ParseInt(strv, 10, 64) } + return strconv.ParseInt(strv, 10, 64) } // GetBool returns input value as bool or the default value while it's present and input is blank. func (c *Controller) GetBool(key string, def ...bool) (bool, error) { - if strv := c.Ctx.Input.Query(key); strv != "" { - return strconv.ParseBool(strv) - } else if len(def) > 0 { + strv := c.Ctx.Input.Query(key) + if len(strv) == 0 && len(def) > 0 { return def[0], nil - } else { - return strconv.ParseBool(strv) } + return strconv.ParseBool(strv) } // GetFloat returns input value as float64 or the default value while it's present and input is blank. func (c *Controller) GetFloat(key string, def ...float64) (float64, error) { - if strv := c.Ctx.Input.Query(key); strv != "" { - return strconv.ParseFloat(strv, 64) - } else if len(def) > 0 { + strv := c.Ctx.Input.Query(key) + if len(strv) == 0 && len(def) > 0 { return def[0], nil - } else { - return strconv.ParseFloat(strv, 64) } + return strconv.ParseFloat(strv, 64) } // GetFile returns the file data in file upload field named as key. From 6aaca2eca8f04e14a78c0ca324ce6a8d066f3d02 Mon Sep 17 00:00:00 2001 From: nkbai Date: Thu, 26 Nov 2015 14:56:39 +0800 Subject: [PATCH 303/436] =?UTF-8?q?router.go=20Header=20=E6=AF=AB=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E5=A4=84=20context/output.go=20=E7=AE=80=E5=8C=96?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=E4=BB=A3=E7=A0=81,=E6=9B=B4=E6=B8=85?= =?UTF-8?q?=E6=99=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- context/output.go | 8 ++------ router.go | 4 ---- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/context/output.go b/context/output.go index d132e392..0a194753 100644 --- a/context/output.go +++ b/context/output.go @@ -66,7 +66,6 @@ func (output *BeegoOutput) Body(content []byte) { if val == "gzip" { output.Header("Content-Encoding", "gzip") outputWriter, _ = gzip.NewWriterLevel(output.Context.ResponseWriter, gzip.BestSpeed) - break } else if val == "deflate" { output.Header("Content-Encoding", "deflate") @@ -86,11 +85,8 @@ func (output *BeegoOutput) Body(content []byte) { } outputWriter.Write(content) - switch outputWriter.(type) { - case *gzip.Writer: - outputWriter.(*gzip.Writer).Close() - case *flate.Writer: - outputWriter.(*flate.Writer).Close() + if c, ok := outputWriter.(io.Closer); ok { + c.Close() } } diff --git a/router.go b/router.go index 1e8144bf..5c6b7bf9 100644 --- a/router.go +++ b/router.go @@ -897,10 +897,6 @@ type responseWriter struct { status int } -// Header returns the header map that will be sent by WriteHeader. -func (w *responseWriter) Header() http.Header { - return w.ResponseWriter.Header() -} // Write writes the data to the connection as part of an HTTP reply, // and sets `started` to true. From d693ecf046be6cae8af4b879a0293694c05e130d Mon Sep 17 00:00:00 2001 From: nkbai Date: Thu, 26 Nov 2015 20:37:36 +0800 Subject: [PATCH 304/436] =?UTF-8?q?Revert=20"=E8=BF=99=E7=A7=8Dif=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E5=88=9D=E5=A7=8B=E5=8C=96=E6=98=AF=E6=9C=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E7=9A=84"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 50132df809e73105b1f4a96971627f9ea94e63ef. --- docs.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs.go b/docs.go index a660ddeb..1dbed6cc 100644 --- a/docs.go +++ b/docs.go @@ -21,10 +21,12 @@ import ( ) // GlobalDocAPI store the swagger api documents -var GlobalDocAPI map[string]interface{}=make(map[string]interface{}) +var GlobalDocAPI map[string]interface{} func init() { - + if EnableDocs { + GlobalDocAPI = make(map[string]interface{}) + } } func serverDocs(ctx *context.Context) { From 2c8cb5693ee650b4352926cf178d5d24786698ff Mon Sep 17 00:00:00 2001 From: nkbai Date: Fri, 27 Nov 2015 12:10:39 +0800 Subject: [PATCH 305/436] =?UTF-8?q?windows=E4=B8=8B=E9=9D=99=E6=80=81?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=98=A0=E5=B0=84=E6=89=BE=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98,=20path.Clean=E5=92=8Cfilepath.Clean?= =?UTF-8?q?=E6=98=AF=E6=9C=89=E5=8C=BA=E5=88=AB=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- staticfile.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/staticfile.go b/staticfile.go index de530b0c..56c5fc08 100644 --- a/staticfile.go +++ b/staticfile.go @@ -18,20 +18,18 @@ import ( "net/http" "os" "path" - "path/filepath" "strconv" "strings" - "github.com/astaxie/beego/context" "github.com/astaxie/beego/utils" ) func serverStaticRouter(ctx *context.Context) { + if ctx.Input.Method() != "GET" && ctx.Input.Method() != "HEAD" { return } - requestPath := filepath.Clean(ctx.Input.Request.URL.Path) - + requestPath := path.Clean(ctx.Input.Request.URL.Path) // special processing : favicon.ico/robots.txt can be in any static dir if requestPath == "/favicon.ico" || requestPath == "/robots.txt" { file := path.Join(".", requestPath) From 7151b96465b1456a12407e34b67e5aff2be24a71 Mon Sep 17 00:00:00 2001 From: "Ryan A. Chapman" Date: Sun, 29 Nov 2015 15:09:28 -0700 Subject: [PATCH 306/436] Log config parsing errors Beego currently handles the case of "conf/app.conf" not existing, but all other errors are not logged. This fixes that. I ran into an issue where beego was not listening on the correct port, and it turned out that the conf/app.conf file had a colon ":" instead of an equal sign "=" (confusion of INI vs YAML formats). When there was a parsing error, beego would give up on parsing app.conf and not log anything to the console. --- config.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/config.go b/config.go index d9ff624c..85da1c30 100644 --- a/config.go +++ b/config.go @@ -354,10 +354,12 @@ func init() { SetLogFuncCall(true) err = ParseConfig() - if err != nil && os.IsNotExist(err) { - // for init if doesn't have app.conf will not panic - ac := config.NewFakeConfig() - AppConfig = &beegoAppConfig{ac} + if err != nil { + if os.IsNotExist(err) { + // for init if doesn't have app.conf will not panic + ac := config.NewFakeConfig() + AppConfig = &beegoAppConfig{ac} + } Warning(err) } } From 74ebcd28b2d62e0c7c4bd892742a5f751174bdec Mon Sep 17 00:00:00 2001 From: nkbai Date: Mon, 30 Nov 2015 16:15:35 +0800 Subject: [PATCH 307/436] =?UTF-8?q?grace=20init=E4=B8=AD=E7=9A=84=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E5=8F=AF=E4=BB=A5=E5=BB=B6=E5=90=8E=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=20=E5=AE=9E=E9=99=85=E4=B8=8A=E5=A6=82=E6=9E=9C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E4=BD=BF=E7=94=A8graceful=E5=90=AF=E5=8A=A8,=E8=BF=99?= =?UTF-8?q?=E4=BA=9Binit=E7=9A=84=E5=B7=A5=E4=BD=9C=E5=AE=8C=E5=85=A8?= =?UTF-8?q?=E6=B2=A1=E7=94=A8=20=E5=BD=93=E7=84=B6=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B9=9F=E5=BA=94=E8=AF=A5=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E8=BF=99=E6=A0=B7=E7=9A=84=E5=B7=A5=E4=BD=9C,=E6=AF=94?= =?UTF-8?q?=E5=A6=82session=E4=B8=AD=E7=9A=84sess=5Futils.go=E4=B8=AD?= =?UTF-8?q?=E7=9A=84init=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- grace/grace.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/grace/grace.go b/grace/grace.go index b066a639..40eef144 100644 --- a/grace/grace.go +++ b/grace/grace.go @@ -86,23 +86,25 @@ var ( isChild bool socketOrder string + once sync.Once=sync.Once{} ) func init() { + DefaultMaxHeaderBytes = 0 + DefaultTimeout = 60 * time.Second +} +func onceInit(){ regLock = &sync.Mutex{} flag.BoolVar(&isChild, "graceful", false, "listen on open fd (after forking)") flag.StringVar(&socketOrder, "socketorder", "", "previous initialization order - used when more than one listener was started") runningServers = make(map[string]*Server) runningServersOrder = []string{} socketPtrOffsetMap = make(map[string]uint) - - DefaultMaxHeaderBytes = 0 - - DefaultTimeout = 60 * time.Second } // NewServer returns a new graceServer. func NewServer(addr string, handler http.Handler) (srv *Server) { + once.Do(onceInit) regLock.Lock() defer regLock.Unlock() if !flag.Parsed() { From 50f8f3bd2075e919ceea3191371a387459d78b70 Mon Sep 17 00:00:00 2001 From: gobenon Date: Mon, 30 Nov 2015 18:23:58 +0200 Subject: [PATCH 308/436] Update orm_querym2m.go --- orm/orm_querym2m.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orm/orm_querym2m.go b/orm/orm_querym2m.go index 36c5e95f..99a8aec0 100644 --- a/orm/orm_querym2m.go +++ b/orm/orm_querym2m.go @@ -55,7 +55,7 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) { for i, md := range mds { if reflect.Indirect(reflect.ValueOf(md)).Kind() != reflect.Struct && i > 0 { other_values = append(other_values, md) - mds = append(mds[:i], mds[i+1:]...) + mds = append(mds[:1], mds[2:]...) } } for _, md := range mds { From ed99c013a6f5412cff69f660285862855e389a2a Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 2 Dec 2015 16:35:36 +0800 Subject: [PATCH 309/436] Revert "Update orm_querym2m.go" --- orm/orm_querym2m.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orm/orm_querym2m.go b/orm/orm_querym2m.go index 99a8aec0..36c5e95f 100644 --- a/orm/orm_querym2m.go +++ b/orm/orm_querym2m.go @@ -55,7 +55,7 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) { for i, md := range mds { if reflect.Indirect(reflect.ValueOf(md)).Kind() != reflect.Struct && i > 0 { other_values = append(other_values, md) - mds = append(mds[:1], mds[2:]...) + mds = append(mds[:i], mds[i+1:]...) } } for _, md := range mds { From 82e0105d22b9defd73c1d8815f9ff9f3952b2692 Mon Sep 17 00:00:00 2001 From: nkbai Date: Fri, 4 Dec 2015 23:15:06 +0800 Subject: [PATCH 310/436] =?UTF-8?q?Revert=20"windows=E4=B8=8B=E9=9D=99?= =?UTF-8?q?=E6=80=81=E6=96=87=E4=BB=B6=E6=98=A0=E5=B0=84=E6=89=BE=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E9=97=AE=E9=A2=98,"=20windows=E4=B8=8B=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E9=9C=80=E8=A6=81filepath.ToSlash?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2c8cb5693ee650b4352926cf178d5d24786698ff. --- staticfile.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/staticfile.go b/staticfile.go index 90d0be0d..f2eb0654 100644 --- a/staticfile.go +++ b/staticfile.go @@ -19,6 +19,7 @@ import ( "net/http" "os" "path" + "path/filepath" "strconv" "strings" "sync" @@ -143,7 +144,7 @@ func isStaticCompress(filePath string) bool { // searchFile search the file by url path // if none the static file prefix matches ,return notStaticRequestErr func searchFile(ctx *context.Context) (string, os.FileInfo, error) { - requestPath := path.Clean(ctx.Input.Request.URL.Path) + requestPath := filepath.ToSlash(filepath.Clean(ctx.Input.Request.URL.Path)) // special processing : favicon.ico/robots.txt can be in any static dir if requestPath == "/favicon.ico" || requestPath == "/robots.txt" { file := path.Join(".", requestPath) @@ -188,7 +189,7 @@ func lookupFile(ctx *context.Context) (bool, string, os.FileInfo, error) { if !fi.IsDir() { return false, fp, fi, err } - ifp := path.Join(fp, "index.html") + ifp := filepath.Join(fp, "index.html") if ifi, _ := os.Stat(ifp); ifi != nil && ifi.Mode().IsRegular() { return false, ifp, ifi, err } From e8fe859a58dee7172a29236c74c01e290b9a47ad Mon Sep 17 00:00:00 2001 From: nkbai Date: Wed, 9 Dec 2015 09:03:10 +0800 Subject: [PATCH 311/436] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- grace/grace.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/grace/grace.go b/grace/grace.go index 40eef144..355e5d1a 100644 --- a/grace/grace.go +++ b/grace/grace.go @@ -53,18 +53,18 @@ import ( ) const ( - // PreSignal is the position to add filter before signal +// PreSignal is the position to add filter before signal PreSignal = iota - // PostSignal is the position to add filter after signal +// PostSignal is the position to add filter after signal PostSignal - // StateInit represent the application inited +// StateInit represent the application inited StateInit - // StateRunning represent the application is running +// StateRunning represent the application is running StateRunning - // StateShuttingDown represent the application is shutting down +// StateShuttingDown represent the application is shutting down StateShuttingDown - // StateTerminate represent the application is killed +// StateTerminate represent the application is killed StateTerminate ) @@ -75,25 +75,25 @@ var ( socketPtrOffsetMap map[string]uint runningServersForked bool - // DefaultReadTimeOut is the HTTP read timeout +// DefaultReadTimeOut is the HTTP read timeout DefaultReadTimeOut time.Duration - // DefaultWriteTimeOut is the HTTP Write timeout +// DefaultWriteTimeOut is the HTTP Write timeout DefaultWriteTimeOut time.Duration - // DefaultMaxHeaderBytes is the Max HTTP Herder size, default is 0, no limit +// DefaultMaxHeaderBytes is the Max HTTP Herder size, default is 0, no limit DefaultMaxHeaderBytes int - // DefaultTimeout is the shutdown server's timeout. default is 60s +// DefaultTimeout is the shutdown server's timeout. default is 60s DefaultTimeout time.Duration - isChild bool + isChild bool socketOrder string - once sync.Once=sync.Once{} + once sync.Once ) func init() { DefaultMaxHeaderBytes = 0 DefaultTimeout = 60 * time.Second } -func onceInit(){ +func onceInit() { regLock = &sync.Mutex{} flag.BoolVar(&isChild, "graceful", false, "listen on open fd (after forking)") flag.StringVar(&socketOrder, "socketorder", "", "previous initialization order - used when more than one listener was started") From d1bba02958805ac40dd3b8c0d7f7a1ab744cf1b4 Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 9 Dec 2015 23:35:04 +0800 Subject: [PATCH 312/436] refact beego config --- admin.go | 49 +-- app.go | 50 +-- beego.go | 38 +- config.go | 762 ++++++++++++++++------------------- config_test.go | 4 +- controller.go | 18 +- controller_test.go | 18 +- docs.go | 2 +- error.go | 4 +- filter_test.go | 6 + flash.go | 10 +- hooks.go | 28 +- parser.go | 12 +- plugins/cors/cors_test.go | 4 +- plugins/jwt/jwt.go | 140 ------- plugins/jwt/jwt_test.go | 88 ---- plugins/jwt/test/jwt.rsa | 15 - plugins/jwt/test/jwt.rsa.pub | 6 - router.go | 36 +- staticfile.go | 14 +- template.go | 12 +- 21 files changed, 485 insertions(+), 831 deletions(-) delete mode 100644 plugins/jwt/jwt.go delete mode 100644 plugins/jwt/jwt_test.go delete mode 100644 plugins/jwt/test/jwt.rsa delete mode 100644 plugins/jwt/test/jwt.rsa.pub diff --git a/admin.go b/admin.go index ddc936ef..a1f48fa0 100644 --- a/admin.go +++ b/admin.go @@ -85,50 +85,11 @@ func listConf(rw http.ResponseWriter, r *http.Request) { data := make(map[interface{}]interface{}) switch command { case "conf": - m := make(map[string]interface{}) - - m["AppName"] = AppName - m["AppPath"] = AppPath - m["AppConfigPath"] = AppConfigPath - m["StaticDir"] = StaticDir - m["StaticExtensionsToGzip"] = StaticExtensionsToGzip - m["HTTPAddr"] = HTTPAddr - m["HTTPPort"] = HTTPPort - m["HTTPTLS"] = EnableHTTPTLS - m["HTTPCertFile"] = HTTPCertFile - m["HTTPKeyFile"] = HTTPKeyFile - m["RecoverPanic"] = RecoverPanic - m["AutoRender"] = AutoRender - m["ViewsPath"] = ViewsPath - m["RunMode"] = RunMode - m["SessionOn"] = SessionOn - m["SessionProvider"] = SessionProvider - m["SessionName"] = SessionName - m["SessionGCMaxLifetime"] = SessionGCMaxLifetime - m["SessionProviderConfig"] = SessionProviderConfig - m["SessionCookieLifeTime"] = SessionCookieLifeTime - m["EnableFcgi"] = EnableFcgi - m["MaxMemory"] = MaxMemory - m["EnableGzip"] = EnableGzip - m["DirectoryIndex"] = DirectoryIndex - m["HTTPServerTimeOut"] = HTTPServerTimeOut - m["EnableErrorsShow"] = EnableErrorsShow - m["XSRFKEY"] = XSRFKEY - m["EnableXSRF"] = EnableXSRF - m["XSRFExpire"] = XSRFExpire - m["CopyRequestBody"] = CopyRequestBody - m["TemplateLeft"] = TemplateLeft - m["TemplateRight"] = TemplateRight - m["BeegoServerName"] = BeegoServerName - m["EnableAdmin"] = EnableAdmin - m["AdminHTTPAddr"] = AdminHTTPAddr - m["AdminHTTPPort"] = AdminHTTPPort - tmpl := template.Must(template.New("dashboard").Parse(dashboardTpl)) tmpl = template.Must(tmpl.Parse(configTpl)) tmpl = template.Must(tmpl.Parse(defaultScriptsTpl)) - data["Content"] = m + data["Content"] = BConfig tmpl.Execute(rw, data) @@ -391,10 +352,10 @@ func (admin *adminApp) Run() { if len(toolbox.AdminTaskList) > 0 { toolbox.StartTask() } - addr := AdminHTTPAddr + addr := BConfig.Listen.AdminAddr - if AdminHTTPPort != 0 { - addr = fmt.Sprintf("%s:%d", AdminHTTPAddr, AdminHTTPPort) + if BConfig.Listen.AdminPort != 0 { + addr = fmt.Sprintf("%s:%d", BConfig.Listen.AdminAddr, BConfig.Listen.AdminPort) } for p, f := range admin.routers { http.Handle(p, f) @@ -402,7 +363,7 @@ func (admin *adminApp) Run() { BeeLogger.Info("Admin server Running on %s", addr) var err error - if Graceful { + if BConfig.Listen.Graceful { err = grace.ListenAndServe(addr, nil) } else { err = http.ListenAndServe(addr, nil) diff --git a/app.go b/app.go index ed57b978..e8d1bc47 100644 --- a/app.go +++ b/app.go @@ -52,10 +52,10 @@ func NewApp() *App { // Run beego application. func (app *App) Run() { - addr := HTTPAddr + addr := BConfig.Listen.HTTPAddr - if HTTPPort != 0 { - addr = fmt.Sprintf("%s:%d", HTTPAddr, HTTPPort) + if BConfig.Listen.HTTPPort != 0 { + addr = fmt.Sprintf("%s:%d", BConfig.Listen.HTTPAddr, BConfig.Listen.HTTPPort) } var ( @@ -64,8 +64,8 @@ func (app *App) Run() { ) endRunning := make(chan bool, 1) - if EnableFcgi { - if EnableStdIo { + if BConfig.Listen.EnableFcgi { + if BConfig.Listen.EnableStdIo { err = fcgi.Serve(nil, app.Handlers) // standard I/O if err == nil { BeeLogger.Info("Use FCGI via standard I/O") @@ -73,7 +73,7 @@ func (app *App) Run() { BeeLogger.Info("Cannot use FCGI via standard I/O", err) } } else { - if HTTPPort == 0 { + if BConfig.Listen.HTTPPort == 0 { // remove the Socket file before start if utils.FileExists(addr) { os.Remove(addr) @@ -88,23 +88,23 @@ func (app *App) Run() { err = fcgi.Serve(l, app.Handlers) } } else { - if Graceful { - httpsAddr := addr - app.Server.Addr = addr + if BConfig.Listen.Graceful { + httpsAddr := BConfig.Listen.HTTPSAddr + app.Server.Addr = httpsAddr app.Server.Handler = app.Handlers - app.Server.ReadTimeout = time.Duration(HTTPServerTimeOut) * time.Second - app.Server.WriteTimeout = time.Duration(HTTPServerTimeOut) * time.Second - if EnableHTTPTLS { + app.Server.ReadTimeout = time.Duration(BConfig.Listen.ServerTimeOut) * time.Second + app.Server.WriteTimeout = time.Duration(BConfig.Listen.ServerTimeOut) * time.Second + if BConfig.Listen.HTTPSEnable { go func() { time.Sleep(20 * time.Microsecond) - if HTTPSPort != 0 { - httpsAddr = fmt.Sprintf("%s:%d", HTTPAddr, HTTPSPort) + if BConfig.Listen.HTTPSPort != 0 { + httpsAddr = fmt.Sprintf("%s:%d", BConfig.Listen.HTTPSAddr, BConfig.Listen.HTTPSPort) app.Server.Addr = httpsAddr } server := grace.NewServer(httpsAddr, app.Handlers) server.Server.ReadTimeout = app.Server.ReadTimeout server.Server.WriteTimeout = app.Server.WriteTimeout - err := server.ListenAndServeTLS(HTTPCertFile, HTTPKeyFile) + err := server.ListenAndServeTLS(BConfig.Listen.HTTPSCertFile, BConfig.Listen.HTTPSKeyFile) if err != nil { BeeLogger.Critical("ListenAndServeTLS: ", err, fmt.Sprintf("%d", os.Getpid())) time.Sleep(100 * time.Microsecond) @@ -112,12 +112,12 @@ func (app *App) Run() { } }() } - if EnableHTTPListen { + if BConfig.Listen.HTTPEnable { go func() { server := grace.NewServer(addr, app.Handlers) server.Server.ReadTimeout = app.Server.ReadTimeout server.Server.WriteTimeout = app.Server.WriteTimeout - if ListenTCP4 { + if BConfig.Listen.ListenTCP4 { server.Network = "tcp4" } err := server.ListenAndServe() @@ -131,17 +131,17 @@ func (app *App) Run() { } else { app.Server.Addr = addr app.Server.Handler = app.Handlers - app.Server.ReadTimeout = time.Duration(HTTPServerTimeOut) * time.Second - app.Server.WriteTimeout = time.Duration(HTTPServerTimeOut) * time.Second + app.Server.ReadTimeout = time.Duration(BConfig.Listen.ServerTimeOut) * time.Second + app.Server.WriteTimeout = time.Duration(BConfig.Listen.ServerTimeOut) * time.Second - if EnableHTTPTLS { + if BConfig.Listen.HTTPSEnable { go func() { time.Sleep(20 * time.Microsecond) - if HTTPSPort != 0 { - app.Server.Addr = fmt.Sprintf("%s:%d", HTTPAddr, HTTPSPort) + if BConfig.Listen.HTTPSPort != 0 { + app.Server.Addr = fmt.Sprintf("%s:%d", BConfig.Listen.HTTPSAddr, BConfig.Listen.HTTPSPort) } BeeLogger.Info("https server Running on %s", app.Server.Addr) - err := app.Server.ListenAndServeTLS(HTTPCertFile, HTTPKeyFile) + err := app.Server.ListenAndServeTLS(BConfig.Listen.HTTPSCertFile, BConfig.Listen.HTTPSKeyFile) if err != nil { BeeLogger.Critical("ListenAndServeTLS: ", err) time.Sleep(100 * time.Microsecond) @@ -150,11 +150,11 @@ func (app *App) Run() { }() } - if EnableHTTPListen { + if BConfig.Listen.HTTPEnable { go func() { app.Server.Addr = addr BeeLogger.Info("http server Running on %s", app.Server.Addr) - if ListenTCP4 { + if BConfig.Listen.ListenTCP4 { ln, err := net.Listen("tcp4", app.Server.Addr) if err != nil { BeeLogger.Critical("ListenAndServe: ", err) diff --git a/beego.go b/beego.go index 6c964d5a..a4d996e3 100644 --- a/beego.go +++ b/beego.go @@ -15,10 +15,13 @@ package beego import ( + "fmt" "os" "path/filepath" "strconv" "strings" + + "github.com/astaxie/beego/logs" ) // beego web framework version. @@ -49,10 +52,10 @@ func Run(params ...string) { if len(params) > 0 && params[0] != "" { strs := strings.Split(params[0], ":") if len(strs) > 0 && strs[0] != "" { - HTTPAddr = strs[0] + BConfig.Listen.HTTPAddr = strs[0] } if len(strs) > 1 && strs[1] != "" { - HTTPPort, _ = strconv.Atoi(strs[1]) + BConfig.Listen.HTTPPort, _ = strconv.Atoi(strs[1]) } } @@ -60,15 +63,22 @@ func Run(params ...string) { } func initBeforeHTTPRun() { - // if AppConfigPath not In the conf/app.conf reParse config - if AppConfigPath != filepath.Join(AppPath, "conf", "app.conf") { - err := ParseConfig() - if err != nil && AppConfigPath != filepath.Join(workPath, "conf", "app.conf") { - // configuration is critical to app, panic here if parse failed - panic(err) + // if AppConfigPath is setted or conf/app.conf exist + err := ParseConfig() + if err != nil { + panic(err) + } + //init log + BeeLogger = logs.NewLogger(10000) + for adaptor, config := range BConfig.Log.Output { + err = BeeLogger.SetLogger(adaptor, config) + if err != nil { + fmt.Printf("%s with the config `%s` got err:%s\n", adaptor, config, err) } } + SetLogFuncCall(BConfig.Log.FileLineNum) + //init hooks AddAPPStartHook(registerMime) AddAPPStartHook(registerDefaultErrorHandler) @@ -85,15 +95,9 @@ func initBeforeHTTPRun() { } // TestBeegoInit is for test package init -func TestBeegoInit(apppath string) { - AppPath = apppath +func TestBeegoInit(ap string) { os.Setenv("BEEGO_RUNMODE", "test") - AppConfigPath = filepath.Join(AppPath, "conf", "app.conf") - err := ParseConfig() - if err != nil && !os.IsNotExist(err) { - // for init if doesn't have app.conf will not panic - Info(err) - } - os.Chdir(AppPath) + AppConfigPath = filepath.Join(ap, "conf", "app.conf") + os.Chdir(ap) initBeforeHTTPRun() } diff --git a/config.go b/config.go index 85da1c30..85b3eede 100644 --- a/config.go +++ b/config.go @@ -15,131 +15,372 @@ package beego import ( - "fmt" "html/template" "os" "path/filepath" - "runtime" "strings" "github.com/astaxie/beego/config" - "github.com/astaxie/beego/logs" "github.com/astaxie/beego/session" "github.com/astaxie/beego/utils" ) +type BeegoConfig struct { + AppName string //Application name + RunMode string //Running Mode: dev | prod + RouterCaseSensitive bool + ServerName string + RecoverPanic bool + CopyRequestBody bool + EnableGzip bool + MaxMemory int64 + EnableErrorsShow bool + Listen Listen + WebConfig WebConfig + Log LogConfig +} + +type Listen struct { + Graceful bool // Graceful means use graceful module to start the server + ServerTimeOut int64 + ListenTCP4 bool + HTTPEnable bool + HTTPAddr string + HTTPPort int + HTTPSEnable bool + HTTPSAddr string + HTTPSPort int + HTTPSCertFile string + HTTPSKeyFile string + AdminEnable bool + AdminAddr string + AdminPort int + EnableFcgi bool + EnableStdIo bool // EnableStdIo works with EnableFcgi Use FCGI via standard I/O +} + +type WebConfig struct { + AutoRender bool + EnableDocs bool + FlashName string + FlashSeperator string + DirectoryIndex bool + StaticDir map[string]string + StaticExtensionsToGzip []string + TemplateLeft string + TemplateRight string + ViewsPath string + EnableXSRF bool + XSRFKEY string + XSRFExpire int + Session SessionConfig +} + +type SessionConfig struct { + SessionOn bool + SessionProvider string + SessionName string + SessionGCMaxLifetime int64 + SessionProviderConfig string + SessionCookieLifeTime int + SessionAutoSetCookie bool + SessionDomain string +} + +type LogConfig struct { + AccessLogs bool + FileLineNum bool + Output map[string]string // Store Adaptor : config +} + var ( - // AccessLogs represent whether output the access logs, default is false - AccessLogs bool - // AdminHTTPAddr is address for admin - AdminHTTPAddr string - // AdminHTTPPort is listens port for admin - AdminHTTPPort int + // BConfig is the default config for Application + BConfig *BeegoConfig // AppConfig is the instance of Config, store the config information from file AppConfig *beegoAppConfig - // AppName represent Application name, always the project folder name - AppName string - // AppPath is the path to the application - AppPath string // AppConfigPath is the path to the config files AppConfigPath string // AppConfigProvider is the provider for the config, default is ini - AppConfigProvider string - // AutoRender is a flag of render template automatically. It's always turn off in API application - // default is true - AutoRender bool - // BeegoServerName exported in response header. - BeegoServerName string - // CopyRequestBody is just useful for raw request body in context. default is false - CopyRequestBody bool - // DirectoryIndex wheather display directory index. default is false. - DirectoryIndex bool - // EnableAdmin means turn on admin module to log every request info. - EnableAdmin bool - // EnableDocs enable generate docs & server docs API Swagger - EnableDocs bool - // EnableErrorsShow wheather show errors in page. if true, show error and trace info in page rendered with error template. - EnableErrorsShow bool - // EnableFcgi turn on the fcgi Listen, default is false - EnableFcgi bool - // EnableGzip means gzip the response - EnableGzip bool - // EnableHTTPListen represent whether turn on the HTTP, default is true - EnableHTTPListen bool - // EnableHTTPTLS represent whether turn on the HTTPS, default is true - EnableHTTPTLS bool - // EnableStdIo works with EnableFcgi Use FCGI via standard I/O - EnableStdIo bool - // EnableXSRF whether turn on xsrf. default is false - EnableXSRF bool - // FlashName is the name of the flash variable found in response header and cookie - FlashName string - // FlashSeperator used to seperate flash key:value, default is BEEGOFLASH - FlashSeperator string + AppConfigProvider = "ini" + // TemplateCache stores template caching + TemplateCache map[string]*template.Template // GlobalSessions is the instance for the session manager GlobalSessions *session.Manager - // Graceful means use graceful module to start the server - Graceful bool - // workPath is always the same as AppPath, but sometime when it started with other - // program, like supervisor - workPath string - // ListenTCP4 represent only Listen in TCP4, default is false - ListenTCP4 bool - // MaxMemory The whole request body is parsed and up to a total of maxMemory - // bytes of its file parts are stored in memory, with the remainder stored on disk in temporary files - MaxMemory int64 - // HTTPAddr is the TCP network address addr for HTTP - HTTPAddr string - // HTTPPort is listens port for HTTP - HTTPPort int - // HTTPSPort is listens port for HTTPS - HTTPSPort int - // HTTPCertFile is the path to certificate file - HTTPCertFile string - // HTTPKeyFile is the path to private key file - HTTPKeyFile string - // HTTPServerTimeOut HTTP server timeout. default is 0, no timeout - HTTPServerTimeOut int64 - // RecoverPanic is a flag for auto recover panic, default is true - RecoverPanic bool - // RouterCaseSensitive means whether router case sensitive, default is true - RouterCaseSensitive bool - // RunMode represent the staging, "dev" or "prod" - RunMode string - // SessionOn means whether turn on the session auto when application started. default is false. - SessionOn bool - // SessionProvider means session provider, e.q memory, mysql, redis,etc. - SessionProvider string - // SessionName is the cookie name when saving session id into cookie. - SessionName string - // SessionGCMaxLifetime for auto cleaning expired session. - SessionGCMaxLifetime int64 - // SessionProviderConfig is for the provider config, define save path or connection info. - SessionProviderConfig string - // SessionCookieLifeTime means the life time of session id in cookie. - SessionCookieLifeTime int - // SessionAutoSetCookie auto setcookie - SessionAutoSetCookie bool - // SessionDomain means the cookie domain default is empty - SessionDomain string - // StaticDir store the static path, key is path, value is the folder - StaticDir map[string]string - // StaticExtensionsToGzip stores the extensions which need to gzip(.js,.css,etc) - StaticExtensionsToGzip []string - // TemplateCache store the caching template - TemplateCache map[string]*template.Template - // TemplateLeft left delimiter - TemplateLeft string - // TemplateRight right delimiter - TemplateRight string - // ViewsPath means the template folder - ViewsPath string - // XSRFKEY xsrf hash salt string. - XSRFKEY string - // XSRFExpire is the expiry of xsrf value. - XSRFExpire int ) +func init() { + BConfig = &BeegoConfig{ + AppName: "beego", + RunMode: "dev", + RouterCaseSensitive: true, + ServerName: "beegoServer:" + VERSION, + RecoverPanic: true, + CopyRequestBody: false, + EnableGzip: false, + MaxMemory: 1 << 26, //64MB + EnableErrorsShow: true, + Listen: Listen{ + Graceful: false, + ServerTimeOut: 0, + ListenTCP4: false, + HTTPEnable: true, + HTTPAddr: "", + HTTPPort: 8080, + HTTPSEnable: false, + HTTPSAddr: "", + HTTPSPort: 10443, + HTTPSCertFile: "", + HTTPSKeyFile: "", + AdminEnable: false, + AdminAddr: "", + AdminPort: 8088, + EnableFcgi: false, + EnableStdIo: false, + }, + WebConfig: WebConfig{ + AutoRender: true, + EnableDocs: false, + FlashName: "BEEGO_FLASH", + FlashSeperator: "BEEGOFLASH", + DirectoryIndex: false, + StaticDir: map[string]string{"/static": "static"}, + StaticExtensionsToGzip: []string{".css", ".js"}, + TemplateLeft: "{{", + TemplateRight: "}}", + ViewsPath: "views", + EnableXSRF: false, + XSRFKEY: "beegoxsrf", + XSRFExpire: 0, + Session: SessionConfig{ + SessionOn: false, + SessionProvider: "memory", + SessionName: "beegosessionID", + SessionGCMaxLifetime: 3600, + SessionProviderConfig: "", + SessionCookieLifeTime: 0, //set cookie default is the brower life + SessionAutoSetCookie: true, + SessionDomain: "", + }, + }, + Log: LogConfig{ + AccessLogs: false, + FileLineNum: true, + Output: map[string]string{"console": ""}, + }, + } +} + +// ParseConfig parsed default config file. +// now only support ini, next will support json. +func ParseConfig() (err error) { + if AppConfigPath == "" { + if utils.FileExists(filepath.Join("conf", "app.conf")) { + AppConfigPath = filepath.Join("conf", "app.conf") + } else { + ac := config.NewFakeConfig() + AppConfig = &beegoAppConfig{ac} + return + } + } + AppConfig, err = newAppConfig(AppConfigProvider, AppConfigPath) + if err != nil { + return err + } + envRunMode := os.Getenv("BEEGO_RUNMODE") + // set the runmode first + if envRunMode != "" { + BConfig.RunMode = envRunMode + } else if runmode := AppConfig.String("RunMode"); runmode != "" { + BConfig.RunMode = runmode + } + + BConfig.Listen.HTTPAddr = AppConfig.String("HTTPAddr") + + if v, err := AppConfig.Int("HTTPPort"); err == nil { + BConfig.Listen.HTTPPort = v + } + + if v, err := AppConfig.Bool("ListenTCP4"); err == nil { + BConfig.Listen.ListenTCP4 = v + } + + if v, err := AppConfig.Bool("EnableHTTPListen"); err == nil { + BConfig.Listen.HTTPEnable = v + } + + if maxmemory, err := AppConfig.Int64("MaxMemory"); err == nil { + BConfig.MaxMemory = maxmemory + } + + if appname := AppConfig.String("AppName"); appname != "" { + BConfig.AppName = appname + } + + if autorender, err := AppConfig.Bool("AutoRender"); err == nil { + BConfig.WebConfig.AutoRender = autorender + } + + if autorecover, err := AppConfig.Bool("RecoverPanic"); err == nil { + BConfig.RecoverPanic = autorecover + } + + if views := AppConfig.String("ViewsPath"); views != "" { + BConfig.WebConfig.ViewsPath = views + } + + if sessionon, err := AppConfig.Bool("SessionOn"); err == nil { + BConfig.WebConfig.Session.SessionOn = sessionon + } + + if sessProvider := AppConfig.String("SessionProvider"); sessProvider != "" { + BConfig.WebConfig.Session.SessionProvider = sessProvider + } + + if sessName := AppConfig.String("SessionName"); sessName != "" { + BConfig.WebConfig.Session.SessionName = sessName + } + + if sessProvConfig := AppConfig.String("SessionProviderConfig"); sessProvConfig != "" { + BConfig.WebConfig.Session.SessionProviderConfig = sessProvConfig + } + + if sessMaxLifeTime, err := AppConfig.Int64("SessionGCMaxLifetime"); err == nil && sessMaxLifeTime != 0 { + BConfig.WebConfig.Session.SessionGCMaxLifetime = sessMaxLifeTime + } + + if sesscookielifetime, err := AppConfig.Int("SessionCookieLifeTime"); err == nil && sesscookielifetime != 0 { + BConfig.WebConfig.Session.SessionCookieLifeTime = sesscookielifetime + } + + if enableFcgi, err := AppConfig.Bool("EnableFcgi"); err == nil { + BConfig.Listen.EnableFcgi = enableFcgi + } + + if enablegzip, err := AppConfig.Bool("EnableGzip"); err == nil { + BConfig.EnableGzip = enablegzip + } + + if directoryindex, err := AppConfig.Bool("DirectoryIndex"); err == nil { + BConfig.WebConfig.DirectoryIndex = directoryindex + } + + if timeout, err := AppConfig.Int64("HTTPServerTimeOut"); err == nil { + BConfig.Listen.ServerTimeOut = timeout + } + + if errorsshow, err := AppConfig.Bool("EnableErrorsShow"); err == nil { + BConfig.EnableErrorsShow = errorsshow + } + + if copyrequestbody, err := AppConfig.Bool("CopyRequestBody"); err == nil { + BConfig.CopyRequestBody = copyrequestbody + } + + if xsrfkey := AppConfig.String("XSRFKEY"); xsrfkey != "" { + BConfig.WebConfig.XSRFKEY = xsrfkey + } + + if enablexsrf, err := AppConfig.Bool("EnableXSRF"); err == nil { + BConfig.WebConfig.EnableXSRF = enablexsrf + } + + if expire, err := AppConfig.Int("XSRFExpire"); err == nil { + BConfig.WebConfig.XSRFExpire = expire + } + + if tplleft := AppConfig.String("TemplateLeft"); tplleft != "" { + BConfig.WebConfig.TemplateLeft = tplleft + } + + if tplright := AppConfig.String("TemplateRight"); tplright != "" { + BConfig.WebConfig.TemplateRight = tplright + } + + if httptls, err := AppConfig.Bool("EnableHTTPTLS"); err == nil { + BConfig.Listen.HTTPSEnable = httptls + } + + if httpsport, err := AppConfig.Int("HTTPSPort"); err == nil { + BConfig.Listen.HTTPSPort = httpsport + } + + if certfile := AppConfig.String("HTTPCertFile"); certfile != "" { + BConfig.Listen.HTTPSCertFile = certfile + } + + if keyfile := AppConfig.String("HTTPKeyFile"); keyfile != "" { + BConfig.Listen.HTTPSKeyFile = keyfile + } + + if serverName := AppConfig.String("BeegoServerName"); serverName != "" { + BConfig.ServerName = serverName + } + + if flashname := AppConfig.String("FlashName"); flashname != "" { + BConfig.WebConfig.FlashName = flashname + } + + if flashseperator := AppConfig.String("FlashSeperator"); flashseperator != "" { + BConfig.WebConfig.FlashSeperator = flashseperator + } + + if sd := AppConfig.String("StaticDir"); sd != "" { + for k := range BConfig.WebConfig.StaticDir { + delete(BConfig.WebConfig.StaticDir, k) + } + sds := strings.Fields(sd) + for _, v := range sds { + if url2fsmap := strings.SplitN(v, ":", 2); len(url2fsmap) == 2 { + BConfig.WebConfig.StaticDir["/"+strings.TrimRight(url2fsmap[0], "/")] = url2fsmap[1] + } else { + BConfig.WebConfig.StaticDir["/"+strings.TrimRight(url2fsmap[0], "/")] = url2fsmap[0] + } + } + } + + if sgz := AppConfig.String("StaticExtensionsToGzip"); sgz != "" { + extensions := strings.Split(sgz, ",") + fileExts := []string{} + for _, ext := range extensions { + ext = strings.TrimSpace(ext) + if ext == "" { + continue + } + if !strings.HasPrefix(ext, ".") { + ext = "." + ext + } + fileExts = append(fileExts, ext) + } + if len(fileExts) > 0 { + BConfig.WebConfig.StaticExtensionsToGzip = fileExts + } + } + + if enableadmin, err := AppConfig.Bool("EnableAdmin"); err == nil { + BConfig.Listen.AdminEnable = enableadmin + } + + if adminhttpaddr := AppConfig.String("AdminHTTPAddr"); adminhttpaddr != "" { + BConfig.Listen.AdminAddr = adminhttpaddr + } + + if adminhttpport, err := AppConfig.Int("AdminHTTPPort"); err == nil { + BConfig.Listen.AdminPort = adminhttpport + } + + if enabledocs, err := AppConfig.Bool("EnableDocs"); err == nil { + BConfig.WebConfig.EnableDocs = enabledocs + } + + if casesensitive, err := AppConfig.Bool("RouterCaseSensitive"); err == nil { + BConfig.RouterCaseSensitive = casesensitive + } + if graceful, err := AppConfig.Bool("Graceful"); err == nil { + BConfig.Listen.Graceful = graceful + } + return nil +} + type beegoAppConfig struct { innerConfig config.Configer } @@ -154,7 +395,7 @@ func newAppConfig(AppConfigProvider, AppConfigPath string) (*beegoAppConfig, err } func (b *beegoAppConfig) Set(key, val string) error { - err := b.innerConfig.Set(RunMode+"::"+key, val) + err := b.innerConfig.Set(BConfig.RunMode+"::"+key, val) if err == nil { return err } @@ -162,7 +403,7 @@ func (b *beegoAppConfig) Set(key, val string) error { } func (b *beegoAppConfig) String(key string) string { - v := b.innerConfig.String(RunMode + "::" + key) + v := b.innerConfig.String(BConfig.RunMode + "::" + key) if v == "" { return b.innerConfig.String(key) } @@ -170,7 +411,7 @@ func (b *beegoAppConfig) String(key string) string { } func (b *beegoAppConfig) Strings(key string) []string { - v := b.innerConfig.Strings(RunMode + "::" + key) + v := b.innerConfig.Strings(BConfig.RunMode + "::" + key) if v[0] == "" { return b.innerConfig.Strings(key) } @@ -178,7 +419,7 @@ func (b *beegoAppConfig) Strings(key string) []string { } func (b *beegoAppConfig) Int(key string) (int, error) { - v, err := b.innerConfig.Int(RunMode + "::" + key) + v, err := b.innerConfig.Int(BConfig.RunMode + "::" + key) if err != nil { return b.innerConfig.Int(key) } @@ -186,7 +427,7 @@ func (b *beegoAppConfig) Int(key string) (int, error) { } func (b *beegoAppConfig) Int64(key string) (int64, error) { - v, err := b.innerConfig.Int64(RunMode + "::" + key) + v, err := b.innerConfig.Int64(BConfig.RunMode + "::" + key) if err != nil { return b.innerConfig.Int64(key) } @@ -194,7 +435,7 @@ func (b *beegoAppConfig) Int64(key string) (int64, error) { } func (b *beegoAppConfig) Bool(key string) (bool, error) { - v, err := b.innerConfig.Bool(RunMode + "::" + key) + v, err := b.innerConfig.Bool(BConfig.RunMode + "::" + key) if err != nil { return b.innerConfig.Bool(key) } @@ -202,7 +443,7 @@ func (b *beegoAppConfig) Bool(key string) (bool, error) { } func (b *beegoAppConfig) Float(key string) (float64, error) { - v, err := b.innerConfig.Float(RunMode + "::" + key) + v, err := b.innerConfig.Float(BConfig.RunMode + "::" + key) if err != nil { return b.innerConfig.Float(key) } @@ -268,300 +509,3 @@ func (b *beegoAppConfig) GetSection(section string) (map[string]string, error) { func (b *beegoAppConfig) SaveConfigFile(filename string) error { return b.innerConfig.SaveConfigFile(filename) } - -func init() { - workPath, _ = os.Getwd() - workPath, _ = filepath.Abs(workPath) - // initialize default configurations - AppPath, _ = filepath.Abs(filepath.Dir(os.Args[0])) - - AppConfigPath = filepath.Join(AppPath, "conf", "app.conf") - - if workPath != AppPath { - if utils.FileExists(AppConfigPath) { - os.Chdir(AppPath) - } else { - AppConfigPath = filepath.Join(workPath, "conf", "app.conf") - } - } - - AppConfigProvider = "ini" - - StaticDir = make(map[string]string) - StaticDir["/static"] = "static" - - StaticExtensionsToGzip = []string{".css", ".js"} - - TemplateCache = make(map[string]*template.Template) - - // set this to 0.0.0.0 to make this app available to externally - EnableHTTPListen = true //default enable http Listen - - HTTPAddr = "" - HTTPPort = 8080 - - HTTPSPort = 10443 - - AppName = "beego" - - RunMode = "dev" //default runmod - - AutoRender = true - - RecoverPanic = true - - ViewsPath = "views" - - SessionOn = false - SessionProvider = "memory" - SessionName = "beegosessionID" - SessionGCMaxLifetime = 3600 - SessionProviderConfig = "" - SessionCookieLifeTime = 0 //set cookie default is the brower life - SessionAutoSetCookie = true - - MaxMemory = 1 << 26 //64MB - - HTTPServerTimeOut = 0 - - EnableErrorsShow = true - - XSRFKEY = "beegoxsrf" - XSRFExpire = 0 - - TemplateLeft = "{{" - TemplateRight = "}}" - - BeegoServerName = "beegoServer:" + VERSION - - EnableAdmin = false - AdminHTTPAddr = "127.0.0.1" - AdminHTTPPort = 8088 - - FlashName = "BEEGO_FLASH" - FlashSeperator = "BEEGOFLASH" - - RouterCaseSensitive = true - - runtime.GOMAXPROCS(runtime.NumCPU()) - - // init BeeLogger - BeeLogger = logs.NewLogger(10000) - err := BeeLogger.SetLogger("console", "") - if err != nil { - fmt.Println("init console log error:", err) - } - SetLogFuncCall(true) - - err = ParseConfig() - if err != nil { - if os.IsNotExist(err) { - // for init if doesn't have app.conf will not panic - ac := config.NewFakeConfig() - AppConfig = &beegoAppConfig{ac} - } - Warning(err) - } -} - -// ParseConfig parsed default config file. -// now only support ini, next will support json. -func ParseConfig() (err error) { - AppConfig, err = newAppConfig(AppConfigProvider, AppConfigPath) - if err != nil { - return err - } - envRunMode := os.Getenv("BEEGO_RUNMODE") - // set the runmode first - if envRunMode != "" { - RunMode = envRunMode - } else if runmode := AppConfig.String("RunMode"); runmode != "" { - RunMode = runmode - } - - HTTPAddr = AppConfig.String("HTTPAddr") - - if v, err := AppConfig.Int("HTTPPort"); err == nil { - HTTPPort = v - } - - if v, err := AppConfig.Bool("ListenTCP4"); err == nil { - ListenTCP4 = v - } - - if v, err := AppConfig.Bool("EnableHTTPListen"); err == nil { - EnableHTTPListen = v - } - - if maxmemory, err := AppConfig.Int64("MaxMemory"); err == nil { - MaxMemory = maxmemory - } - - if appname := AppConfig.String("AppName"); appname != "" { - AppName = appname - } - - if autorender, err := AppConfig.Bool("AutoRender"); err == nil { - AutoRender = autorender - } - - if autorecover, err := AppConfig.Bool("RecoverPanic"); err == nil { - RecoverPanic = autorecover - } - - if views := AppConfig.String("ViewsPath"); views != "" { - ViewsPath = views - } - - if sessionon, err := AppConfig.Bool("SessionOn"); err == nil { - SessionOn = sessionon - } - - if sessProvider := AppConfig.String("SessionProvider"); sessProvider != "" { - SessionProvider = sessProvider - } - - if sessName := AppConfig.String("SessionName"); sessName != "" { - SessionName = sessName - } - - if sessProvConfig := AppConfig.String("SessionProviderConfig"); sessProvConfig != "" { - SessionProviderConfig = sessProvConfig - } - - if sessMaxLifeTime, err := AppConfig.Int64("SessionGCMaxLifetime"); err == nil && sessMaxLifeTime != 0 { - SessionGCMaxLifetime = sessMaxLifeTime - } - - if sesscookielifetime, err := AppConfig.Int("SessionCookieLifeTime"); err == nil && sesscookielifetime != 0 { - SessionCookieLifeTime = sesscookielifetime - } - - if enableFcgi, err := AppConfig.Bool("EnableFcgi"); err == nil { - EnableFcgi = enableFcgi - } - - if enablegzip, err := AppConfig.Bool("EnableGzip"); err == nil { - EnableGzip = enablegzip - } - - if directoryindex, err := AppConfig.Bool("DirectoryIndex"); err == nil { - DirectoryIndex = directoryindex - } - - if timeout, err := AppConfig.Int64("HTTPServerTimeOut"); err == nil { - HTTPServerTimeOut = timeout - } - - if errorsshow, err := AppConfig.Bool("EnableErrorsShow"); err == nil { - EnableErrorsShow = errorsshow - } - - if copyrequestbody, err := AppConfig.Bool("CopyRequestBody"); err == nil { - CopyRequestBody = copyrequestbody - } - - if xsrfkey := AppConfig.String("XSRFKEY"); xsrfkey != "" { - XSRFKEY = xsrfkey - } - - if enablexsrf, err := AppConfig.Bool("EnableXSRF"); err == nil { - EnableXSRF = enablexsrf - } - - if expire, err := AppConfig.Int("XSRFExpire"); err == nil { - XSRFExpire = expire - } - - if tplleft := AppConfig.String("TemplateLeft"); tplleft != "" { - TemplateLeft = tplleft - } - - if tplright := AppConfig.String("TemplateRight"); tplright != "" { - TemplateRight = tplright - } - - if httptls, err := AppConfig.Bool("EnableHTTPTLS"); err == nil { - EnableHTTPTLS = httptls - } - - if httpsport, err := AppConfig.Int("HTTPSPort"); err == nil { - HTTPSPort = httpsport - } - - if certfile := AppConfig.String("HTTPCertFile"); certfile != "" { - HTTPCertFile = certfile - } - - if keyfile := AppConfig.String("HTTPKeyFile"); keyfile != "" { - HTTPKeyFile = keyfile - } - - if serverName := AppConfig.String("BeegoServerName"); serverName != "" { - BeegoServerName = serverName - } - - if flashname := AppConfig.String("FlashName"); flashname != "" { - FlashName = flashname - } - - if flashseperator := AppConfig.String("FlashSeperator"); flashseperator != "" { - FlashSeperator = flashseperator - } - - if sd := AppConfig.String("StaticDir"); sd != "" { - for k := range StaticDir { - delete(StaticDir, k) - } - sds := strings.Fields(sd) - for _, v := range sds { - if url2fsmap := strings.SplitN(v, ":", 2); len(url2fsmap) == 2 { - StaticDir["/"+strings.TrimRight(url2fsmap[0], "/")] = url2fsmap[1] - } else { - StaticDir["/"+strings.TrimRight(url2fsmap[0], "/")] = url2fsmap[0] - } - } - } - - if sgz := AppConfig.String("StaticExtensionsToGzip"); sgz != "" { - extensions := strings.Split(sgz, ",") - fileExts := []string{} - for _, ext := range extensions { - ext = strings.TrimSpace(ext) - if ext == "" { - continue - } - if !strings.HasPrefix(ext, ".") { - ext = "." + ext - } - fileExts = append(fileExts, ext) - } - if len(fileExts) > 0 { - StaticExtensionsToGzip = fileExts - } - } - - if enableadmin, err := AppConfig.Bool("EnableAdmin"); err == nil { - EnableAdmin = enableadmin - } - - if adminhttpaddr := AppConfig.String("AdminHTTPAddr"); adminhttpaddr != "" { - AdminHTTPAddr = adminhttpaddr - } - - if adminhttpport, err := AppConfig.Int("AdminHTTPPort"); err == nil { - AdminHTTPPort = adminhttpport - } - - if enabledocs, err := AppConfig.Bool("EnableDocs"); err == nil { - EnableDocs = enabledocs - } - - if casesensitive, err := AppConfig.Bool("RouterCaseSensitive"); err == nil { - RouterCaseSensitive = casesensitive - } - if graceful, err := AppConfig.Bool("Graceful"); err == nil { - Graceful = graceful - } - return nil -} diff --git a/config_test.go b/config_test.go index 17645f80..a74471fc 100644 --- a/config_test.go +++ b/config_test.go @@ -19,11 +19,11 @@ import ( ) func TestDefaults(t *testing.T) { - if FlashName != "BEEGO_FLASH" { + if BConfig.WebConfig.FlashName != "BEEGO_FLASH" { t.Errorf("FlashName was not set to default.") } - if FlashSeperator != "BEEGOFLASH" { + if BConfig.WebConfig.FlashSeperator != "BEEGOFLASH" { t.Errorf("FlashName was not set to default.") } } diff --git a/controller.go b/controller.go index 0750daf4..2febb50d 100644 --- a/controller.go +++ b/controller.go @@ -200,7 +200,7 @@ func (c *Controller) RenderBytes() ([]byte, error) { c.TplNames = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt } - if RunMode == "dev" { + if BConfig.RunMode == "dev" { buildFiles := make([]string, 1) buildFiles = append(buildFiles, c.TplNames) if c.LayoutSections != nil { @@ -211,7 +211,7 @@ func (c *Controller) RenderBytes() ([]byte, error) { buildFiles = append(buildFiles, sectionTpl) } } - BuildTemplate(ViewsPath, buildFiles...) + BuildTemplate(BConfig.WebConfig.ViewsPath, buildFiles...) } newbytes := bytes.NewBufferString("") if _, ok := BeeTemplates[c.TplNames]; !ok { @@ -256,8 +256,8 @@ func (c *Controller) RenderBytes() ([]byte, error) { if c.TplNames == "" { c.TplNames = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt } - if RunMode == "dev" { - BuildTemplate(ViewsPath, c.TplNames) + if BConfig.RunMode == "dev" { + BuildTemplate(BConfig.WebConfig.ViewsPath, c.TplNames) } ibytes := bytes.NewBufferString("") if _, ok := BeeTemplates[c.TplNames]; !ok { @@ -319,7 +319,7 @@ func (c *Controller) URLFor(endpoint string, values ...interface{}) string { func (c *Controller) ServeJSON(encoding ...bool) { var hasIndent bool var hasencoding bool - if RunMode == "prod" { + if BConfig.RunMode == "prod" { hasIndent = false } else { hasIndent = true @@ -333,7 +333,7 @@ func (c *Controller) ServeJSON(encoding ...bool) { // ServeJSONP sends a jsonp response. func (c *Controller) ServeJSONP() { var hasIndent bool - if RunMode == "prod" { + if BConfig.RunMode == "prod" { hasIndent = false } else { hasIndent = true @@ -344,7 +344,7 @@ func (c *Controller) ServeJSONP() { // ServeXML sends xml response. func (c *Controller) ServeXML() { var hasIndent bool - if RunMode == "prod" { + if BConfig.RunMode == "prod" { hasIndent = false } else { hasIndent = true @@ -628,9 +628,9 @@ func (c *Controller) XSRFToken() string { if c.XSRFExpire > 0 { expire = int64(c.XSRFExpire) } else { - expire = int64(XSRFExpire) + expire = int64(BConfig.WebConfig.XSRFExpire) } - c._xsrfToken = c.Ctx.XSRFToken(XSRFKEY, expire) + c._xsrfToken = c.Ctx.XSRFToken(BConfig.WebConfig.XSRFKEY, expire) } return c._xsrfToken } diff --git a/controller_test.go b/controller_test.go index 4156bd29..ebf38b2c 100644 --- a/controller_test.go +++ b/controller_test.go @@ -15,30 +15,25 @@ package beego import ( - "fmt" - "github.com/astaxie/beego/context" "testing" + + "github.com/astaxie/beego/context" ) func TestGetInt(t *testing.T) { - i := &context.BeegoInput{Params: map[string]string{"age": "40"}} ctx := &context.Context{Input: i} ctrlr := Controller{Ctx: ctx} - val, _ := ctrlr.GetInt("age") - - if (val != 40) { + if val != 40 { t.Errorf("TestGetInt expect 40,get %T,%v", val, val) } } func TestGetInt8(t *testing.T) { - i := &context.BeegoInput{Params: map[string]string{"age": "40"}} ctx := &context.Context{Input: i} ctrlr := Controller{Ctx: ctx} - val, _ := ctrlr.GetInt8("age") if val != 40 { t.Errorf("TestGetInt8 expect 40,get %T,%v", val, val) @@ -47,11 +42,9 @@ func TestGetInt8(t *testing.T) { } func TestGetInt16(t *testing.T) { - i := &context.BeegoInput{Params: map[string]string{"age": "40"}} ctx := &context.Context{Input: i} ctrlr := Controller{Ctx: ctx} - val, _ := ctrlr.GetInt16("age") if val != 40 { t.Errorf("TestGetInt16 expect 40,get %T,%v", val, val) @@ -59,24 +52,19 @@ func TestGetInt16(t *testing.T) { } func TestGetInt32(t *testing.T) { - i := &context.BeegoInput{Params: map[string]string{"age": "40"}} ctx := &context.Context{Input: i} ctrlr := Controller{Ctx: ctx} - val, _ := ctrlr.GetInt32("age") - fmt.Printf("%T", val) if val != 40 { t.Errorf("TestGetInt32 expect 40,get %T,%v", val, val) } } func TestGetInt64(t *testing.T) { - i := &context.BeegoInput{Params: map[string]string{"age": "40"}} ctx := &context.Context{Input: i} ctrlr := Controller{Ctx: ctx} - val, _ := ctrlr.GetInt64("age") if val != 40 { t.Errorf("TestGeetInt64 expect 40,get %T,%v", val, val) diff --git a/docs.go b/docs.go index 1dbed6cc..5031dc12 100644 --- a/docs.go +++ b/docs.go @@ -24,7 +24,7 @@ import ( var GlobalDocAPI map[string]interface{} func init() { - if EnableDocs { + if BConfig.WebConfig.EnableDocs { GlobalDocAPI = make(map[string]interface{}) } } diff --git a/error.go b/error.go index 2a1a861d..0010c814 100644 --- a/error.go +++ b/error.go @@ -85,7 +85,7 @@ var tpl = ` func showErr(err interface{}, ctx *context.Context, Stack string) { t, _ := template.New("beegoerrortemp").Parse(tpl) data := make(map[string]string) - data["AppError"] = AppName + ":" + fmt.Sprint(err) + data["AppError"] = BConfig.AppName + ":" + fmt.Sprint(err) data["RequestMethod"] = ctx.Input.Method() data["RequestURL"] = ctx.Input.URI() data["RemoteAddr"] = ctx.Input.IP() @@ -437,7 +437,7 @@ func executeError(err *errorInfo, ctx *context.Context, code int) { method.Call(in) //render template - if AutoRender { + if BConfig.WebConfig.AutoRender { if err := execController.Render(); err != nil { panic(err) } diff --git a/filter_test.go b/filter_test.go index ff6f750b..b1cd9c94 100644 --- a/filter_test.go +++ b/filter_test.go @@ -20,8 +20,14 @@ import ( "testing" "github.com/astaxie/beego/context" + "github.com/astaxie/beego/logs" ) +func init() { + BeeLogger = logs.NewLogger(10000) + BeeLogger.SetLogger("console", "") +} + var FilterUser = func(ctx *context.Context) { ctx.Output.Body([]byte("i am " + ctx.Input.Params[":last"] + ctx.Input.Params[":first"])) } diff --git a/flash.go b/flash.go index 5ccf339a..123bfdc3 100644 --- a/flash.go +++ b/flash.go @@ -83,27 +83,27 @@ func (fd *FlashData) Store(c *Controller) { c.Data["flash"] = fd.Data var flashValue string for key, value := range fd.Data { - flashValue += "\x00" + key + "\x23" + FlashSeperator + "\x23" + value + "\x00" + flashValue += "\x00" + key + "\x23" + BConfig.WebConfig.FlashSeperator + "\x23" + value + "\x00" } - c.Ctx.SetCookie(FlashName, url.QueryEscape(flashValue), 0, "/") + c.Ctx.SetCookie(BConfig.WebConfig.FlashName, url.QueryEscape(flashValue), 0, "/") } // ReadFromRequest parsed flash data from encoded values in cookie. func ReadFromRequest(c *Controller) *FlashData { flash := NewFlash() - if cookie, err := c.Ctx.Request.Cookie(FlashName); err == nil { + if cookie, err := c.Ctx.Request.Cookie(BConfig.WebConfig.FlashName); err == nil { v, _ := url.QueryUnescape(cookie.Value) vals := strings.Split(v, "\x00") for _, v := range vals { if len(v) > 0 { - kv := strings.Split(v, "\x23"+FlashSeperator+"\x23") + kv := strings.Split(v, "\x23"+BConfig.WebConfig.FlashSeperator+"\x23") if len(kv) == 2 { flash.Data[kv[0]] = kv[1] } } } //read one time then delete it - c.Ctx.SetCookie(FlashName, "", -1, "/") + c.Ctx.SetCookie(BConfig.WebConfig.FlashName, "", -1, "/") } c.Data["flash"] = flash.Data return flash diff --git a/hooks.go b/hooks.go index 6e401c06..61b80ad3 100644 --- a/hooks.go +++ b/hooks.go @@ -41,19 +41,19 @@ func registerDefaultErrorHandler() error { } func registerSession() error { - if SessionOn { + if BConfig.WebConfig.Session.SessionOn { var err error sessionConfig := AppConfig.String("sessionConfig") if sessionConfig == "" { - sessionConfig = `{"cookieName":"` + SessionName + `",` + - `"gclifetime":` + strconv.FormatInt(SessionGCMaxLifetime, 10) + `,` + - `"providerConfig":"` + filepath.ToSlash(SessionProviderConfig) + `",` + - `"secure":` + strconv.FormatBool(EnableHTTPTLS) + `,` + - `"enableSetCookie":` + strconv.FormatBool(SessionAutoSetCookie) + `,` + - `"domain":"` + SessionDomain + `",` + - `"cookieLifeTime":` + strconv.Itoa(SessionCookieLifeTime) + `}` + sessionConfig = `{"cookieName":"` + BConfig.WebConfig.Session.SessionName + `",` + + `"gclifetime":` + strconv.FormatInt(BConfig.WebConfig.Session.SessionGCMaxLifetime, 10) + `,` + + `"providerConfig":"` + filepath.ToSlash(BConfig.WebConfig.Session.SessionProviderConfig) + `",` + + `"secure":` + strconv.FormatBool(BConfig.Listen.HTTPSEnable) + `,` + + `"enableSetCookie":` + strconv.FormatBool(BConfig.WebConfig.Session.SessionAutoSetCookie) + `,` + + `"domain":"` + BConfig.WebConfig.Session.SessionDomain + `",` + + `"cookieLifeTime":` + strconv.Itoa(BConfig.WebConfig.Session.SessionCookieLifeTime) + `}` } - GlobalSessions, err = session.NewManager(SessionProvider, sessionConfig) + GlobalSessions, err = session.NewManager(BConfig.WebConfig.Session.SessionProvider, sessionConfig) if err != nil { return err } @@ -63,9 +63,9 @@ func registerSession() error { } func registerTemplate() error { - if AutoRender { - err := BuildTemplate(ViewsPath) - if err != nil && RunMode == "dev" { + if BConfig.WebConfig.AutoRender { + err := BuildTemplate(BConfig.WebConfig.ViewsPath) + if err != nil && BConfig.RunMode == "dev" { Warn(err) } } @@ -73,7 +73,7 @@ func registerTemplate() error { } func registerDocs() error { - if EnableDocs { + if BConfig.WebConfig.EnableDocs { Get("/docs", serverDocs) Get("/docs/*", serverDocs) } @@ -81,7 +81,7 @@ func registerDocs() error { } func registerAdmin() error { - if EnableAdmin { + if BConfig.Listen.AdminEnable { go beeAdminApp.Run() } return nil diff --git a/parser.go b/parser.go index 7e8670cb..b14d74b9 100644 --- a/parser.go +++ b/parser.go @@ -130,7 +130,7 @@ func parserComments(comments *ast.CommentGroup, funcName, controllerName, pkgpat } func genRouterCode() { - os.Mkdir(path.Join(workPath, "routers"), 0755) + os.Mkdir("routers", 0755) Info("generate router from comments") var ( globalinfo string @@ -172,7 +172,7 @@ func genRouterCode() { } } if globalinfo != "" { - f, err := os.Create(path.Join(workPath, "routers", commentFilename)) + f, err := os.Create(path.Join("routers", commentFilename)) if err != nil { panic(err) } @@ -182,11 +182,11 @@ func genRouterCode() { } func compareFile(pkgRealpath string) bool { - if !utils.FileExists(path.Join(workPath, "routers", commentFilename)) { + if !utils.FileExists(path.Join("routers", commentFilename)) { return true } - if utils.FileExists(path.Join(workPath, lastupdateFilename)) { - content, err := ioutil.ReadFile(path.Join(workPath, lastupdateFilename)) + if utils.FileExists(lastupdateFilename) { + content, err := ioutil.ReadFile(lastupdateFilename) if err != nil { return true } @@ -214,7 +214,7 @@ func savetoFile(pkgRealpath string) { if err != nil { return } - ioutil.WriteFile(path.Join(workPath, lastupdateFilename), d, os.ModePerm) + ioutil.WriteFile(lastupdateFilename, d, os.ModePerm) } func getpathTime(pkgRealpath string) (lastupdate int64, err error) { diff --git a/plugins/cors/cors_test.go b/plugins/cors/cors_test.go index 56816dd9..ee5ee238 100644 --- a/plugins/cors/cors_test.go +++ b/plugins/cors/cors_test.go @@ -220,7 +220,7 @@ func Test_Preflight(t *testing.T) { func Benchmark_WithoutCORS(b *testing.B) { recorder := httptest.NewRecorder() handler := beego.NewControllerRegister() - beego.RunMode = "prod" + beego.BConfig.RunMode = "prod" handler.Any("/foo", func(ctx *context.Context) { ctx.Output.SetStatus(500) }) @@ -234,7 +234,7 @@ func Benchmark_WithoutCORS(b *testing.B) { func Benchmark_WithCORS(b *testing.B) { recorder := httptest.NewRecorder() handler := beego.NewControllerRegister() - beego.RunMode = "prod" + beego.BConfig.RunMode = "prod" handler.InsertFilter("*", beego.BeforeRouter, Allow(&Options{ AllowAllOrigins: true, AllowCredentials: true, diff --git a/plugins/jwt/jwt.go b/plugins/jwt/jwt.go deleted file mode 100644 index 49bc0e3b..00000000 --- a/plugins/jwt/jwt.go +++ /dev/null @@ -1,140 +0,0 @@ -// Copyright 2014 beego Author. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// Package jwt provides JWT (Json Web Token) authentication -// -// Usage -// In file main.go -// -// import ( -// "github.com/astaxie/beego" -// "github.com/astaxie/beego/plugins/jwt" -// ) -// -// func main() { -// // JWT for Url matching /v1/* -// // PrivateKeyPath: The path for the private RSA key used by JWT -// // PublicKeyPath: The path for the public RSA key used by JWT -// // The list of Urls should be excluded from the JWT Auth -// beego.InsertFilter("/v1/*", beego.BeforeRouter, jwt.AuthRequest(&jwt.Options{ -// PrivateKeyPath: "conf/beeblog.rsa", -// PublicKeyPath: "conf/beeblog.rsa.pub", -// WhiteList: []string{"/v1/jwt/issue-token", "/docs"}, -// })) -// beego.Run() -// } -// -// In file routers/router.go -// -// import ( -// "github.com/astaxie/beego" -// "github.com/astaxie/beego/plugins/jwt" -// ) -// func init() { -// ns := beego.NSNamespace("/jwt", -// beego.NSInclude( -// &jwt.JwtController{}, -// ), -// ) -// beego.AddNamespace(ns) -// } -// -package jwt - -import ( - "io/ioutil" - "net/http" - "time" - - "github.com/astaxie/beego" - "github.com/astaxie/beego/context" - "github.com/astaxie/beego/logs" - goJwt "github.com/dgrijalva/jwt-go" -) - -// Options for the JWT Auth -type Options struct { - PrivateKeyPath string - PublicKeyPath string - WhiteList []string -} - -// RSAKeys store PrivateKey and PublicKey -var RSAKeys struct { - PrivateKey []byte - PublicKey []byte -} - -// AuthRequest retunn FilterFunc -func AuthRequest(o *Options) beego.FilterFunc { - RSAKeys.PrivateKey, _ = ioutil.ReadFile(o.PrivateKeyPath) - RSAKeys.PublicKey, _ = ioutil.ReadFile(o.PublicKeyPath) - - return func(ctx *context.Context) { - // :TODO the url patterns should be considered here. - // Shouldn't only use the string equal - for _, method := range o.WhiteList { - if method == ctx.Request.URL.Path { - return - } - } - - parsedToken, err := goJwt.ParseFromRequest(ctx.Request, func(t *goJwt.Token) (interface{}, error) { - return RSAKeys.PublicKey, nil - }) - - if err == nil && parsedToken.Valid { - ctx.Output.SetStatus(http.StatusOK) - } else { - ctx.Output.SetStatus(http.StatusUnauthorized) - } - - } -} - -// Controller oprations for Jwt -type Controller struct { - beego.Controller -} - -// URLMapping is used to mapping the string to method -func (c *Controller) URLMapping() { - c.Mapping("IssueToken", c.IssueToken) -} - -// IssueToken function -// @Title IssueToken -// @Description Issue a Json Web Token -// @Success 200 string -// @Failure 403 no privilege to access -// @Failure 500 server inner error -// @router /issue-token [get] -func (c *Controller) IssueToken() { - c.Data["json"] = CreateToken() - c.ServeJSON() -} - -// CreateToken return the token -func CreateToken() map[string]string { - log := logs.NewLogger(10000) - log.SetLogger("console", "") - - token := goJwt.New(goJwt.GetSigningMethod("RS256")) // Create a Token that will be signed with RSA 256. - token.Claims["ID"] = "This is my super fake ID" - token.Claims["exp"] = time.Now().Unix() + 36000 - // The claims object allows you to store information in the actual token. - tokenString, _ := token.SignedString(RSAKeys.PrivateKey) - // tokenString Contains the actual token you should share with your client. - return map[string]string{"token": tokenString} -} diff --git a/plugins/jwt/jwt_test.go b/plugins/jwt/jwt_test.go deleted file mode 100644 index dd8cafe7..00000000 --- a/plugins/jwt/jwt_test.go +++ /dev/null @@ -1,88 +0,0 @@ -package jwt - -import ( - "github.com/astaxie/beego" - "net/http" - "net/http/httptest" - "testing" -) - -func testRequest(method, path string) (*httptest.ResponseRecorder, *http.Request) { - request, _ := http.NewRequest(method, path, nil) - recorder := httptest.NewRecorder() - - return recorder, request -} - -func Test_IssueTokenAction(t *testing.T) { - url := "/v1/jwt/issue-token" - - mux := beego.NewControllerRegister() - - mux.InsertFilter("*", beego.BeforeRouter, AuthRequest(&Options{ - PrivateKeyPath: "test/jwt.rsa", - PublicKeyPath: "test/jwt.rsa.pub", - WhiteList: []string{"/v1/jwt/issue-token", "/docs"}, - })) - - mux.Add("/v1/jwt/issue-token", &JwtController{}, "get:IssueToken") - - rw, r := testRequest("GET", url) - mux.ServeHTTP(rw, r) - - if rw.Code != http.StatusOK { - t.Errorf("Shoud return 200") - } -} - -func (tc *JwtController) Foo() { - tc.Ctx.Output.Body([]byte("ok")) -} - -func Test_AuthRequestWithAuthorizationHeader(t *testing.T) { - - url := "/foo" - - mux := beego.NewControllerRegister() - - mux.InsertFilter("*", beego.BeforeRouter, AuthRequest(&Options{ - PrivateKeyPath: "test/jwt.rsa", - PublicKeyPath: "test/jwt.rsa.pub", - WhiteList: []string{"/v1/jwt/issue-token", "/docs"}, - })) - - mux.Add("/foo", &JwtController{}, "get:Foo") - newToken := CreateToken() - - rw, r := testRequest("GET", url) - r.Header.Add("Authorization", "Bearer "+newToken["token"]) - mux.ServeHTTP(rw, r) - - if rw.Code != http.StatusOK { - t.Errorf("Shoud return 200") - } - if rw.Body.String() != "ok" { - t.Errorf("Should output ok") - } -} - -func Test_AuthRequestWithoutAuthorizationHeader(t *testing.T) { - url := "/foo" - - mux := beego.NewControllerRegister() - - mux.InsertFilter("*", beego.BeforeRouter, AuthRequest(&Options{ - PrivateKeyPath: "test/jwt.rsa", - PublicKeyPath: "test/jwt.rsa.pub", - WhiteList: []string{"/v1/jwt/issue-token", "/docs"}, - })) - - mux.Add("/foo", &JwtController{}, "get:Foo") - - rw, r := testRequest("GET", url) - mux.ServeHTTP(rw, r) - - if rw.Code != http.StatusUnauthorized { - t.Errorf("Shoud return 401") - } -} diff --git a/plugins/jwt/test/jwt.rsa b/plugins/jwt/test/jwt.rsa deleted file mode 100644 index 8d584fc6..00000000 --- a/plugins/jwt/test/jwt.rsa +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICWwIBAAKBgQCdu+23Y/0J/FTQKnIPnxupoOo9/OYCv90DPXN/KLLRAMjYzgcC -DsBST2xVR5jlimI/gyfCpVB62dwpSzzr0cA3MoDhbaGWuTdQUX9zmiLoQ4I7X6h0 -dwyiihOz+CzOMlAg5+qBhiTGcKvIFlfEc1FUcn/tB3PVRG9j6B1Ibz5CnQIDAQAB -AoGAFGg+/i4ai9MwqeoD7c95Bb5C8BgrLgnir0uhCL+cOvwuABbPw01jRoLuEi58 -Mp5vzaXLXByFSA+ts03/qMbvZkDGac5g5kLli5TjHIONMxVBrdfGQ1+OApnaPayN -N+HYjZKs6xao6J5iFqfA0FqzDR9kQhUoeosdQoo1GlxDckECQQDO/0LJrFiLzYWe -qS/DxfAnFu2BlClKZjxRJ3vIkRRaON6HPl8BeJW901bFKG5+WSfO+OwQ9egWaf3X -fFm/oEHRAkEAwxMor4fOkBZbL4KPW7sen169vwnXuYusqj0t3dIeiIVrCigkOMT4 -OvX/63u4CTdXh1D5u/4Z/1HTYH92VCP7DQJAJPxbNKnE0IYSf/z++d4eQP3JxkNw -9Ug7Msz5QycZGd3bdRLh6uNe7iIa+PN2esD3afX0SDuIEqkxoBUp/CFoYQJAUmi3 -mV+/7bLkFrALK+9iwmTdt+TKk4HkEY8C32CysW3biFDo7GqZix79XFfJqWsNuQaG -WdrA1NGWgH+YV3dTyQJAIWEZGAuUXRkQB20LfjGzpsKgQFbqjTisMS0qe3JjnDwu -0JR8sYXapgeEEEisH+OtkZKIfyeFOwoUyNC83bcvgw== ------END RSA PRIVATE KEY----- diff --git a/plugins/jwt/test/jwt.rsa.pub b/plugins/jwt/test/jwt.rsa.pub deleted file mode 100644 index 3fdd8ce7..00000000 --- a/plugins/jwt/test/jwt.rsa.pub +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdu+23Y/0J/FTQKnIPnxupoOo9 -/OYCv90DPXN/KLLRAMjYzgcCDsBST2xVR5jlimI/gyfCpVB62dwpSzzr0cA3MoDh -baGWuTdQUX9zmiLoQ4I7X6h0dwyiihOz+CzOMlAg5+qBhiTGcKvIFlfEc1FUcn/t -B3PVRG9j6B1Ibz5CnQIDAQAB ------END PUBLIC KEY----- diff --git a/router.go b/router.go index 7952663e..16273f58 100644 --- a/router.go +++ b/router.go @@ -87,7 +87,7 @@ func (l *logFilter) Filter(ctx *beecontext.Context) bool { if requestPath == "/favicon.ico" || requestPath == "/robots.txt" { return true } - for prefix := range StaticDir { + for prefix := range BConfig.WebConfig.StaticDir { if strings.HasPrefix(requestPath, prefix) { return true } @@ -183,7 +183,7 @@ func (p *ControllerRegister) Add(pattern string, c ControllerInterface, mappingM } func (p *ControllerRegister) addToRouter(method, pattern string, r *controllerInfo) { - if !RouterCaseSensitive { + if !BConfig.RouterCaseSensitive { pattern = strings.ToLower(pattern) } if t, ok := p.routers[method]; ok { @@ -198,7 +198,7 @@ func (p *ControllerRegister) addToRouter(method, pattern string, r *controllerIn // Include only when the Runmode is dev will generate router file in the router/auto.go from the controller // Include(&BankAccount{}, &OrderController{},&RefundController{},&ReceiptController{}) func (p *ControllerRegister) Include(cList ...ControllerInterface) { - if RunMode == "dev" { + if BConfig.RunMode == "dev" { skip := make(map[string]bool, 10) for _, c := range cList { reflectVal := reflect.ValueOf(c) @@ -406,7 +406,7 @@ func (p *ControllerRegister) InsertFilter(pattern string, pos int, filter Filter mr.tree = NewTree() mr.pattern = pattern mr.filterFunc = filter - if !RouterCaseSensitive { + if !BConfig.RouterCaseSensitive { pattern = strings.ToLower(pattern) } if len(params) == 0 { @@ -580,8 +580,8 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) w := &responseWriter{rw, false, 0} - if RunMode == "dev" { - w.Header().Set("Server", BeegoServerName) + if BConfig.RunMode == "dev" { + w.Header().Set("Server", BConfig.ServerName) } // init context @@ -592,12 +592,12 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) Output: beecontext.NewOutput(), } context.Output.Context = context - context.Output.EnableGzip = EnableGzip + context.Output.EnableGzip = BConfig.EnableGzip defer p.recoverPanic(context) var urlPath string - if !RouterCaseSensitive { + if !BConfig.RouterCaseSensitive { urlPath = strings.ToLower(r.URL.Path) } else { urlPath = r.URL.Path @@ -646,7 +646,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) } // session init - if SessionOn { + if BConfig.WebConfig.Session.SessionOn { var err error context.Input.CruSession, err = GlobalSessions.SessionStart(w, r) if err != nil { @@ -660,10 +660,10 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) } if r.Method != "GET" && r.Method != "HEAD" { - if CopyRequestBody && !context.Input.IsUpload() { + if BConfig.CopyRequestBody && !context.Input.IsUpload() { context.Input.CopyBody() } - context.Input.ParseFormOrMulitForm(MaxMemory) + context.Input.ParseFormOrMulitForm(BConfig.MaxMemory) } if doFilter(BeforeRouter) { @@ -765,7 +765,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) execController.Prepare() //if XSRF is Enable then check cookie where there has any cookie in the request's cookie _csrf - if EnableXSRF { + if BConfig.WebConfig.EnableXSRF { execController.XSRFToken() if r.Method == "POST" || r.Method == "DELETE" || r.Method == "PUT" || (r.Method == "POST" && (context.Input.Query("_method") == "DELETE" || context.Input.Query("_method") == "PUT")) { @@ -802,7 +802,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) //render template if !w.started && context.Output.Status == 0 { - if AutoRender { + if BConfig.WebConfig.AutoRender { if err := execController.Render(); err != nil { panic(err) } @@ -825,7 +825,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) Admin: timeend := time.Since(starttime) //admin module record QPS - if EnableAdmin { + if BConfig.Listen.AdminEnable { if FilterMonitorFunc(r.Method, r.URL.Path, timeend) { if runrouter != nil { go toolbox.StatisticsMap.AddStatistics(r.Method, r.URL.Path, runrouter.Name(), timeend) @@ -835,7 +835,7 @@ Admin: } } - if RunMode == "dev" || AccessLogs { + if BConfig.RunMode == "dev" || BConfig.Log.AccessLogs { var devinfo string if findrouter { if routerInfo != nil { @@ -862,10 +862,10 @@ func (p *ControllerRegister) recoverPanic(context *beecontext.Context) { if err == ErrAbort { return } - if !RecoverPanic { + if !BConfig.RecoverPanic { panic(err) } else { - if EnableErrorsShow { + if BConfig.EnableErrorsShow { if _, ok := ErrorMaps[fmt.Sprint(err)]; ok { exception(fmt.Sprint(err), context) return @@ -882,7 +882,7 @@ func (p *ControllerRegister) recoverPanic(context *beecontext.Context) { Critical(fmt.Sprintf("%s:%d", file, line)) stack = stack + fmt.Sprintln(fmt.Sprintf("%s:%d", file, line)) } - if RunMode == "dev" { + if BConfig.RunMode == "dev" { showErr(err, context, stack) } } diff --git a/staticfile.go b/staticfile.go index e1d88b87..0570006c 100644 --- a/staticfile.go +++ b/staticfile.go @@ -49,7 +49,7 @@ func serverStaticRouter(ctx *context.Context) { } if filePath == "" || fileInfo == nil { - if RunMode == "dev" { + if BConfig.RunMode == "dev" { Warn("Can't find/open the file:", filePath, err) } http.NotFound(ctx.ResponseWriter, ctx.Request) @@ -61,14 +61,14 @@ func serverStaticRouter(ctx *context.Context) { return } - var enableCompress = EnableGzip && isStaticCompress(filePath) + var enableCompress = BConfig.EnableGzip && isStaticCompress(filePath) var acceptEncoding string if enableCompress { acceptEncoding = context.ParseEncoding(ctx.Request) } b, n, sch, err := openFile(filePath, fileInfo, acceptEncoding) if err != nil { - if RunMode == "dev" { + if BConfig.RunMode == "dev" { Warn("Can't compress the file:", filePath, err) } http.NotFound(ctx.ResponseWriter, ctx.Request) @@ -133,7 +133,7 @@ func isOk(s *serveContentHolder, fi os.FileInfo) bool { // isStaticCompress detect static files func isStaticCompress(filePath string) bool { - for _, statExtension := range StaticExtensionsToGzip { + for _, statExtension := range BConfig.WebConfig.StaticExtensionsToGzip { if strings.HasSuffix(strings.ToLower(filePath), strings.ToLower(statExtension)) { return true } @@ -151,7 +151,7 @@ func searchFile(ctx *context.Context) (string, os.FileInfo, error) { if fi, _ := os.Stat(file); fi != nil { return file, fi, nil } - for _, staticDir := range StaticDir { + for _, staticDir := range BConfig.WebConfig.StaticDir { filePath := path.Join(staticDir, requestPath) if fi, _ := os.Stat(filePath); fi != nil { return filePath, fi, nil @@ -160,7 +160,7 @@ func searchFile(ctx *context.Context) (string, os.FileInfo, error) { return "", nil, errors.New(requestPath + " file not find") } - for prefix, staticDir := range StaticDir { + for prefix, staticDir := range BConfig.WebConfig.StaticDir { if len(prefix) == 0 { continue } @@ -193,5 +193,5 @@ func lookupFile(ctx *context.Context) (bool, string, os.FileInfo, error) { if ifi, _ := os.Stat(ifp); ifi != nil && ifi.Mode().IsRegular() { return false, ifp, ifi, err } - return !DirectoryIndex, fp, fi, err + return !BConfig.WebConfig.DirectoryIndex, fp, fi, err } diff --git a/template.go b/template.go index 8822c514..9aac3ea2 100644 --- a/template.go +++ b/template.go @@ -176,7 +176,7 @@ func getTplDeep(root, file, parent string, t *template.Template) (*template.Temp if err != nil { return nil, [][]string{}, err } - reg := regexp.MustCompile(TemplateLeft + "[ ]*template[ ]+\"([^\"]+)\"") + reg := regexp.MustCompile(BConfig.WebConfig.TemplateLeft + "[ ]*template[ ]+\"([^\"]+)\"") allsub := reg.FindAllStringSubmatch(string(data), -1) for _, m := range allsub { if len(m) == 2 { @@ -197,7 +197,7 @@ func getTplDeep(root, file, parent string, t *template.Template) (*template.Temp } func getTemplate(root, file string, others ...string) (t *template.Template, err error) { - t = template.New(file).Delims(TemplateLeft, TemplateRight).Funcs(beegoTplFuncMap) + t = template.New(file).Delims(BConfig.WebConfig.TemplateLeft, BConfig.WebConfig.TemplateRight).Funcs(beegoTplFuncMap) var submods [][]string t, submods, err = getTplDeep(root, file, "", t) if err != nil { @@ -239,7 +239,7 @@ func _getTemplate(t0 *template.Template, root string, submods [][]string, others if err != nil { continue } - reg := regexp.MustCompile(TemplateLeft + "[ ]*define[ ]+\"([^\"]+)\"") + reg := regexp.MustCompile(BConfig.WebConfig.TemplateLeft + "[ ]*define[ ]+\"([^\"]+)\"") allsub := reg.FindAllStringSubmatch(string(data), -1) for _, sub := range allsub { if len(sub) == 2 && sub[1] == m[1] { @@ -262,7 +262,7 @@ func _getTemplate(t0 *template.Template, root string, submods [][]string, others // SetViewsPath sets view directory path in beego application. func SetViewsPath(path string) *App { - ViewsPath = path + BConfig.WebConfig.ViewsPath = path return BeeApp } @@ -273,7 +273,7 @@ func SetStaticPath(url string, path string) *App { url = "/" + url } url = strings.TrimRight(url, "/") - StaticDir[url] = path + BConfig.WebConfig.StaticDir[url] = path return BeeApp } @@ -283,6 +283,6 @@ func DelStaticPath(url string) *App { url = "/" + url } url = strings.TrimRight(url, "/") - delete(StaticDir, url) + delete(BConfig.WebConfig.StaticDir, url) return BeeApp } From 9f2a2507fd61781a7212b12b2a2989a722d48e1d Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 9 Dec 2015 23:47:44 +0800 Subject: [PATCH 313/436] fmt it and remove the init var --- grace/grace.go | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/grace/grace.go b/grace/grace.go index 355e5d1a..af530d50 100644 --- a/grace/grace.go +++ b/grace/grace.go @@ -53,18 +53,17 @@ import ( ) const ( -// PreSignal is the position to add filter before signal + // PreSignal is the position to add filter before signal PreSignal = iota -// PostSignal is the position to add filter after signal + // PostSignal is the position to add filter after signal PostSignal - -// StateInit represent the application inited + // StateInit represent the application inited StateInit -// StateRunning represent the application is running + // StateRunning represent the application is running StateRunning -// StateShuttingDown represent the application is shutting down + // StateShuttingDown represent the application is shutting down StateShuttingDown -// StateTerminate represent the application is killed + // StateTerminate represent the application is killed StateTerminate ) @@ -75,24 +74,20 @@ var ( socketPtrOffsetMap map[string]uint runningServersForked bool -// DefaultReadTimeOut is the HTTP read timeout + // DefaultReadTimeOut is the HTTP read timeout DefaultReadTimeOut time.Duration -// DefaultWriteTimeOut is the HTTP Write timeout + // DefaultWriteTimeOut is the HTTP Write timeout DefaultWriteTimeOut time.Duration -// DefaultMaxHeaderBytes is the Max HTTP Herder size, default is 0, no limit + // DefaultMaxHeaderBytes is the Max HTTP Herder size, default is 0, no limit DefaultMaxHeaderBytes int -// DefaultTimeout is the shutdown server's timeout. default is 60s - DefaultTimeout time.Duration + // DefaultTimeout is the shutdown server's timeout. default is 60s + DefaultTimeout = 60 * time.Second - isChild bool + isChild bool socketOrder string - once sync.Once + once sync.Once ) -func init() { - DefaultMaxHeaderBytes = 0 - DefaultTimeout = 60 * time.Second -} func onceInit() { regLock = &sync.Mutex{} flag.BoolVar(&isChild, "graceful", false, "listen on open fd (after forking)") From 4f829af7aa5e7ee2b7bcacb69b7898359b366cb0 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 10 Dec 2015 00:11:24 +0800 Subject: [PATCH 314/436] gofmt the config default --- config.go | 187 +++++++++++------------------------------------------- 1 file changed, 38 insertions(+), 149 deletions(-) diff --git a/config.go b/config.go index 85b3eede..163647f1 100644 --- a/config.go +++ b/config.go @@ -194,135 +194,47 @@ func ParseConfig() (err error) { BConfig.RunMode = runmode } + BConfig.AppName = AppConfig.DefaultString("AppName", BConfig.AppName) + BConfig.RecoverPanic = AppConfig.DefaultBool("RecoverPanic", BConfig.RecoverPanic) + BConfig.RouterCaseSensitive = AppConfig.DefaultBool("RouterCaseSensitive", BConfig.RouterCaseSensitive) + BConfig.ServerName = AppConfig.DefaultString("BeegoServerName", BConfig.ServerName) + BConfig.EnableGzip = AppConfig.DefaultBool("EnableGzip", BConfig.EnableGzip) + BConfig.EnableErrorsShow = AppConfig.DefaultBool("EnableErrorsShow", BConfig.EnableErrorsShow) + BConfig.CopyRequestBody = AppConfig.DefaultBool("CopyRequestBody", BConfig.CopyRequestBody) + BConfig.MaxMemory = AppConfig.DefaultInt64("MaxMemory", BConfig.MaxMemory) + BConfig.Listen.Graceful = AppConfig.DefaultBool("Graceful", BConfig.Listen.Graceful) BConfig.Listen.HTTPAddr = AppConfig.String("HTTPAddr") + BConfig.Listen.HTTPPort = AppConfig.DefaultInt("HTTPPort", BConfig.Listen.HTTPPort) + BConfig.Listen.ListenTCP4 = AppConfig.DefaultBool("ListenTCP4", BConfig.Listen.ListenTCP4) + BConfig.Listen.HTTPEnable = AppConfig.DefaultBool("EnableHTTPListen", BConfig.Listen.HTTPEnable) + BConfig.Listen.HTTPSEnable = AppConfig.DefaultBool("EnableHTTPTLS", BConfig.Listen.HTTPSEnable) + BConfig.Listen.HTTPSPort = AppConfig.DefaultInt("HTTPSPort", BConfig.Listen.HTTPSPort) + BConfig.Listen.HTTPSCertFile = AppConfig.DefaultString("HTTPCertFile", BConfig.Listen.HTTPSCertFile) + BConfig.Listen.HTTPSKeyFile = AppConfig.DefaultString("HTTPKeyFile", BConfig.Listen.HTTPSKeyFile) + BConfig.Listen.AdminEnable = AppConfig.DefaultBool("EnableAdmin", BConfig.Listen.AdminEnable) + BConfig.Listen.AdminAddr = AppConfig.DefaultString("AdminHTTPAddr", BConfig.Listen.AdminAddr) + BConfig.Listen.AdminPort = AppConfig.DefaultInt("AdminHTTPPort", BConfig.Listen.AdminPort) + BConfig.Listen.EnableFcgi = AppConfig.DefaultBool("EnableFcgi", BConfig.Listen.EnableFcgi) + BConfig.Listen.ServerTimeOut = AppConfig.DefaultInt64("HTTPServerTimeOut", BConfig.Listen.ServerTimeOut) + BConfig.WebConfig.AutoRender = AppConfig.DefaultBool("AutoRender", BConfig.WebConfig.AutoRender) + BConfig.WebConfig.ViewsPath = AppConfig.DefaultString("ViewsPath", BConfig.WebConfig.ViewsPath) + BConfig.WebConfig.DirectoryIndex = AppConfig.DefaultBool("DirectoryIndex", BConfig.WebConfig.DirectoryIndex) + BConfig.WebConfig.XSRFKEY = AppConfig.DefaultString("XSRFKEY", BConfig.WebConfig.XSRFKEY) + BConfig.WebConfig.EnableXSRF = AppConfig.DefaultBool("EnableXSRF", BConfig.WebConfig.EnableXSRF) + BConfig.WebConfig.XSRFExpire = AppConfig.DefaultInt("XSRFExpire", BConfig.WebConfig.XSRFExpire) + BConfig.WebConfig.TemplateLeft = AppConfig.DefaultString("TemplateLeft", BConfig.WebConfig.TemplateLeft) + BConfig.WebConfig.TemplateRight = AppConfig.DefaultString("TemplateRight", BConfig.WebConfig.TemplateRight) + BConfig.WebConfig.Session.SessionOn = AppConfig.DefaultBool("SessionOn", BConfig.WebConfig.Session.SessionOn) + BConfig.WebConfig.Session.SessionProvider = AppConfig.DefaultString("SessionProvider", BConfig.WebConfig.Session.SessionProvider) + BConfig.WebConfig.Session.SessionName = AppConfig.DefaultString("SessionName", BConfig.WebConfig.Session.SessionName) + BConfig.WebConfig.Session.SessionProviderConfig = AppConfig.DefaultString("SessionProviderConfig", BConfig.WebConfig.Session.SessionProviderConfig) + BConfig.WebConfig.Session.SessionGCMaxLifetime = AppConfig.DefaultInt64("SessionGCMaxLifetime", BConfig.WebConfig.Session.SessionGCMaxLifetime) + BConfig.WebConfig.Session.SessionCookieLifeTime = AppConfig.DefaultInt("SessionCookieLifeTime", BConfig.WebConfig.Session.SessionCookieLifeTime) - if v, err := AppConfig.Int("HTTPPort"); err == nil { - BConfig.Listen.HTTPPort = v - } + BConfig.WebConfig.FlashName = AppConfig.DefaultString("FlashName", BConfig.WebConfig.FlashName) + BConfig.WebConfig.FlashSeperator = AppConfig.DefaultString("FlashSeperator", BConfig.WebConfig.FlashSeperator) - if v, err := AppConfig.Bool("ListenTCP4"); err == nil { - BConfig.Listen.ListenTCP4 = v - } - - if v, err := AppConfig.Bool("EnableHTTPListen"); err == nil { - BConfig.Listen.HTTPEnable = v - } - - if maxmemory, err := AppConfig.Int64("MaxMemory"); err == nil { - BConfig.MaxMemory = maxmemory - } - - if appname := AppConfig.String("AppName"); appname != "" { - BConfig.AppName = appname - } - - if autorender, err := AppConfig.Bool("AutoRender"); err == nil { - BConfig.WebConfig.AutoRender = autorender - } - - if autorecover, err := AppConfig.Bool("RecoverPanic"); err == nil { - BConfig.RecoverPanic = autorecover - } - - if views := AppConfig.String("ViewsPath"); views != "" { - BConfig.WebConfig.ViewsPath = views - } - - if sessionon, err := AppConfig.Bool("SessionOn"); err == nil { - BConfig.WebConfig.Session.SessionOn = sessionon - } - - if sessProvider := AppConfig.String("SessionProvider"); sessProvider != "" { - BConfig.WebConfig.Session.SessionProvider = sessProvider - } - - if sessName := AppConfig.String("SessionName"); sessName != "" { - BConfig.WebConfig.Session.SessionName = sessName - } - - if sessProvConfig := AppConfig.String("SessionProviderConfig"); sessProvConfig != "" { - BConfig.WebConfig.Session.SessionProviderConfig = sessProvConfig - } - - if sessMaxLifeTime, err := AppConfig.Int64("SessionGCMaxLifetime"); err == nil && sessMaxLifeTime != 0 { - BConfig.WebConfig.Session.SessionGCMaxLifetime = sessMaxLifeTime - } - - if sesscookielifetime, err := AppConfig.Int("SessionCookieLifeTime"); err == nil && sesscookielifetime != 0 { - BConfig.WebConfig.Session.SessionCookieLifeTime = sesscookielifetime - } - - if enableFcgi, err := AppConfig.Bool("EnableFcgi"); err == nil { - BConfig.Listen.EnableFcgi = enableFcgi - } - - if enablegzip, err := AppConfig.Bool("EnableGzip"); err == nil { - BConfig.EnableGzip = enablegzip - } - - if directoryindex, err := AppConfig.Bool("DirectoryIndex"); err == nil { - BConfig.WebConfig.DirectoryIndex = directoryindex - } - - if timeout, err := AppConfig.Int64("HTTPServerTimeOut"); err == nil { - BConfig.Listen.ServerTimeOut = timeout - } - - if errorsshow, err := AppConfig.Bool("EnableErrorsShow"); err == nil { - BConfig.EnableErrorsShow = errorsshow - } - - if copyrequestbody, err := AppConfig.Bool("CopyRequestBody"); err == nil { - BConfig.CopyRequestBody = copyrequestbody - } - - if xsrfkey := AppConfig.String("XSRFKEY"); xsrfkey != "" { - BConfig.WebConfig.XSRFKEY = xsrfkey - } - - if enablexsrf, err := AppConfig.Bool("EnableXSRF"); err == nil { - BConfig.WebConfig.EnableXSRF = enablexsrf - } - - if expire, err := AppConfig.Int("XSRFExpire"); err == nil { - BConfig.WebConfig.XSRFExpire = expire - } - - if tplleft := AppConfig.String("TemplateLeft"); tplleft != "" { - BConfig.WebConfig.TemplateLeft = tplleft - } - - if tplright := AppConfig.String("TemplateRight"); tplright != "" { - BConfig.WebConfig.TemplateRight = tplright - } - - if httptls, err := AppConfig.Bool("EnableHTTPTLS"); err == nil { - BConfig.Listen.HTTPSEnable = httptls - } - - if httpsport, err := AppConfig.Int("HTTPSPort"); err == nil { - BConfig.Listen.HTTPSPort = httpsport - } - - if certfile := AppConfig.String("HTTPCertFile"); certfile != "" { - BConfig.Listen.HTTPSCertFile = certfile - } - - if keyfile := AppConfig.String("HTTPKeyFile"); keyfile != "" { - BConfig.Listen.HTTPSKeyFile = keyfile - } - - if serverName := AppConfig.String("BeegoServerName"); serverName != "" { - BConfig.ServerName = serverName - } - - if flashname := AppConfig.String("FlashName"); flashname != "" { - BConfig.WebConfig.FlashName = flashname - } - - if flashseperator := AppConfig.String("FlashSeperator"); flashseperator != "" { - BConfig.WebConfig.FlashSeperator = flashseperator - } + BConfig.WebConfig.EnableDocs = AppConfig.DefaultBool("EnableDocs", BConfig.WebConfig.EnableDocs) if sd := AppConfig.String("StaticDir"); sd != "" { for k := range BConfig.WebConfig.StaticDir { @@ -355,29 +267,6 @@ func ParseConfig() (err error) { BConfig.WebConfig.StaticExtensionsToGzip = fileExts } } - - if enableadmin, err := AppConfig.Bool("EnableAdmin"); err == nil { - BConfig.Listen.AdminEnable = enableadmin - } - - if adminhttpaddr := AppConfig.String("AdminHTTPAddr"); adminhttpaddr != "" { - BConfig.Listen.AdminAddr = adminhttpaddr - } - - if adminhttpport, err := AppConfig.Int("AdminHTTPPort"); err == nil { - BConfig.Listen.AdminPort = adminhttpport - } - - if enabledocs, err := AppConfig.Bool("EnableDocs"); err == nil { - BConfig.WebConfig.EnableDocs = enabledocs - } - - if casesensitive, err := AppConfig.Bool("RouterCaseSensitive"); err == nil { - BConfig.RouterCaseSensitive = casesensitive - } - if graceful, err := AppConfig.Bool("Graceful"); err == nil { - BConfig.Listen.Graceful = graceful - } return nil } From f2edfbe7ae307e64aec63df6dac51e6e3f699193 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 10 Dec 2015 00:12:52 +0800 Subject: [PATCH 315/436] make the other three beauty --- config.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/config.go b/config.go index 163647f1..87066e99 100644 --- a/config.go +++ b/config.go @@ -219,6 +219,9 @@ func ParseConfig() (err error) { BConfig.WebConfig.AutoRender = AppConfig.DefaultBool("AutoRender", BConfig.WebConfig.AutoRender) BConfig.WebConfig.ViewsPath = AppConfig.DefaultString("ViewsPath", BConfig.WebConfig.ViewsPath) BConfig.WebConfig.DirectoryIndex = AppConfig.DefaultBool("DirectoryIndex", BConfig.WebConfig.DirectoryIndex) + BConfig.WebConfig.FlashName = AppConfig.DefaultString("FlashName", BConfig.WebConfig.FlashName) + BConfig.WebConfig.FlashSeperator = AppConfig.DefaultString("FlashSeperator", BConfig.WebConfig.FlashSeperator) + BConfig.WebConfig.EnableDocs = AppConfig.DefaultBool("EnableDocs", BConfig.WebConfig.EnableDocs) BConfig.WebConfig.XSRFKEY = AppConfig.DefaultString("XSRFKEY", BConfig.WebConfig.XSRFKEY) BConfig.WebConfig.EnableXSRF = AppConfig.DefaultBool("EnableXSRF", BConfig.WebConfig.EnableXSRF) BConfig.WebConfig.XSRFExpire = AppConfig.DefaultInt("XSRFExpire", BConfig.WebConfig.XSRFExpire) @@ -231,11 +234,6 @@ func ParseConfig() (err error) { BConfig.WebConfig.Session.SessionGCMaxLifetime = AppConfig.DefaultInt64("SessionGCMaxLifetime", BConfig.WebConfig.Session.SessionGCMaxLifetime) BConfig.WebConfig.Session.SessionCookieLifeTime = AppConfig.DefaultInt("SessionCookieLifeTime", BConfig.WebConfig.Session.SessionCookieLifeTime) - BConfig.WebConfig.FlashName = AppConfig.DefaultString("FlashName", BConfig.WebConfig.FlashName) - BConfig.WebConfig.FlashSeperator = AppConfig.DefaultString("FlashSeperator", BConfig.WebConfig.FlashSeperator) - - BConfig.WebConfig.EnableDocs = AppConfig.DefaultBool("EnableDocs", BConfig.WebConfig.EnableDocs) - if sd := AppConfig.String("StaticDir"); sd != "" { for k := range BConfig.WebConfig.StaticDir { delete(BConfig.WebConfig.StaticDir, k) From f70f338025826db9cb3fc522ac89c962f255b97b Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 10 Dec 2015 21:59:54 +0800 Subject: [PATCH 316/436] use sync.Pool to reuse Context --- context/context.go | 16 +++++++++ context/input.go | 81 ++++++++++++++++++++++++---------------------- context/output.go | 8 ++++- docs.go | 8 +---- router.go | 48 +++++++++++---------------- staticfile.go | 2 +- 6 files changed, 86 insertions(+), 77 deletions(-) diff --git a/context/context.go b/context/context.go index 8f1144f3..a7df6f8d 100644 --- a/context/context.go +++ b/context/context.go @@ -35,6 +35,14 @@ import ( "github.com/astaxie/beego/utils" ) +// NewContext return the Context with Input and Output +func NewContext() *Context { + return &Context{ + Input: NewInput(), + Output: NewOutput(), + } +} + // Context Http request context struct including BeegoInput, BeegoOutput, http.Request and http.ResponseWriter. // BeegoInput and BeegoOutput provides some api to operate request and response more easily. type Context struct { @@ -45,6 +53,14 @@ type Context struct { _xsrfToken string } +// Reset init Context, BeegoInput and BeegoOutput +func (ctx *Context) Reset(rw http.ResponseWriter, r *http.Request) { + ctx.Request = r + ctx.ResponseWriter = rw + ctx.Input.Reset(ctx) + ctx.Output.Reset(ctx) +} + // Redirect does redirection to localurl with http header status code. // It sends http response header directly. func (ctx *Context) Redirect(status int, localurl string) { diff --git a/context/input.go b/context/input.go index 53cc3e88..9649e14f 100644 --- a/context/input.go +++ b/context/input.go @@ -18,7 +18,6 @@ import ( "bytes" "errors" "io/ioutil" - "net/http" "net/url" "reflect" "regexp" @@ -39,37 +38,43 @@ var ( // BeegoInput operates the http request header, data, cookie and body. // it also contains router params and current session. type BeegoInput struct { - CruSession session.Store - Params map[string]string - Data map[interface{}]interface{} // store some values in this context when calling context in filter or controller. - Request *http.Request - RequestBody []byte - RunController reflect.Type - RunMethod string + Context *Context + CruSession session.Store + Params map[string]string + Data map[interface{}]interface{} // store some values in this context when calling context in filter or controller. + RequestBody []byte } -// NewInput return BeegoInput generated by http.Request. -func NewInput(req *http.Request) *BeegoInput { +// NewInput return BeegoInput generated by Context. +func NewInput() *BeegoInput { return &BeegoInput{ - Params: make(map[string]string), - Data: make(map[interface{}]interface{}), - Request: req, + Params: make(map[string]string), + Data: make(map[interface{}]interface{}), } } +// Reset init the BeegoInput +func (input *BeegoInput) Reset(ctx *Context) { + input.Context = ctx + input.CruSession = nil + input.Params = make(map[string]string) + input.Data = make(map[interface{}]interface{}) + input.RequestBody = []byte{} +} + // Protocol returns request protocol name, such as HTTP/1.1 . func (input *BeegoInput) Protocol() string { - return input.Request.Proto + return input.Context.Request.Proto } // URI returns full request url with query string, fragment. func (input *BeegoInput) URI() string { - return input.Request.RequestURI + return input.Context.Request.RequestURI } // URL returns request url path (without query string, fragment). func (input *BeegoInput) URL() string { - return input.Request.URL.Path + return input.Context.Request.URL.Path } // Site returns base site url as scheme://domain type. @@ -79,10 +84,10 @@ func (input *BeegoInput) Site() string { // Scheme returns request scheme as "http" or "https". func (input *BeegoInput) Scheme() string { - if input.Request.URL.Scheme != "" { - return input.Request.URL.Scheme + if input.Context.Request.URL.Scheme != "" { + return input.Context.Request.URL.Scheme } - if input.Request.TLS == nil { + if input.Context.Request.TLS == nil { return "http" } return "https" @@ -97,19 +102,19 @@ func (input *BeegoInput) Domain() string { // Host returns host name. // if no host info in request, return localhost. func (input *BeegoInput) Host() string { - if input.Request.Host != "" { - hostParts := strings.Split(input.Request.Host, ":") + if input.Context.Request.Host != "" { + hostParts := strings.Split(input.Context.Request.Host, ":") if len(hostParts) > 0 { return hostParts[0] } - return input.Request.Host + return input.Context.Request.Host } return "localhost" } // Method returns http request method. func (input *BeegoInput) Method() string { - return input.Request.Method + return input.Context.Request.Method } // Is returns boolean of this request is on given method, such as Is("POST"). @@ -196,7 +201,7 @@ func (input *BeegoInput) IP() string { rip := strings.Split(ips[0], ":") return rip[0] } - ip := strings.Split(input.Request.RemoteAddr, ":") + ip := strings.Split(input.Context.Request.RemoteAddr, ":") if len(ip) > 0 { if ip[0] != "[" { return ip[0] @@ -236,7 +241,7 @@ func (input *BeegoInput) SubDomains() string { // Port returns request client port. // when error or empty, return 80. func (input *BeegoInput) Port() int { - parts := strings.Split(input.Request.Host, ":") + parts := strings.Split(input.Context.Request.Host, ":") if len(parts) == 2 { port, _ := strconv.Atoi(parts[1]) return port @@ -262,22 +267,22 @@ func (input *BeegoInput) Query(key string) string { if val := input.Param(key); val != "" { return val } - if input.Request.Form == nil { - input.Request.ParseForm() + if input.Context.Request.Form == nil { + input.Context.Request.ParseForm() } - return input.Request.Form.Get(key) + return input.Context.Request.Form.Get(key) } // Header returns request header item string by a given string. // if non-existed, return empty string. func (input *BeegoInput) Header(key string) string { - return input.Request.Header.Get(key) + return input.Context.Request.Header.Get(key) } // Cookie returns request cookie item string by a given key. // if non-existed, return empty string. func (input *BeegoInput) Cookie(key string) string { - ck, err := input.Request.Cookie(key) + ck, err := input.Context.Request.Cookie(key) if err != nil { return "" } @@ -292,10 +297,10 @@ func (input *BeegoInput) Session(key interface{}) interface{} { // CopyBody returns the raw request body data as bytes. func (input *BeegoInput) CopyBody() []byte { - requestbody, _ := ioutil.ReadAll(input.Request.Body) - input.Request.Body.Close() + requestbody, _ := ioutil.ReadAll(input.Context.Request.Body) + input.Context.Request.Body.Close() bf := bytes.NewBuffer(requestbody) - input.Request.Body = ioutil.NopCloser(bf) + input.Context.Request.Body = ioutil.NopCloser(bf) input.RequestBody = requestbody return requestbody } @@ -318,10 +323,10 @@ func (input *BeegoInput) SetData(key, val interface{}) { func (input *BeegoInput) ParseFormOrMulitForm(maxMemory int64) error { // Parse the body depending on the content type. if strings.Contains(input.Header("Content-Type"), "multipart/form-data") { - if err := input.Request.ParseMultipartForm(maxMemory); err != nil { + if err := input.Context.Request.ParseMultipartForm(maxMemory); err != nil { return errors.New("Error parsing request body:" + err.Error()) } - } else if err := input.Request.ParseForm(); err != nil { + } else if err := input.Context.Request.ParseForm(); err != nil { return errors.New("Error parsing request body:" + err.Error()) } return nil @@ -386,13 +391,13 @@ func (input *BeegoInput) bind(key string, typ reflect.Type) reflect.Value { } rv = input.bindBool(val, typ) case reflect.Slice: - rv = input.bindSlice(&input.Request.Form, key, typ) + rv = input.bindSlice(&input.Context.Request.Form, key, typ) case reflect.Struct: - rv = input.bindStruct(&input.Request.Form, key, typ) + rv = input.bindStruct(&input.Context.Request.Form, key, typ) case reflect.Ptr: rv = input.bindPoint(key, typ) case reflect.Map: - rv = input.bindMap(&input.Request.Form, key, typ) + rv = input.bindMap(&input.Context.Request.Form, key, typ) } return rv } diff --git a/context/output.go b/context/output.go index f0d66f36..2d756e27 100644 --- a/context/output.go +++ b/context/output.go @@ -43,6 +43,12 @@ func NewOutput() *BeegoOutput { return &BeegoOutput{} } +// Reset init BeegoOutput +func (output *BeegoOutput) Reset(ctx *Context) { + output.Context = ctx + output.Status = 0 +} + // Header sets response header item string via given key. func (output *BeegoOutput) Header(key, val string) { output.Context.ResponseWriter.Header().Set(key, val) @@ -55,7 +61,7 @@ func (output *BeegoOutput) Body(content []byte) { var encoding string var buf = &bytes.Buffer{} if output.EnableGzip { - encoding = ParseEncoding(output.Context.Input.Request) + encoding = ParseEncoding(output.Context.Request) } if b, n, _ := WriteBody(encoding, buf, content); b { output.Header("Content-Encoding", n) diff --git a/docs.go b/docs.go index 5031dc12..0e0f13f7 100644 --- a/docs.go +++ b/docs.go @@ -21,13 +21,7 @@ import ( ) // GlobalDocAPI store the swagger api documents -var GlobalDocAPI map[string]interface{} - -func init() { - if BConfig.WebConfig.EnableDocs { - GlobalDocAPI = make(map[string]interface{}) - } -} +var GlobalDocAPI = make(map[string]interface{}) func serverDocs(ctx *context.Context) { var obj interface{} diff --git a/router.go b/router.go index 28d641d0..a575f9ed 100644 --- a/router.go +++ b/router.go @@ -24,6 +24,7 @@ import ( "runtime" "strconv" "strings" + "sync" "time" beecontext "github.com/astaxie/beego/context" @@ -83,7 +84,7 @@ type logFilter struct { } func (l *logFilter) Filter(ctx *beecontext.Context) bool { - requestPath := path.Clean(ctx.Input.Request.URL.Path) + requestPath := path.Clean(ctx.Request.URL.Path) if requestPath == "/favicon.ico" || requestPath == "/robots.txt" { return true } @@ -114,14 +115,19 @@ type ControllerRegister struct { routers map[string]*Tree enableFilter bool filters map[int][]*FilterRouter + pool sync.Pool } // NewControllerRegister returns a new ControllerRegister. func NewControllerRegister() *ControllerRegister { - return &ControllerRegister{ + cr := &ControllerRegister{ routers: make(map[string]*Tree), filters: make(map[int][]*FilterRouter), } + cr.pool.New = func() interface{} { + return beecontext.NewContext() + } + return cr } // Add controller handler and pattern rules to ControllerRegister. @@ -132,7 +138,7 @@ func NewControllerRegister() *ControllerRegister { // Add("/api/create",&RestController{},"post:CreateFood") // Add("/api/update",&RestController{},"put:UpdateFood") // Add("/api/delete",&RestController{},"delete:DeleteFood") -// Add("/api",&RestController{},"get,post:ApiFunc") +// Add("/api",&RestController{},"get,post:ApiFunc" // Add("/simple",&SimpleController{},"get:GetFunc;post:PostFunc") func (p *ControllerRegister) Add(pattern string, c ControllerInterface, mappingMethods ...string) { reflectVal := reflect.ValueOf(c) @@ -573,26 +579,18 @@ func (p *ControllerRegister) geturl(t *Tree, url, controllName, methodName strin // Implement http.Handler interface. func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) { starttime := time.Now() - var runrouter reflect.Type - var findrouter bool - var runMethod string - var routerInfo *controllerInfo - - w := &responseWriter{rw, false, 0} - + var ( + runrouter reflect.Type + findrouter bool + runMethod string + routerInfo *controllerInfo + w = &responseWriter{rw, false, 0} + ) if BConfig.RunMode == "dev" { w.Header().Set("Server", BConfig.ServerName) } - - // init context - context := &beecontext.Context{ - ResponseWriter: w, - Request: r, - Input: beecontext.NewInput(r), - Output: beecontext.NewOutput(), - } - context.Output.Context = context - context.Output.EnableGzip = BConfig.EnableGzip + context := p.pool.Get().(*beecontext.Context) + context.Reset(w, r) defer p.recoverPanic(context) @@ -670,23 +668,14 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) goto Admin } - if context.Input.RunController != nil && context.Input.RunMethod != "" { - findrouter = true - runMethod = context.Input.RunMethod - runrouter = context.Input.RunController - } - if !findrouter { httpMethod := r.Method - if httpMethod == "POST" && context.Input.Query("_method") == "PUT" { httpMethod = "PUT" } - if httpMethod == "POST" && context.Input.Query("_method") == "DELETE" { httpMethod = "DELETE" } - if t, ok := p.routers[httpMethod]; ok { runObject, p := t.Match(urlPath) if r, ok := runObject.(*controllerInfo); ok { @@ -897,7 +886,6 @@ type responseWriter struct { status int } - // Write writes the data to the connection as part of an HTTP reply, // and sets `started` to true. // started means the response has sent out. diff --git a/staticfile.go b/staticfile.go index 031667ed..f3ea59a9 100644 --- a/staticfile.go +++ b/staticfile.go @@ -144,7 +144,7 @@ func isStaticCompress(filePath string) bool { // searchFile search the file by url path // if none the static file prefix matches ,return notStaticRequestErr func searchFile(ctx *context.Context) (string, os.FileInfo, error) { - requestPath := filepath.ToSlash(filepath.Clean(ctx.Input.Request.URL.Path)) + requestPath := filepath.ToSlash(filepath.Clean(ctx.Request.URL.Path)) // special processing : favicon.ico/robots.txt can be in any static dir if requestPath == "/favicon.ico" || requestPath == "/robots.txt" { file := path.Join(".", requestPath) From 80bc372f170e14cec0ccf74b9d729b9ba1686071 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 11 Dec 2015 00:20:17 +0800 Subject: [PATCH 317/436] pool.Put --- context/context.go | 28 +++++++++++- router.go | 110 ++++++++++++++++++--------------------------- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/context/context.go b/context/context.go index a7df6f8d..f3dffdbd 100644 --- a/context/context.go +++ b/context/context.go @@ -49,14 +49,14 @@ type Context struct { Input *BeegoInput Output *BeegoOutput Request *http.Request - ResponseWriter http.ResponseWriter + ResponseWriter *Response _xsrfToken string } // Reset init Context, BeegoInput and BeegoOutput func (ctx *Context) Reset(rw http.ResponseWriter, r *http.Request) { ctx.Request = r - ctx.ResponseWriter = rw + ctx.ResponseWriter = &Response{rw, false, 0} ctx.Input.Reset(ctx) ctx.Output.Reset(ctx) } @@ -164,3 +164,27 @@ func (ctx *Context) CheckXSRFCookie() bool { } return true } + +//Response is a wrapper for the http.ResponseWriter +//started set to true if response was written to then don't execute other handler +type Response struct { + http.ResponseWriter + Started bool + Status int +} + +// Write writes the data to the connection as part of an HTTP reply, +// and sets `started` to true. +// started means the response has sent out. +func (w *Response) Write(p []byte) (int, error) { + w.Started = true + return w.ResponseWriter.Write(p) +} + +// WriteHeader sends an HTTP response header with status code, +// and sets `started` to true. +func (w *Response) WriteHeader(code int) { + w.Status = code + w.Started = true + w.ResponseWriter.WriteHeader(code) +} diff --git a/router.go b/router.go index a575f9ed..01dae8aa 100644 --- a/router.go +++ b/router.go @@ -576,6 +576,31 @@ func (p *ControllerRegister) geturl(t *Tree, url, controllName, methodName strin return false, "" } +func (p *ControllerRegister) execFilter(context *beecontext.Context, pos int, urlPath string) (started bool) { + if p.enableFilter { + if l, ok := p.filters[pos]; ok { + for _, filterR := range l { + if filterR.returnOnOutput && context.ResponseWriter.Started { + return true + } + if ok, params := filterR.ValidRouter(urlPath); ok { + for k, v := range params { + if context.Input.Params == nil { + context.Input.Params = make(map[string]string) + } + context.Input.Params[k] = v + } + filterR.filterFunc(context) + } + if filterR.returnOnOutput && context.ResponseWriter.Started { + return true + } + } + } + } + return false +} + // Implement http.Handler interface. func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) { starttime := time.Now() @@ -584,61 +609,36 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) findrouter bool runMethod string routerInfo *controllerInfo - w = &responseWriter{rw, false, 0} ) - if BConfig.RunMode == "dev" { - w.Header().Set("Server", BConfig.ServerName) - } context := p.pool.Get().(*beecontext.Context) - context.Reset(w, r) - + context.Reset(rw, r) + defer p.pool.Put(context) defer p.recoverPanic(context) + if BConfig.RunMode == "dev" { + context.Output.Header("Server", BConfig.ServerName) + } + var urlPath string if !BConfig.RouterCaseSensitive { urlPath = strings.ToLower(r.URL.Path) } else { urlPath = r.URL.Path } - // defined filter function - doFilter := func(pos int) (started bool) { - if p.enableFilter { - if l, ok := p.filters[pos]; ok { - for _, filterR := range l { - if filterR.returnOnOutput && w.started { - return true - } - if ok, params := filterR.ValidRouter(urlPath); ok { - for k, v := range params { - if context.Input.Params == nil { - context.Input.Params = make(map[string]string) - } - context.Input.Params[k] = v - } - filterR.filterFunc(context) - } - if filterR.returnOnOutput && w.started { - return true - } - } - } - } - return false - } // filter wrong httpmethod if _, ok := HTTPMETHOD[r.Method]; !ok { - http.Error(w, "Method Not Allowed", 405) + http.Error(rw, "Method Not Allowed", 405) goto Admin } // filter for static file - if doFilter(BeforeStatic) { + if p.execFilter(context, BeforeStatic, urlPath) { goto Admin } serverStaticRouter(context) - if w.started { + if context.ResponseWriter.Started { findrouter = true goto Admin } @@ -646,14 +646,14 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) // session init if BConfig.WebConfig.Session.SessionOn { var err error - context.Input.CruSession, err = GlobalSessions.SessionStart(w, r) + context.Input.CruSession, err = GlobalSessions.SessionStart(rw, r) if err != nil { Error(err) exception("503", context) return } defer func() { - context.Input.CruSession.SessionRelease(w) + context.Input.CruSession.SessionRelease(rw) }() } @@ -664,7 +664,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) context.Input.ParseFormOrMulitForm(BConfig.MaxMemory) } - if doFilter(BeforeRouter) { + if p.execFilter(context, BeforeRouter, urlPath) { goto Admin } @@ -703,7 +703,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) if findrouter { //execute middleware filters - if doFilter(BeforeExec) { + if p.execFilter(context, BeforeExec, urlPath) { goto Admin } isRunnable := false @@ -764,7 +764,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) execController.URLMapping() - if !w.started { + if !context.ResponseWriter.Started { //exec main logic switch runMethod { case "GET": @@ -790,7 +790,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) } //render template - if !w.started && context.Output.Status == 0 { + if !context.ResponseWriter.Started && context.Output.Status == 0 { if BConfig.WebConfig.AutoRender { if err := execController.Render(); err != nil { panic(err) @@ -804,12 +804,12 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) } //execute middleware filters - if doFilter(AfterExec) { + if p.execFilter(context, AfterExec, urlPath) { goto Admin } } - doFilter(FinishRouter) + p.execFilter(context, FinishRouter, urlPath) Admin: timeend := time.Since(starttime) @@ -842,7 +842,7 @@ Admin: // Call WriteHeader if status code has been set changed if context.Output.Status != 0 { - w.WriteHeader(context.Output.Status) + context.ResponseWriter.WriteHeader(context.Output.Status) } } @@ -878,30 +878,6 @@ func (p *ControllerRegister) recoverPanic(context *beecontext.Context) { } } -//responseWriter is a wrapper for the http.ResponseWriter -//started set to true if response was written to then don't execute other handler -type responseWriter struct { - http.ResponseWriter - started bool - status int -} - -// Write writes the data to the connection as part of an HTTP reply, -// and sets `started` to true. -// started means the response has sent out. -func (w *responseWriter) Write(p []byte) (int, error) { - w.started = true - return w.ResponseWriter.Write(p) -} - -// WriteHeader sends an HTTP response header with status code, -// and sets `started` to true. -func (w *responseWriter) WriteHeader(code int) { - w.status = code - w.started = true - w.ResponseWriter.WriteHeader(code) -} - func tourl(params map[string]string) string { if len(params) == 0 { return "" From 2b651fbae2ea2d787aed897dc3ef1631e4c6b643 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 11 Dec 2015 13:51:01 +0800 Subject: [PATCH 318/436] reuse map in tree.Match --- filter.go | 10 +++--- router.go | 17 +++------- tree.go | 92 ++++++++++++++++++++++++---------------------------- tree_test.go | 72 +++++++++++++++++++++++----------------- 4 files changed, 94 insertions(+), 97 deletions(-) diff --git a/filter.go b/filter.go index 7dbc7028..cefd74a1 100644 --- a/filter.go +++ b/filter.go @@ -32,13 +32,13 @@ type FilterRouter struct { // ValidRouter checks if the current request is matched by this filter. // If the request is matched, the values of the URL parameters defined // by the filter pattern are also returned. -func (f *FilterRouter) ValidRouter(url string) (bool, map[string]string) { - isok, params := f.tree.Match(url) +func (f *FilterRouter) ValidRouter(url string, ctx *context.Context) bool { + isok := f.tree.Match(url, ctx) if isok == nil { - return false, nil + return false } if isok, ok := isok.(bool); ok { - return isok, params + return isok } - return false, nil + return false } diff --git a/router.go b/router.go index 01dae8aa..effc2b41 100644 --- a/router.go +++ b/router.go @@ -583,13 +583,7 @@ func (p *ControllerRegister) execFilter(context *beecontext.Context, pos int, ur if filterR.returnOnOutput && context.ResponseWriter.Started { return true } - if ok, params := filterR.ValidRouter(urlPath); ok { - for k, v := range params { - if context.Input.Params == nil { - context.Input.Params = make(map[string]string) - } - context.Input.Params[k] = v - } + if ok := filterR.ValidRouter(urlPath, context); ok { filterR.filterFunc(context) } if filterR.returnOnOutput && context.ResponseWriter.Started { @@ -677,19 +671,16 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) httpMethod = "DELETE" } if t, ok := p.routers[httpMethod]; ok { - runObject, p := t.Match(urlPath) + runObject := t.Match(urlPath, context) if r, ok := runObject.(*controllerInfo); ok { routerInfo = r findrouter = true - if splat, ok := p[":splat"]; ok { + if splat, ok := context.Input.Params[":splat"]; ok { splatlist := strings.Split(splat, "/") for k, v := range splatlist { - p[strconv.Itoa(k)] = v + context.Input.Params[strconv.Itoa(k)] = v } } - if p != nil { - context.Input.Params = p - } } } diff --git a/tree.go b/tree.go index bbda2840..e23ce2fc 100644 --- a/tree.go +++ b/tree.go @@ -19,6 +19,7 @@ import ( "regexp" "strings" + "github.com/astaxie/beego/context" "github.com/astaxie/beego/utils" ) @@ -277,64 +278,60 @@ func (t *Tree) addseg(segments []string, route interface{}, wildcards []string, } // Match router to runObject & params -func (t *Tree) Match(pattern string) (runObject interface{}, params map[string]string) { +func (t *Tree) Match(pattern string, ctx *context.Context) (runObject interface{}) { if len(pattern) == 0 || pattern[0] != '/' { - return nil, nil + return nil } - return t.match(splitPath(pattern), nil) + return t.match(splitPath(pattern), nil, ctx) } -func (t *Tree) match(segments []string, wildcardValues []string) (runObject interface{}, params map[string]string) { +func (t *Tree) match(segments []string, wildcardValues []string, ctx *context.Context) (runObject interface{}) { // Handle leaf nodes: if len(segments) == 0 { for _, l := range t.leaves { - if ok, pa := l.match(wildcardValues); ok { - return l.runObject, pa + if ok := l.match(wildcardValues, ctx); ok { + return l.runObject } } if t.wildcard != nil { for _, l := range t.wildcard.leaves { - if ok, pa := l.match(wildcardValues); ok { - return l.runObject, pa + if ok := l.match(wildcardValues, ctx); ok { + return l.runObject } } - } - return nil, nil + return nil } seg, segs := segments[0], segments[1:] subTree, ok := t.fixrouters[seg] if ok { - runObject, params = subTree.match(segs, wildcardValues) + runObject = subTree.match(segs, wildcardValues, ctx) } else if len(segs) == 0 { //.json .xml if subindex := strings.LastIndex(seg, "."); subindex != -1 { subTree, ok = t.fixrouters[seg[:subindex]] if ok { - runObject, params = subTree.match(segs, wildcardValues) + runObject = subTree.match(segs, wildcardValues, ctx) if runObject != nil { - if params == nil { - params = make(map[string]string) - } - params[":ext"] = seg[subindex+1:] - return runObject, params + ctx.Input.Params[":ext"] = seg[subindex+1:] + return runObject } } } } if runObject == nil && t.wildcard != nil { - runObject, params = t.wildcard.match(segs, append(wildcardValues, seg)) + runObject = t.wildcard.match(segs, append(wildcardValues, seg), ctx) } if runObject == nil { for _, l := range t.leaves { - if ok, pa := l.match(append(wildcardValues, segments...)); ok { - return l.runObject, pa + if ok := l.match(append(wildcardValues, segments...), ctx); ok { + return l.runObject } } } - return runObject, params + return runObject } type leafInfo struct { @@ -347,47 +344,43 @@ type leafInfo struct { runObject interface{} } -func (leaf *leafInfo) match(wildcardValues []string) (ok bool, params map[string]string) { +func (leaf *leafInfo) match(wildcardValues []string, ctx *context.Context) (ok bool) { if leaf.regexps == nil { // has error if len(wildcardValues) == 0 && len(leaf.wildcards) > 0 { if utils.InSlice(":", leaf.wildcards) { - params = make(map[string]string) j := 0 for _, v := range leaf.wildcards { if v == ":" { continue } - params[v] = "" + ctx.Input.Params[v] = "" j++ } - return true, params + return true } - return false, nil + return false } else if len(wildcardValues) == 0 { // static path - return true, nil + return true } // match * if len(leaf.wildcards) == 1 && leaf.wildcards[0] == ":splat" { - params = make(map[string]string) - params[":splat"] = path.Join(wildcardValues...) - return true, params + ctx.Input.Params[":splat"] = path.Join(wildcardValues...) + return true } // match *.* if len(leaf.wildcards) == 3 && leaf.wildcards[0] == "." { - params = make(map[string]string) lastone := wildcardValues[len(wildcardValues)-1] strs := strings.SplitN(lastone, ".", 2) if len(strs) == 2 { - params[":ext"] = strs[1] + ctx.Input.Params[":ext"] = strs[1] } else { - params[":ext"] = "" + ctx.Input.Params[":ext"] = "" } - params[":path"] = path.Join(wildcardValues[:len(wildcardValues)-1]...) + "/" + strs[0] - return true, params + ctx.Input.Params[":path"] = path.Join(wildcardValues[:len(wildcardValues)-1]...) + "/" + strs[0] + return true } // match :id - params = make(map[string]string) j := 0 for _, v := range leaf.wildcards { if v == ":" { @@ -397,38 +390,37 @@ func (leaf *leafInfo) match(wildcardValues []string) (ok bool, params map[string lastone := wildcardValues[len(wildcardValues)-1] strs := strings.SplitN(lastone, ".", 2) if len(strs) == 2 { - params[":ext"] = strs[1] + ctx.Input.Params[":ext"] = strs[1] } else { - params[":ext"] = "" + ctx.Input.Params[":ext"] = "" } if len(wildcardValues[j:]) == 1 { - params[":path"] = strs[0] + ctx.Input.Params[":path"] = strs[0] } else { - params[":path"] = path.Join(wildcardValues[j:]...) + "/" + strs[0] + ctx.Input.Params[":path"] = path.Join(wildcardValues[j:]...) + "/" + strs[0] } - return true, params + return true } if len(wildcardValues) <= j { - return false, nil + return false } - params[v] = wildcardValues[j] + ctx.Input.Params[v] = wildcardValues[j] j++ } - if len(params) != len(wildcardValues) { - return false, nil + if len(ctx.Input.Params) != len(wildcardValues) { + return false } - return true, params + return true } if !leaf.regexps.MatchString(path.Join(wildcardValues...)) { - return false, nil + return false } - params = make(map[string]string) matches := leaf.regexps.FindStringSubmatch(path.Join(wildcardValues...)) for i, match := range matches[1:] { - params[leaf.wildcards[i]] = match + ctx.Input.Params[leaf.wildcards[i]] = match } - return true, params + return true } // "/" -> [] diff --git a/tree_test.go b/tree_test.go index 7fe70f51..22a7b6f1 100644 --- a/tree_test.go +++ b/tree_test.go @@ -14,7 +14,11 @@ package beego -import "testing" +import ( + "testing" + + "github.com/astaxie/beego/context" +) type testinfo struct { url string @@ -27,11 +31,11 @@ var routers []testinfo func init() { routers = make([]testinfo, 0) routers = append(routers, testinfo{"/topic/?:auth:int", "/topic", nil}) - routers = append(routers, testinfo{"/topic/?:auth:int", "/topic/123", map[string]string{":auth":"123"}}) + routers = append(routers, testinfo{"/topic/?:auth:int", "/topic/123", map[string]string{":auth": "123"}}) routers = append(routers, testinfo{"/topic/:id/?:auth", "/topic/1", map[string]string{":id": "1"}}) - routers = append(routers, testinfo{"/topic/:id/?:auth", "/topic/1/2", map[string]string{":id": "1",":auth":"2"}}) + routers = append(routers, testinfo{"/topic/:id/?:auth", "/topic/1/2", map[string]string{":id": "1", ":auth": "2"}}) routers = append(routers, testinfo{"/topic/:id/?:auth:int", "/topic/1", map[string]string{":id": "1"}}) - routers = append(routers, testinfo{"/topic/:id/?:auth:int", "/topic/1/123", map[string]string{":id": "1",":auth":"123"}}) + routers = append(routers, testinfo{"/topic/:id/?:auth:int", "/topic/1/123", map[string]string{":id": "1", ":auth": "123"}}) routers = append(routers, testinfo{"/:id", "/123", map[string]string{":id": "123"}}) routers = append(routers, testinfo{"/hello/?:id", "/hello", map[string]string{":id": ""}}) routers = append(routers, testinfo{"/", "/", nil}) @@ -69,13 +73,14 @@ func TestTreeRouters(t *testing.T) { for _, r := range routers { tr := NewTree() tr.AddRouter(r.url, "astaxie") - obj, param := tr.Match(r.requesturl) + ctx := context.NewContext() + obj := tr.Match(r.requesturl, ctx) if obj == nil || obj.(string) != "astaxie" { t.Fatal(r.url + " can't get obj ") } if r.params != nil { for k, v := range r.params { - if vv, ok := param[k]; !ok { + if vv, ok := ctx.Input.Params[k]; !ok { t.Fatal(r.url + " " + r.requesturl + " get param empty:" + k) } else if vv != v { t.Fatal(r.url + " " + r.requesturl + " should be:" + v + " get param:" + vv) @@ -91,47 +96,51 @@ func TestAddTree(t *testing.T) { tr.AddRouter("/shop/:sd/ttt_:id(.+)_:page(.+).html", "astaxie") t1 := NewTree() t1.AddTree("/v1/zl", tr) - obj, param := t1.Match("/v1/zl/shop/123/account") + ctx := context.NewContext() + obj := t1.Match("/v1/zl/shop/123/account", ctx) if obj == nil || obj.(string) != "astaxie" { t.Fatal("/v1/zl/shop/:id/account can't get obj ") } - if param == nil { + if len(ctx.Input.Params) == 0 { t.Fatal("get param error") } - if param[":id"] != "123" { + if ctx.Input.Params[":id"] != "123" { t.Fatal("get :id param error") } - obj, param = t1.Match("/v1/zl/shop/123/ttt_1_12.html") + ctx.Input.Reset(ctx) + obj = t1.Match("/v1/zl/shop/123/ttt_1_12.html", ctx) if obj == nil || obj.(string) != "astaxie" { t.Fatal("/v1/zl//shop/:sd/ttt_:id(.+)_:page(.+).html can't get obj ") } - if param == nil { + if len(ctx.Input.Params) == 0 { t.Fatal("get param error") } - if param[":sd"] != "123" || param[":id"] != "1" || param[":page"] != "12" { + if ctx.Input.Params[":sd"] != "123" || ctx.Input.Params[":id"] != "1" || ctx.Input.Params[":page"] != "12" { t.Fatal("get :sd :id :page param error") } t2 := NewTree() t2.AddTree("/v1/:shopid", tr) - obj, param = t2.Match("/v1/zl/shop/123/account") + ctx.Input.Reset(ctx) + obj = t2.Match("/v1/zl/shop/123/account", ctx) if obj == nil || obj.(string) != "astaxie" { t.Fatal("/v1/:shopid/shop/:id/account can't get obj ") } - if param == nil { + if len(ctx.Input.Params) == 0 { t.Fatal("get param error") } - if param[":id"] != "123" || param[":shopid"] != "zl" { + if ctx.Input.Params[":id"] != "123" || ctx.Input.Params[":shopid"] != "zl" { t.Fatal("get :id :shopid param error") } - obj, param = t2.Match("/v1/zl/shop/123/ttt_1_12.html") + ctx.Input.Reset(ctx) + obj = t2.Match("/v1/zl/shop/123/ttt_1_12.html", ctx) if obj == nil || obj.(string) != "astaxie" { t.Fatal("/v1/:shopid/shop/:sd/ttt_:id(.+)_:page(.+).html can't get obj ") } - if param == nil { + if len(ctx.Input.Params) == 0 { t.Fatal("get :shopid param error") } - if param[":sd"] != "123" || param[":id"] != "1" || param[":page"] != "12" || param[":shopid"] != "zl" { + if ctx.Input.Params[":sd"] != "123" || ctx.Input.Params[":id"] != "1" || ctx.Input.Params[":page"] != "12" || ctx.Input.Params[":shopid"] != "zl" { t.Fatal("get :sd :id :page :shopid param error") } } @@ -142,14 +151,15 @@ func TestAddTree2(t *testing.T) { tr.AddRouter("/shop/:sd/ttt_:id(.+)_:page(.+).html", "astaxie") t3 := NewTree() t3.AddTree("/:version(v1|v2)/:prefix", tr) - obj, param := t3.Match("/v1/zl/shop/123/account") + ctx := context.NewContext() + obj := t3.Match("/v1/zl/shop/123/account", ctx) if obj == nil || obj.(string) != "astaxie" { t.Fatal("/:version(v1|v2)/:prefix/shop/:id/account can't get obj ") } - if param == nil { + if len(ctx.Input.Params) == 0 { t.Fatal("get param error") } - if param[":id"] != "123" || param[":prefix"] != "zl" || param[":version"] != "v1" { + if ctx.Input.Params[":id"] != "123" || ctx.Input.Params[":prefix"] != "zl" || ctx.Input.Params[":version"] != "v1" { t.Fatal("get :id :prefix :version param error") } } @@ -160,17 +170,19 @@ func TestAddTree3(t *testing.T) { tr.AddRouter("/shop/:sd/account", "astaxie") t3 := NewTree() t3.AddTree("/table/:num", tr) - obj, param := t3.Match("/table/123/shop/123/account") + ctx := context.NewContext() + obj := t3.Match("/table/123/shop/123/account", ctx) if obj == nil || obj.(string) != "astaxie" { t.Fatal("/table/:num/shop/:sd/account can't get obj ") } - if param == nil { + if len(ctx.Input.Params) == 0 { t.Fatal("get param error") } - if param[":num"] != "123" || param[":sd"] != "123" { + if ctx.Input.Params[":num"] != "123" || ctx.Input.Params[":sd"] != "123" { t.Fatal("get :num :sd param error") } - obj, param = t3.Match("/table/123/create") + ctx.Input.Reset(ctx) + obj = t3.Match("/table/123/create", ctx) if obj == nil || obj.(string) != "astaxie" { t.Fatal("/table/:num/create can't get obj ") } @@ -182,17 +194,19 @@ func TestAddTree4(t *testing.T) { tr.AddRouter("/shop/:sd/:account", "astaxie") t4 := NewTree() t4.AddTree("/:info:int/:num/:id", tr) - obj, param := t4.Match("/12/123/456/shop/123/account") + ctx := context.NewContext() + obj := t4.Match("/12/123/456/shop/123/account", ctx) if obj == nil || obj.(string) != "astaxie" { t.Fatal("/:info:int/:num/:id/shop/:sd/:account can't get obj ") } - if param == nil { + if len(ctx.Input.Params) == 0 { t.Fatal("get param error") } - if param[":info"] != "12" || param[":num"] != "123" || param[":id"] != "456" || param[":sd"] != "123" || param[":account"] != "account" { + if ctx.Input.Params[":info"] != "12" || ctx.Input.Params[":num"] != "123" || ctx.Input.Params[":id"] != "456" || ctx.Input.Params[":sd"] != "123" || ctx.Input.Params[":account"] != "account" { t.Fatal("get :info :num :id :sd :account param error") } - obj, param = t4.Match("/12/123/456/create") + ctx.Input.Reset(ctx) + obj = t4.Match("/12/123/456/create", ctx) if obj == nil || obj.(string) != "astaxie" { t.Fatal("/:info:int/:num/:id/create can't get obj ") } From a06022f75cc05601921ecc950ed5f53c6a544f01 Mon Sep 17 00:00:00 2001 From: fuxiaohei Date: Sat, 12 Dec 2015 14:10:02 +0800 Subject: [PATCH 319/436] clean compliated codes, refactor if sections in app.go --- admin.go | 236 +++++++++++++++++++++++++++---------------------------- app.go | 213 +++++++++++++++++++++++++------------------------ 2 files changed, 222 insertions(+), 227 deletions(-) diff --git a/admin.go b/admin.go index a1f48fa0..0be95e04 100644 --- a/admin.go +++ b/admin.go @@ -81,91 +81,93 @@ func qpsIndex(rw http.ResponseWriter, r *http.Request) { func listConf(rw http.ResponseWriter, r *http.Request) { r.ParseForm() command := r.Form.Get("command") - if command != "" { - data := make(map[interface{}]interface{}) - switch command { - case "conf": - tmpl := template.Must(template.New("dashboard").Parse(dashboardTpl)) - tmpl = template.Must(tmpl.Parse(configTpl)) - tmpl = template.Must(tmpl.Parse(defaultScriptsTpl)) + if command == "" { + rw.Write([]byte("command not support")) + return + } - data["Content"] = BConfig + data := make(map[interface{}]interface{}) + switch command { + case "conf": + tmpl := template.Must(template.New("dashboard").Parse(dashboardTpl)) + tmpl = template.Must(tmpl.Parse(configTpl)) + tmpl = template.Must(tmpl.Parse(defaultScriptsTpl)) - tmpl.Execute(rw, data) + data["Content"] = BConfig - case "router": - content := make(map[string]interface{}) + tmpl.Execute(rw, data) - var fields = []string{ - fmt.Sprintf("Router Pattern"), - fmt.Sprintf("Methods"), - fmt.Sprintf("Controller"), + case "router": + var ( + content = map[string]interface{}{ + "Fields": []string{ + "Router Pattern", + "Methods", + "Controller", + }, } - content["Fields"] = fields + methods = []string{} + methodsData = make(map[string]interface{}) + ) + for method, t := range BeeApp.Handlers.routers { - methods := []string{} - methodsData := make(map[string]interface{}) - for method, t := range BeeApp.Handlers.routers { + resultList := new([][]string) - resultList := new([][]string) + printTree(resultList, t) - printTree(resultList, t) + methods = append(methods, method) + methodsData[method] = resultList + } - methods = append(methods, method) - methodsData[method] = resultList + content["Data"] = methodsData + content["Methods"] = methods + data["Content"] = content + data["Title"] = "Routers" + execTpl(rw, data, routerAndFilterTpl, defaultScriptsTpl) + case "filter": + var ( + content = map[string]interface{}{ + "Fields": []string{ + "Router Pattern", + "Filter Function", + }, } + filterTypes = []string{} + filterTypeData = make(map[string]interface{}) + ) - content["Data"] = methodsData - content["Methods"] = methods - data["Content"] = content - data["Title"] = "Routers" - execTpl(rw, data, routerAndFilterTpl, defaultScriptsTpl) - case "filter": - content := make(map[string]interface{}) - - var fields = []string{ - fmt.Sprintf("Router Pattern"), - fmt.Sprintf("Filter Function"), - } - content["Fields"] = fields - - filterTypes := []string{} - filterTypeData := make(map[string]interface{}) - - if BeeApp.Handlers.enableFilter { - var filterType string - for k, fr := range map[int]string{ - BeforeStatic: "Before Static", - BeforeRouter: "Before Router", - BeforeExec: "Before Exec", - AfterExec: "After Exec", - FinishRouter: "Finish Router"} { - if bf, ok := BeeApp.Handlers.filters[k]; ok { - filterType = fr - filterTypes = append(filterTypes, filterType) - resultList := new([][]string) - for _, f := range bf { - var result = []string{ - fmt.Sprintf("%s", f.pattern), - fmt.Sprintf("%s", utils.GetFuncName(f.filterFunc)), - } - *resultList = append(*resultList, result) + if BeeApp.Handlers.enableFilter { + var filterType string + for k, fr := range map[int]string{ + BeforeStatic: "Before Static", + BeforeRouter: "Before Router", + BeforeExec: "Before Exec", + AfterExec: "After Exec", + FinishRouter: "Finish Router"} { + if bf, ok := BeeApp.Handlers.filters[k]; ok { + filterType = fr + filterTypes = append(filterTypes, filterType) + resultList := new([][]string) + for _, f := range bf { + var result = []string{ + fmt.Sprintf("%s", f.pattern), + fmt.Sprintf("%s", utils.GetFuncName(f.filterFunc)), } - filterTypeData[filterType] = resultList + *resultList = append(*resultList, result) } + filterTypeData[filterType] = resultList } } - - content["Data"] = filterTypeData - content["Methods"] = filterTypes - - data["Content"] = content - data["Title"] = "Filters" - execTpl(rw, data, routerAndFilterTpl, defaultScriptsTpl) - default: - rw.Write([]byte("command not support")) } - } else { + + content["Data"] = filterTypeData + content["Methods"] = filterTypes + + data["Content"] = content + data["Title"] = "Filters" + execTpl(rw, data, routerAndFilterTpl, defaultScriptsTpl) + default: + rw.Write([]byte("command not support")) } } @@ -180,23 +182,23 @@ func printTree(resultList *[][]string, t *Tree) { if v, ok := l.runObject.(*controllerInfo); ok { if v.routerType == routerTypeBeego { var result = []string{ - fmt.Sprintf("%s", v.pattern), + v.pattern, fmt.Sprintf("%s", v.methods), fmt.Sprintf("%s", v.controllerType), } *resultList = append(*resultList, result) } else if v.routerType == routerTypeRESTFul { var result = []string{ - fmt.Sprintf("%s", v.pattern), + v.pattern, fmt.Sprintf("%s", v.methods), - fmt.Sprintf(""), + "", } *resultList = append(*resultList, result) } else if v.routerType == routerTypeHandler { var result = []string{ - fmt.Sprintf("%s", v.pattern), - fmt.Sprintf(""), - fmt.Sprintf(""), + v.pattern, + "", + "", } *resultList = append(*resultList, result) } @@ -209,49 +211,49 @@ func printTree(resultList *[][]string, t *Tree) { func profIndex(rw http.ResponseWriter, r *http.Request) { r.ParseForm() command := r.Form.Get("command") - format := r.Form.Get("format") - data := make(map[interface{}]interface{}) + if command == "" { + return + } - var result bytes.Buffer - if command != "" { - toolbox.ProcessInput(command, &result) - data["Content"] = result.String() + var ( + format = r.Form.Get("format") + data = make(map[interface{}]interface{}) + result bytes.Buffer + ) + toolbox.ProcessInput(command, &result) + data["Content"] = result.String() - if format == "json" && command == "gc summary" { - dataJSON, err := json.Marshal(data) - if err != nil { - http.Error(rw, err.Error(), http.StatusInternalServerError) - return - } - - rw.Header().Set("Content-Type", "application/json") - rw.Write(dataJSON) + if format == "json" && command == "gc summary" { + dataJSON, err := json.Marshal(data) + if err != nil { + http.Error(rw, err.Error(), http.StatusInternalServerError) return } - data["Title"] = command - defaultTpl := defaultScriptsTpl - if command == "gc summary" { - defaultTpl = gcAjaxTpl - } - execTpl(rw, data, profillingTpl, defaultTpl) + rw.Header().Set("Content-Type", "application/json") + rw.Write(dataJSON) + return } + + data["Title"] = command + defaultTpl := defaultScriptsTpl + if command == "gc summary" { + defaultTpl = gcAjaxTpl + } + execTpl(rw, data, profillingTpl, defaultTpl) } // Healthcheck is a http.Handler calling health checking and showing the result. // it's in "/healthcheck" pattern in admin module. func healthcheck(rw http.ResponseWriter, req *http.Request) { - data := make(map[interface{}]interface{}) - - var result = []string{} - fields := []string{ - fmt.Sprintf("Name"), - fmt.Sprintf("Message"), - fmt.Sprintf("Status"), - } - resultList := new([][]string) - - content := make(map[string]interface{}) + var ( + data = make(map[interface{}]interface{}) + result = []string{} + resultList = new([][]string) + content = map[string]interface{}{ + "Fields": []string{"Name", "Message", "Status"}, + } + ) for name, h := range toolbox.AdminCheckList { if err := h.Check(); err != nil { @@ -271,8 +273,6 @@ func healthcheck(rw http.ResponseWriter, req *http.Request) { } *resultList = append(*resultList, result) } - - content["Fields"] = fields content["Data"] = resultList data["Content"] = content data["Title"] = "Health Check" @@ -288,10 +288,8 @@ func taskStatus(rw http.ResponseWriter, req *http.Request) { req.ParseForm() taskname := req.Form.Get("taskname") if taskname != "" { - if t, ok := toolbox.AdminTaskList[taskname]; ok { - err := t.Run() - if err != nil { + if err := t.Run(); err != nil { data["Message"] = []string{"error", fmt.Sprintf("%s", err)} } data["Message"] = []string{"success", fmt.Sprintf("%s run success,Now the Status is
%s", taskname, t.GetStatus())} @@ -305,18 +303,18 @@ func taskStatus(rw http.ResponseWriter, req *http.Request) { resultList := new([][]string) var result = []string{} var fields = []string{ - fmt.Sprintf("Task Name"), - fmt.Sprintf("Task Spec"), - fmt.Sprintf("Task Status"), - fmt.Sprintf("Last Time"), - fmt.Sprintf(""), + "Task Name", + "Task Spec", + "Task Status", + "Last Time", + "", } for tname, tk := range toolbox.AdminTaskList { result = []string{ - fmt.Sprintf("%s", tname), + tname, fmt.Sprintf("%s", tk.GetSpec()), fmt.Sprintf("%s", tk.GetStatus()), - fmt.Sprintf("%s", tk.GetPrev().String()), + tk.GetPrev().String(), } *resultList = append(*resultList, result) } diff --git a/app.go b/app.go index e8d1bc47..548bff66 100644 --- a/app.go +++ b/app.go @@ -59,128 +59,125 @@ func (app *App) Run() { } var ( - err error - l net.Listener + err error + l net.Listener + endRunning = make(chan bool, 1) ) - endRunning := make(chan bool, 1) + // run cgi server if BConfig.Listen.EnableFcgi { if BConfig.Listen.EnableStdIo { - err = fcgi.Serve(nil, app.Handlers) // standard I/O - if err == nil { + if err = fcgi.Serve(nil, app.Handlers); err == nil { // standard I/O BeeLogger.Info("Use FCGI via standard I/O") } else { - BeeLogger.Info("Cannot use FCGI via standard I/O", err) + BeeLogger.Critical("Cannot use FCGI via standard I/O", err) } + return + } + if BConfig.Listen.HTTPPort == 0 { + // remove the Socket file before start + if utils.FileExists(addr) { + os.Remove(addr) + } + l, err = net.Listen("unix", addr) } else { - if BConfig.Listen.HTTPPort == 0 { - // remove the Socket file before start - if utils.FileExists(addr) { - os.Remove(addr) + l, err = net.Listen("tcp", addr) + } + if err != nil { + BeeLogger.Critical("Listen: ", err) + } + if err = fcgi.Serve(l, app.Handlers); err != nil { + BeeLogger.Critical("fcgi.Serve: ", err) + } + return + } + + app.Server.Handler = app.Handlers + app.Server.ReadTimeout = time.Duration(BConfig.Listen.ServerTimeOut) * time.Second + app.Server.WriteTimeout = time.Duration(BConfig.Listen.ServerTimeOut) * time.Second + + // run graceful mode + if BConfig.Listen.Graceful { + httpsAddr := BConfig.Listen.HTTPSAddr + app.Server.Addr = httpsAddr + if BConfig.Listen.HTTPSEnable { + go func() { + time.Sleep(20 * time.Microsecond) + if BConfig.Listen.HTTPSPort != 0 { + httpsAddr = fmt.Sprintf("%s:%d", BConfig.Listen.HTTPSAddr, BConfig.Listen.HTTPSPort) + app.Server.Addr = httpsAddr } - l, err = net.Listen("unix", addr) - } else { - l, err = net.Listen("tcp", addr) - } - if err != nil { - BeeLogger.Critical("Listen: ", err) - } - err = fcgi.Serve(l, app.Handlers) + server := grace.NewServer(httpsAddr, app.Handlers) + server.Server.ReadTimeout = app.Server.ReadTimeout + server.Server.WriteTimeout = app.Server.WriteTimeout + if err := server.ListenAndServeTLS(BConfig.Listen.HTTPSCertFile, BConfig.Listen.HTTPSKeyFile); err != nil { + BeeLogger.Critical("ListenAndServeTLS: ", err, fmt.Sprintf("%d", os.Getpid())) + time.Sleep(100 * time.Microsecond) + endRunning <- true + } + }() } - } else { - if BConfig.Listen.Graceful { - httpsAddr := BConfig.Listen.HTTPSAddr - app.Server.Addr = httpsAddr - app.Server.Handler = app.Handlers - app.Server.ReadTimeout = time.Duration(BConfig.Listen.ServerTimeOut) * time.Second - app.Server.WriteTimeout = time.Duration(BConfig.Listen.ServerTimeOut) * time.Second - if BConfig.Listen.HTTPSEnable { - go func() { - time.Sleep(20 * time.Microsecond) - if BConfig.Listen.HTTPSPort != 0 { - httpsAddr = fmt.Sprintf("%s:%d", BConfig.Listen.HTTPSAddr, BConfig.Listen.HTTPSPort) - app.Server.Addr = httpsAddr - } - server := grace.NewServer(httpsAddr, app.Handlers) - server.Server.ReadTimeout = app.Server.ReadTimeout - server.Server.WriteTimeout = app.Server.WriteTimeout - err := server.ListenAndServeTLS(BConfig.Listen.HTTPSCertFile, BConfig.Listen.HTTPSKeyFile) - if err != nil { - BeeLogger.Critical("ListenAndServeTLS: ", err, fmt.Sprintf("%d", os.Getpid())) - time.Sleep(100 * time.Microsecond) - endRunning <- true - } - }() + if BConfig.Listen.HTTPEnable { + go func() { + server := grace.NewServer(addr, app.Handlers) + server.Server.ReadTimeout = app.Server.ReadTimeout + server.Server.WriteTimeout = app.Server.WriteTimeout + if BConfig.Listen.ListenTCP4 { + server.Network = "tcp4" + } + if err := server.ListenAndServe(); err != nil { + BeeLogger.Critical("ListenAndServe: ", err, fmt.Sprintf("%d", os.Getpid())) + time.Sleep(100 * time.Microsecond) + endRunning <- true + } + }() + } + <-endRunning + return + } + + // run normal mode + app.Server.Addr = addr + if BConfig.Listen.HTTPSEnable { + go func() { + time.Sleep(20 * time.Microsecond) + if BConfig.Listen.HTTPSPort != 0 { + app.Server.Addr = fmt.Sprintf("%s:%d", BConfig.Listen.HTTPSAddr, BConfig.Listen.HTTPSPort) } - if BConfig.Listen.HTTPEnable { - go func() { - server := grace.NewServer(addr, app.Handlers) - server.Server.ReadTimeout = app.Server.ReadTimeout - server.Server.WriteTimeout = app.Server.WriteTimeout - if BConfig.Listen.ListenTCP4 { - server.Network = "tcp4" - } - err := server.ListenAndServe() - if err != nil { - BeeLogger.Critical("ListenAndServe: ", err, fmt.Sprintf("%d", os.Getpid())) - time.Sleep(100 * time.Microsecond) - endRunning <- true - } - }() + BeeLogger.Info("https server Running on %s", app.Server.Addr) + if err := app.Server.ListenAndServeTLS(BConfig.Listen.HTTPSCertFile, BConfig.Listen.HTTPSKeyFile); err != nil { + BeeLogger.Critical("ListenAndServeTLS: ", err) + time.Sleep(100 * time.Microsecond) + endRunning <- true } - } else { + }() + } + if BConfig.Listen.HTTPEnable { + go func() { app.Server.Addr = addr - app.Server.Handler = app.Handlers - app.Server.ReadTimeout = time.Duration(BConfig.Listen.ServerTimeOut) * time.Second - app.Server.WriteTimeout = time.Duration(BConfig.Listen.ServerTimeOut) * time.Second - - if BConfig.Listen.HTTPSEnable { - go func() { - time.Sleep(20 * time.Microsecond) - if BConfig.Listen.HTTPSPort != 0 { - app.Server.Addr = fmt.Sprintf("%s:%d", BConfig.Listen.HTTPSAddr, BConfig.Listen.HTTPSPort) - } - BeeLogger.Info("https server Running on %s", app.Server.Addr) - err := app.Server.ListenAndServeTLS(BConfig.Listen.HTTPSCertFile, BConfig.Listen.HTTPSKeyFile) - if err != nil { - BeeLogger.Critical("ListenAndServeTLS: ", err) - time.Sleep(100 * time.Microsecond) - endRunning <- true - } - }() + BeeLogger.Info("http server Running on %s", app.Server.Addr) + if BConfig.Listen.ListenTCP4 { + ln, err := net.Listen("tcp4", app.Server.Addr) + if err != nil { + BeeLogger.Critical("ListenAndServe: ", err) + time.Sleep(100 * time.Microsecond) + endRunning <- true + return + } + if err = app.Server.Serve(ln); err != nil { + BeeLogger.Critical("ListenAndServe: ", err) + time.Sleep(100 * time.Microsecond) + endRunning <- true + return + } + } else { + if err := app.Server.ListenAndServe(); err != nil { + BeeLogger.Critical("ListenAndServe: ", err) + time.Sleep(100 * time.Microsecond) + endRunning <- true + } } - - if BConfig.Listen.HTTPEnable { - go func() { - app.Server.Addr = addr - BeeLogger.Info("http server Running on %s", app.Server.Addr) - if BConfig.Listen.ListenTCP4 { - ln, err := net.Listen("tcp4", app.Server.Addr) - if err != nil { - BeeLogger.Critical("ListenAndServe: ", err) - time.Sleep(100 * time.Microsecond) - endRunning <- true - return - } - err = app.Server.Serve(ln) - if err != nil { - BeeLogger.Critical("ListenAndServe: ", err) - time.Sleep(100 * time.Microsecond) - endRunning <- true - return - } - } else { - err := app.Server.ListenAndServe() - if err != nil { - BeeLogger.Critical("ListenAndServe: ", err) - time.Sleep(100 * time.Microsecond) - endRunning <- true - } - } - }() - } - } - + }() } <-endRunning } From b079456fcff027da96a913cfb61494c4ea316830 Mon Sep 17 00:00:00 2001 From: nkbai Date: Mon, 14 Dec 2015 15:04:17 +0800 Subject: [PATCH 320/436] add comments for orm/types.go --- orm/types.go | 296 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 263 insertions(+), 33 deletions(-) diff --git a/orm/types.go b/orm/types.go index 1bdd441a..e93a8030 100644 --- a/orm/types.go +++ b/orm/types.go @@ -36,20 +36,77 @@ type Fielder interface { // Ormer define the orm interface type Ormer interface { - Read(interface{}, ...string) error - ReadOrCreate(interface{}, string, ...string) (bool, int64, error) + // read data to model + // for example: + // this will find User by Id field + // u = &User{Id: user.Id} + // err = Ormer.Read(u) + // this will find User by UserName field + // u = &User{UserName: "astaxie", Password: "pass"} + // err = Ormer.Read(u, "UserName") + Read(md interface{}, cols ...string) error + // Try to read a row from the database, or insert one if it doesn't exist + ReadOrCreate(md interface{}, col1 string, cols ...string) (bool, int64, error) + // insert model data to database + // for example: + // user := new(User) + // id, err = Ormer.Insert(user) + // user must a pointer and Insert will set user's pk field Insert(interface{}) (int64, error) - InsertMulti(int, interface{}) (int64, error) - Update(interface{}, ...string) (int64, error) - Delete(interface{}) (int64, error) - LoadRelated(interface{}, string, ...interface{}) (int64, error) - QueryM2M(interface{}, string) QueryM2Mer - QueryTable(interface{}) QuerySeter - Using(string) error + // insert some models to database + InsertMulti(bulk int, mds interface{}) (int64, error) + // update model to database. + // cols set the columns those want to update. + // find model by Id(pk) field and update columns specified by fields, if cols is null then update all columns + // for example: + // user := User{Id: 2} + // user.Langs = append(user.Langs, "zh-CN", "en-US") + // user.Extra.Name = "beego" + // user.Extra.Data = "orm" + // num, err = Ormer.Update(&user, "Langs", "Extra") + Update(md interface{}, cols ...string) (int64, error) + // delete model in database + Delete(md interface{}) (int64, error) + // load related models to md model. + // args are limit, offset int and order string. + // + // example: + // Ormer.LoadRelated(post,"Tags") + // for _,tag := range post.Tags{...} + //args[0] bool true useDefaultRelsDepth ; false depth 0 + //args[0] int loadRelationDepth + //args[1] int limit default limit 1000 + //args[2] int offset default offset 0 + //args[3] string order for example : "-Id" + // make sure the relation is defined in model struct tags. + LoadRelated(md interface{}, name string, args ...interface{}) (int64, error) + // create a models to models queryer + // for example: + // post := Post{Id: 4} + // m2m := Ormer.QueryM2M(&post, "Tags") + QueryM2M(md interface{}, name string) QueryM2Mer + // return a QuerySeter for table operations. + // table name can be string or struct. + // e.g. QueryTable("user"), QueryTable(&user{}) or QueryTable((*User)(nil)), + QueryTable(ptrStructOrTableName interface{}) QuerySeter + // switch to another registered database driver by given name. + Using(name string) error + // begin transaction + // for example: + // o := NewOrm() + // err := o.Begin() + // ... + // err = o.Rollback() Begin() error + // commit transaction Commit() error + // rollback transaction Rollback() error - Raw(string, ...interface{}) RawSeter + // return a raw query seter for raw sql string. + // for example: + // ormer.Raw("UPDATE `user` SET `user_name` = ? WHERE `user_name` = ?", "slene", "testing").Exec() + // // update user testing's name to slene + Raw(query string, args ...interface{}) RawSeter Driver() Driver } @@ -61,55 +118,228 @@ type Inserter interface { // QuerySeter query seter type QuerySeter interface { + // add condition expression to QuerySeter. + // for example: + // filter by UserName == 'slene' + // qs.Filter("UserName", "slene") + // sql : left outer join profile on t0.id1==t1.id2 where t1.age == 28 + // Filter("profile__Age", 28) + // // time compare + // qs.Filter("created", time.Now()) Filter(string, ...interface{}) QuerySeter + // add NOT condition to querySeter. + // have the same usage as Filter Exclude(string, ...interface{}) QuerySeter + // set condition to QuerySeter. + // sql's where condition + // cond := orm.NewCondition() + // cond1 := cond.And("profile__isnull", false).AndNot("status__in", 1).Or("profile__age__gt", 2000) + // //sql-> WHERE T0.`profile_id` IS NOT NULL AND NOT T0.`Status` IN (?) OR T1.`age` > 2000 + // num, err := qs.SetCond(cond1).Count() SetCond(*Condition) QuerySeter - Limit(interface{}, ...interface{}) QuerySeter - Offset(interface{}) QuerySeter - GroupBy(...string) QuerySeter - OrderBy(...string) QuerySeter - Distinct() QuerySeter - RelatedSel(...interface{}) QuerySeter + // add LIMIT value. + // args[0] means offset, e.g. LIMIT num,offset. + // if Limit <= 0 then Limit will be set to default limit ,eg 1000 + // if QuerySeter doesn't call Limit, the sql's Limit will be set to default limit, eg 1000 + // for example: + // qs.Limit(10, 2) + // // sql-> limit 10 offset 2 + Limit(limit interface{}, args ...interface{}) QuerySeter + // add OFFSET value + // same as Limit function's args[0] + Offset(offset interface{}) QuerySeter + // add ORDER expression. + // "column" means ASC, "-column" means DESC. + // for example: + // qs.OrderBy("-status") + OrderBy(exprs ...string) QuerySeter + // set relation model to query together. + // it will query relation models and assign to parent model. + // for example: + // // will load all related fields use left join . + // qs.RelatedSel().One(&user) + // // will load related field only profile + // qs.RelatedSel("profile").One(&user) + // user.Profile.Age = 32 + RelatedSel(params ...interface{}) QuerySeter + // return QuerySeter execution result number + // for example: + // num, err = qs.Filter("profile__age__gt", 28).Count() Count() (int64, error) + // check result empty or not after QuerySeter executed + // the same as QuerySeter.Count > 0 Exist() bool - Update(Params) (int64, error) + // execute update with parameters + // for example: + // num, err = qs.Filter("user_name", "slene").Update(Params{ + // "Nums": ColValue(Col_Minus, 50), + // }) // user slene's Nums will minus 50 + // num, err = qs.Filter("UserName", "slene").Update(Params{ + // "user_name": "slene2" + // }) // user slene's name will change to slene2 + Update(values Params) (int64, error) + // delete from table + //for example: + // num ,err = qs.Filter("user_name__in", "testing1", "testing2").Delete() + // //delete two user who's name is testing1 or testing2 Delete() (int64, error) + // return a insert queryer. + // it can be used in times. + // example: + // i,err := sq.PrepareInsert() + // num, err = i.Insert(&user1) // user table will add one record user1 at once + // num, err = i.Insert(&user2) // user table will add one record user2 at once + // err = i.Close() //don't forget call Close PrepareInsert() (Inserter, error) - All(interface{}, ...string) (int64, error) - One(interface{}, ...string) error - Values(*[]Params, ...string) (int64, error) - ValuesList(*[]ParamsList, ...string) (int64, error) - ValuesFlat(*ParamsList, string) (int64, error) - RowsToMap(*Params, string, string) (int64, error) - RowsToStruct(interface{}, string, string) (int64, error) + // query all data and map to containers. + // cols means the columns when querying. + // for example: + // var users []*User + // qs.All(&users) // users[0],users[1],users[2] ... + All(container interface{}, cols ...string) (int64, error) + // query one row data and map to containers. + // cols means the columns when querying. + // for example: + // var user User + // qs.One(&user) //user.UserName == "slene" + One(container interface{}, cols ...string) error + // query all data and map to []map[string]interface. + // expres means condition expression. + // it converts data to []map[column]value. + // for example: + // var maps []Params + // qs.Values(&maps) //maps[0]["UserName"]=="slene" + Values(results *[]Params, exprs ...string) (int64, error) + // query all data and map to [][]interface + // it converts data to [][column_index]value + // for example: + // var list []ParamsList + // qs.ValuesList(&list) // list[0][1] == "slene" + ValuesList(results *[]ParamsList, exprs ...string) (int64, error) + // query all data and map to []interface. + // it's designed for one column record set, auto change to []value, not [][column]value. + // for example: + // var list ParamsList + // qs.ValuesFlat(&list, "UserName") // list[0] == "slene" + ValuesFlat(result *ParamsList, expr string) (int64, error) + // query all rows into map[string]interface with specify key and value column name. + // keyCol = "name", valueCol = "value" + // table data + // name | value + // total | 100 + // found | 200 + // to map[string]interface{}{ + // "total": 100, + // "found": 200, + // } + RowsToMap(result *Params, keyCol, valueCol string) (int64, error) + // query all rows into struct with specify key and value column name. + // keyCol = "name", valueCol = "value" + // table data + // name | value + // total | 100 + // found | 200 + // to struct { + // Total int + // Found int + // } + RowsToStruct(ptrStruct interface{}, keyCol, valueCol string) (int64, error) } -// QueryM2Mer model to model query struct +// model to model query struct +// all operations are on the m2m table only, will not affect the origin model table type QueryM2Mer interface { + // add models to origin models when creating queryM2M. + // example: + // m2m := orm.QueryM2M(post,"Tag") + // m2m.Add(&Tag1{},&Tag2{}) + // for _,tag := range post.Tags{}{ ... } + // param could also be any of the follow + // []*Tag{{Id:3,Name: "TestTag1"}, {Id:4,Name: "TestTag2"}} + // &Tag{Id:5,Name: "TestTag3"} + // []interface{}{&Tag{Id:6,Name: "TestTag4"}} + // insert one or more rows to m2m table + // make sure the relation is defined in post model struct tag. Add(...interface{}) (int64, error) + // remove models following the origin model relationship + // only delete rows from m2m table + // for example: + //tag3 := &Tag{Id:5,Name: "TestTag3"} + //num, err = m2m.Remove(tag3) Remove(...interface{}) (int64, error) + // check model is existed in relationship of origin model Exist(interface{}) bool + // clean all models in related of origin model Clear() (int64, error) + // count all related models of origin model Count() (int64, error) } + // RawPreparer raw query statement type RawPreparer interface { Exec(...interface{}) (sql.Result, error) Close() error } -// RawSeter raw query seter +// raw query seter +// create From Ormer.Raw +// for example: +// sql := fmt.Sprintf("SELECT %sid%s,%sname%s FROM %suser%s WHERE id = ?",Q,Q,Q,Q,Q,Q) +// rs := Ormer.Raw(sql, 1) type RawSeter interface { + //execute sql and get result Exec() (sql.Result, error) - QueryRow(...interface{}) error - QueryRows(...interface{}) (int64, error) + //query data and map to container + //for example: + // var name string + // var id int + // rs.QueryRow(&id,&name) // id==2 name=="slene" + QueryRow(containers ...interface{}) error + + // query data rows and map to container + // var ids []int + // var names []int + // query = fmt.Sprintf("SELECT 'id','name' FROM %suser%s", Q, Q) + // num, err = dORM.Raw(query).QueryRows(&ids,&names) // ids=>{1,2},names=>{"nobody","slene"} + QueryRows(containers ...interface{}) (int64, error) SetArgs(...interface{}) RawSeter - Values(*[]Params, ...string) (int64, error) - ValuesList(*[]ParamsList, ...string) (int64, error) - ValuesFlat(*ParamsList, ...string) (int64, error) - RowsToMap(*Params, string, string) (int64, error) - RowsToStruct(interface{}, string, string) (int64, error) + // query data to []map[string]interface + // see QuerySeter's Values + Values(container *[]Params, cols ...string) (int64, error) + // query data to [][]interface + // see QuerySeter's ValuesList + ValuesList(container *[]ParamsList, cols ...string) (int64, error) + // query data to []interface + // see QuerySeter's ValuesFlat + ValuesFlat(container *ParamsList, cols ...string) (int64, error) + // query all rows into map[string]interface with specify key and value column name. + // keyCol = "name", valueCol = "value" + // table data + // name | value + // total | 100 + // found | 200 + // to map[string]interface{}{ + // "total": 100, + // "found": 200, + // } + RowsToMap(result *Params, keyCol, valueCol string) (int64, error) + // query all rows into struct with specify key and value column name. + // keyCol = "name", valueCol = "value" + // table data + // name | value + // total | 100 + // found | 200 + // to struct { + // Total int + // Found int + // } + RowsToStruct(ptrStruct interface{}, keyCol, valueCol string) (int64, error) + + // return prepared raw statement for used in times. + // for example: + // pre, err := dORM.Raw("INSERT INTO tag (name) VALUES (?)").Prepare() + // r, err := pre.Exec("name1") // INSERT INTO tag (name) VALUES (`name1`) Prepare() (RawPreparer, error) } From 499e2b59e441ce1eb7d70acfc8b81e76848700c4 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 15 Dec 2015 11:34:26 +0800 Subject: [PATCH 321/436] compress method fixed in http,the deflate is zlib compress method accoding to the sec http://tools.ietf.org/html/rfc2616#section-3.5 The "zlib" format defined in RFC 1950 [31] in combination with the "deflate" compression mechanism described in RFC 1951 [29]. --- context/acceptencoder.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/context/acceptencoder.go b/context/acceptencoder.go index 1bd2cc3d..0a0586ac 100644 --- a/context/acceptencoder.go +++ b/context/acceptencoder.go @@ -18,6 +18,7 @@ import ( "bytes" "compress/flate" "compress/gzip" + "compress/zlib" "io" "net/http" "os" @@ -31,9 +32,13 @@ type acceptEncoder struct { } var ( - noneCompressEncoder = acceptEncoder{"", func(wr io.Writer, level int) (io.Writer, error) { return wr, nil }} - gzipCompressEncoder = acceptEncoder{"gzip", func(wr io.Writer, level int) (io.Writer, error) { return gzip.NewWriterLevel(wr, level) }} - deflateCompressEncoder = acceptEncoder{"deflate", func(wr io.Writer, level int) (io.Writer, error) { return flate.NewWriter(wr, level) }} + noneCompressEncoder = acceptEncoder{"", func(wr io.Writer, level int) (io.Writer, error) { return wr, nil }} + gzipCompressEncoder = acceptEncoder{"gzip", func(wr io.Writer, level int) (io.Writer, error) { return gzip.NewWriterLevel(wr, level) }} + //according to the sec :http://tools.ietf.org/html/rfc2616#section-3.5 ,the deflate compress in http is zlib indeed + //deflate + //The "zlib" format defined in RFC 1950 [31] in combination with + //the "deflate" compression mechanism described in RFC 1951 [29]. + deflateCompressEncoder = acceptEncoder{"deflate", func(wr io.Writer, level int) (io.Writer, error) { return zlib.NewWriterLevel(wr, level) }} ) var ( From 58aa0545b6cac3e729b85a986d13052d0ee2c03a Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 15 Dec 2015 14:05:33 +0800 Subject: [PATCH 322/436] Revert "compress method fixed" --- context/acceptencoder.go | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/context/acceptencoder.go b/context/acceptencoder.go index 0a0586ac..1bd2cc3d 100644 --- a/context/acceptencoder.go +++ b/context/acceptencoder.go @@ -18,7 +18,6 @@ import ( "bytes" "compress/flate" "compress/gzip" - "compress/zlib" "io" "net/http" "os" @@ -32,13 +31,9 @@ type acceptEncoder struct { } var ( - noneCompressEncoder = acceptEncoder{"", func(wr io.Writer, level int) (io.Writer, error) { return wr, nil }} - gzipCompressEncoder = acceptEncoder{"gzip", func(wr io.Writer, level int) (io.Writer, error) { return gzip.NewWriterLevel(wr, level) }} - //according to the sec :http://tools.ietf.org/html/rfc2616#section-3.5 ,the deflate compress in http is zlib indeed - //deflate - //The "zlib" format defined in RFC 1950 [31] in combination with - //the "deflate" compression mechanism described in RFC 1951 [29]. - deflateCompressEncoder = acceptEncoder{"deflate", func(wr io.Writer, level int) (io.Writer, error) { return zlib.NewWriterLevel(wr, level) }} + noneCompressEncoder = acceptEncoder{"", func(wr io.Writer, level int) (io.Writer, error) { return wr, nil }} + gzipCompressEncoder = acceptEncoder{"gzip", func(wr io.Writer, level int) (io.Writer, error) { return gzip.NewWriterLevel(wr, level) }} + deflateCompressEncoder = acceptEncoder{"deflate", func(wr io.Writer, level int) (io.Writer, error) { return flate.NewWriter(wr, level) }} ) var ( From e63d24637dfd56eabd9067a2bcf824de66f92d07 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 15 Dec 2015 14:08:58 +0800 Subject: [PATCH 323/436] go test fixed --- staticfile_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/staticfile_test.go b/staticfile_test.go index e635fcc6..097ee07e 100644 --- a/staticfile_test.go +++ b/staticfile_test.go @@ -4,6 +4,7 @@ import ( "bytes" "compress/flate" "compress/gzip" + "compress/zlib" "io" "io/ioutil" "os" @@ -43,7 +44,7 @@ func TestOpenStaticFileGzip_1(t *testing.T) { func TestOpenStaticFileDeflate_1(t *testing.T) { file, _ := os.Open(licenseFile) var zipBuf bytes.Buffer - fileWriter, _ := flate.NewWriter(&zipBuf, flate.BestCompression) + fileWriter, _ := zlib.NewWriterLevel(&zipBuf, flate.BestCompression) io.Copy(fileWriter, file) fileWriter.Close() content, _ := ioutil.ReadAll(&zipBuf) From ccc008c257908afe4463160a8014e62dab37e3fe Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 15 Dec 2015 14:29:07 +0800 Subject: [PATCH 324/436] compress fixed --- context/acceptencoder.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/context/acceptencoder.go b/context/acceptencoder.go index 1bd2cc3d..0a0586ac 100644 --- a/context/acceptencoder.go +++ b/context/acceptencoder.go @@ -18,6 +18,7 @@ import ( "bytes" "compress/flate" "compress/gzip" + "compress/zlib" "io" "net/http" "os" @@ -31,9 +32,13 @@ type acceptEncoder struct { } var ( - noneCompressEncoder = acceptEncoder{"", func(wr io.Writer, level int) (io.Writer, error) { return wr, nil }} - gzipCompressEncoder = acceptEncoder{"gzip", func(wr io.Writer, level int) (io.Writer, error) { return gzip.NewWriterLevel(wr, level) }} - deflateCompressEncoder = acceptEncoder{"deflate", func(wr io.Writer, level int) (io.Writer, error) { return flate.NewWriter(wr, level) }} + noneCompressEncoder = acceptEncoder{"", func(wr io.Writer, level int) (io.Writer, error) { return wr, nil }} + gzipCompressEncoder = acceptEncoder{"gzip", func(wr io.Writer, level int) (io.Writer, error) { return gzip.NewWriterLevel(wr, level) }} + //according to the sec :http://tools.ietf.org/html/rfc2616#section-3.5 ,the deflate compress in http is zlib indeed + //deflate + //The "zlib" format defined in RFC 1950 [31] in combination with + //the "deflate" compression mechanism described in RFC 1951 [29]. + deflateCompressEncoder = acceptEncoder{"deflate", func(wr io.Writer, level int) (io.Writer, error) { return zlib.NewWriterLevel(wr, level) }} ) var ( From 3daaaeb32ba37fdd3204a1833e4ceaf40f8e3fb5 Mon Sep 17 00:00:00 2001 From: nkbai Date: Tue, 15 Dec 2015 19:48:28 +0800 Subject: [PATCH 325/436] add commit for orm/types.go --- orm/types.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/orm/types.go b/orm/types.go index e93a8030..3a3113f1 100644 --- a/orm/types.go +++ b/orm/types.go @@ -246,7 +246,7 @@ type QuerySeter interface { RowsToStruct(ptrStruct interface{}, keyCol, valueCol string) (int64, error) } -// model to model query struct +// QueryM2Mer model to model query struct // all operations are on the m2m table only, will not affect the origin model table type QueryM2Mer interface { // add models to origin models when creating queryM2M. @@ -282,7 +282,7 @@ type RawPreparer interface { Close() error } -// raw query seter +// RawSeter raw query seter // create From Ormer.Raw // for example: // sql := fmt.Sprintf("SELECT %sid%s,%sname%s FROM %suser%s WHERE id = ?",Q,Q,Q,Q,Q,Q) From 906637ae8b9198c3ecb7681a7ff9125485401c63 Mon Sep 17 00:00:00 2001 From: Pelle Johnsen Date: Tue, 15 Dec 2015 17:17:56 +0100 Subject: [PATCH 326/436] Fix issue with reverse(many) for models with custom pk - Also add test covering the issue --- orm/db_tables.go | 2 +- orm/models_test.go | 18 ++++++++++++ orm/orm_test.go | 70 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) diff --git a/orm/db_tables.go b/orm/db_tables.go index cfe415e4..e4c74ace 100644 --- a/orm/db_tables.go +++ b/orm/db_tables.go @@ -186,7 +186,7 @@ func (t *dbTables) getJoinSQL() (join string) { table = jt.mi.table switch { - case jt.fi.fieldType == RelManyToMany || jt.fi.reverse && jt.fi.reverseFieldInfo.fieldType == RelManyToMany: + case jt.fi.fieldType == RelManyToMany || jt.fi.fieldType == RelReverseMany || jt.fi.reverse && jt.fi.reverseFieldInfo.fieldType == RelManyToMany: c1 = jt.fi.mi.fields.pk.column for _, ffi := range jt.mi.fields.fieldsRel { if jt.fi.mi == ffi.relModelInfo { diff --git a/orm/models_test.go b/orm/models_test.go index 2a9962a1..54e5c6ae 100644 --- a/orm/models_test.go +++ b/orm/models_test.go @@ -332,6 +332,24 @@ func NewComment() *Comment { return obj } +type Group struct { + GID string `orm:"pk;column(gid);size(32);unique"` + Name string + Permissions []*Permission `orm:"reverse(many)" json:"-"` +} + +type Permission struct { + ID int `orm:"column(id)"` + Name string + Groups []*Group `orm:"rel(m2m);rel_through(github.com/astaxie/beego/orm.GroupPermissions)"` +} + +type GroupPermissions struct { + ID int `orm:"column(id)"` + Group *Group `orm:"rel(fk)"` + Permission *Permission `orm:"rel(fk)"` +} + var DBARGS = struct { Driver string Source string diff --git a/orm/orm_test.go b/orm/orm_test.go index 1d174fa9..eb872426 100644 --- a/orm/orm_test.go +++ b/orm/orm_test.go @@ -35,6 +35,19 @@ var ( testDateTime = formatDateTime + " -0700" ) +type argAny []interface{} + +// get interface by index from interface slice +func (a argAny) Get(i int, args ...interface{}) (r interface{}) { + if i >= 0 && i < len(a) { + r = a[i] + } + if len(args) > 0 { + r = args[0] + } + return +} + func ValuesCompare(is bool, a interface{}, args ...interface{}) (ok bool, err error) { if len(args) == 0 { return false, fmt.Errorf("miss args") @@ -171,6 +184,9 @@ func TestSyncDb(t *testing.T) { RegisterModel(new(Comment)) RegisterModel(new(UserBig)) RegisterModel(new(PostTags)) + RegisterModel(new(Group)) + RegisterModel(new(Permission)) + RegisterModel(new(GroupPermissions)) err := RunSyncdb("default", true, false) throwFail(t, err) @@ -187,6 +203,9 @@ func TestRegisterModels(t *testing.T) { RegisterModel(new(Comment)) RegisterModel(new(UserBig)) RegisterModel(new(PostTags)) + RegisterModel(new(Group)) + RegisterModel(new(Permission)) + RegisterModel(new(GroupPermissions)) BootStrap() @@ -635,6 +654,45 @@ The program—and web server—godoc processes Go source files to extract docume throwFail(t, err) throwFail(t, AssertIs(id > 0, true)) } + + permissions := []*Permission{ + {Name: "writePosts"}, + {Name: "readComments"}, + {Name: "readPosts"}, + } + + groups := []*Group{ + { + GID: "g1", + Name: "admins", + Permissions: []*Permission{permissions[0], permissions[1], permissions[2]}, + }, + { + GID: "g2", + Name: "users", + Permissions: []*Permission{permissions[1], permissions[2]}, + }, + } + + for _, permission := range permissions { + id, err := dORM.Insert(permission) + throwFail(t, err) + throwFail(t, AssertIs(id > 0, true)) + } + + for _, group := range groups { + id, err := dORM.Insert(group) + throwFail(t, err) + throwFail(t, AssertIs(id > 0, true)) + + num := len(group.Permissions) + if num > 0 { + nums, err := dORM.QueryM2M(group, "permissions").Add(group.Permissions) + throwFailNow(t, err) + throwFailNow(t, AssertIs(nums, num)) + } + } + } func TestCustomField(t *testing.T) { @@ -1398,6 +1456,18 @@ func TestQueryRelate(t *testing.T) { // throwFailNow(t, AssertIs(num, 2)) } +func TestPkManyRelated(t *testing.T) { + permission := &Permission{Name: "readPosts"} + err := dORM.Read(permission, "Name") + throwFailNow(t, err) + + var groups []*Group + qs := dORM.QueryTable("Group") + num, err := qs.Filter("Permissions__Permission", permission.ID).All(&groups) + throwFailNow(t, err) + throwFailNow(t, AssertIs(num, 2)) +} + func TestPrepareInsert(t *testing.T) { qs := dORM.QueryTable("user") i, err := qs.PrepareInsert() From 52c4c1fb980b2456051d696af7a8d05ae7cc7525 Mon Sep 17 00:00:00 2001 From: Simon Rawet Date: Wed, 16 Dec 2015 10:37:21 +0100 Subject: [PATCH 327/436] Added MaxMemory limit to CopyBody() Beego only uses the MaxMemory flag when using go's built in functions for parsing forms. However the CopyBody() function have no limit an will coppy anny amount of data into memory using ioutil.ReedAll() on the request body whitout anny size validation or limit. This fix wrapps input.Requst.Body in a LimitedReader using the same memory limit as ParseFormOrMulitForm() --- context/input.go | 6 ++++-- router.go | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/context/input.go b/context/input.go index 9649e14f..27de61e8 100644 --- a/context/input.go +++ b/context/input.go @@ -17,6 +17,7 @@ package context import ( "bytes" "errors" + "io" "io/ioutil" "net/url" "reflect" @@ -296,8 +297,9 @@ func (input *BeegoInput) Session(key interface{}) interface{} { } // CopyBody returns the raw request body data as bytes. -func (input *BeegoInput) CopyBody() []byte { - requestbody, _ := ioutil.ReadAll(input.Context.Request.Body) +func (input *BeegoInput) CopyBody(MaxMemory int64) []byte { + safe := &io.LimitedReader{R:input.Context.Request.Body, N:MaxMemory} + requestbody, _ := ioutil.ReadAll(safe) input.Context.Request.Body.Close() bf := bytes.NewBuffer(requestbody) input.Context.Request.Body = ioutil.NopCloser(bf) diff --git a/router.go b/router.go index 01dae8aa..2fa2fde0 100644 --- a/router.go +++ b/router.go @@ -659,7 +659,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) if r.Method != "GET" && r.Method != "HEAD" { if BConfig.CopyRequestBody && !context.Input.IsUpload() { - context.Input.CopyBody() + context.Input.CopyBody(BConfig.MaxMemory) } context.Input.ParseFormOrMulitForm(BConfig.MaxMemory) } From 29752e25758f8cf3841c1e9631f4f3b155aabf1d Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 16 Dec 2015 23:11:03 +0800 Subject: [PATCH 328/436] refactor router --- context/input.go | 46 ++++++-- controller.go | 2 +- controller_test.go | 15 ++- filter_test.go | 2 +- router.go | 8 +- router_test.go | 2 +- tree.go | 257 +++++++++++++++++++++++---------------------- tree_test.go | 39 +++---- 8 files changed, 206 insertions(+), 165 deletions(-) diff --git a/context/input.go b/context/input.go index 9649e14f..3f73787d 100644 --- a/context/input.go +++ b/context/input.go @@ -33,6 +33,7 @@ var ( acceptsHTMLRegex = regexp.MustCompile(`(text/html|application/xhtml\+xml)(?:,|$)`) acceptsXMLRegex = regexp.MustCompile(`(application/xml|text/xml)(?:,|$)`) acceptsJSONRegex = regexp.MustCompile(`(application/json)(?:,|$)`) + maxParam = 50 ) // BeegoInput operates the http request header, data, cookie and body. @@ -40,16 +41,17 @@ var ( type BeegoInput struct { Context *Context CruSession session.Store - Params map[string]string - Data map[interface{}]interface{} // store some values in this context when calling context in filter or controller. + pnames []string + pvalues []string + data map[interface{}]interface{} // store some values in this context when calling context in filter or controller. RequestBody []byte } // NewInput return BeegoInput generated by Context. func NewInput() *BeegoInput { return &BeegoInput{ - Params: make(map[string]string), - Data: make(map[interface{}]interface{}), + pvalues: make([]string, maxParam), + data: make(map[interface{}]interface{}), } } @@ -57,8 +59,8 @@ func NewInput() *BeegoInput { func (input *BeegoInput) Reset(ctx *Context) { input.Context = ctx input.CruSession = nil - input.Params = make(map[string]string) - input.Data = make(map[interface{}]interface{}) + input.pnames = input.pnames[:0] + input.data = nil input.RequestBody = []byte{} } @@ -254,14 +256,27 @@ func (input *BeegoInput) UserAgent() string { return input.Header("User-Agent") } +// ParamsLen return the length of the params +func (input *BeegoInput) ParamsLen() int { + return len(input.pnames) +} + // Param returns router param by a given key. func (input *BeegoInput) Param(key string) string { - if v, ok := input.Params[key]; ok { - return v + for i, v := range input.pnames { + if v == key { + return input.pvalues[i] + } } return "" } +// SetParam will set the param with key and value +func (input *BeegoInput) SetParam(key, val string) { + input.pvalues[len(input.pnames)] = val + input.pnames = append(input.pnames, key) +} + // Query returns input data item string by a given string. func (input *BeegoInput) Query(key string) string { if val := input.Param(key); val != "" { @@ -305,9 +320,17 @@ func (input *BeegoInput) CopyBody() []byte { return requestbody } +// Data return the implicit data in the input +func (input *BeegoInput) Data() map[interface{}]interface{} { + if input.data == nil { + input.data = make(map[interface{}]interface{}) + } + return input.data +} + // GetData returns the stored data in this context. func (input *BeegoInput) GetData(key interface{}) interface{} { - if v, ok := input.Data[key]; ok { + if v, ok := input.data[key]; ok { return v } return nil @@ -316,7 +339,10 @@ func (input *BeegoInput) GetData(key interface{}) interface{} { // SetData stores data with given key in this context. // This data are only available in this context. func (input *BeegoInput) SetData(key, val interface{}) { - input.Data[key] = val + if input.data == nil { + input.data = make(map[interface{}]interface{}) + } + input.data[key] = val } // ParseFormOrMulitForm parseForm or parseMultiForm based on Content-type diff --git a/controller.go b/controller.go index 826ad54d..ebe99c5c 100644 --- a/controller.go +++ b/controller.go @@ -105,7 +105,7 @@ func (c *Controller) Init(ctx *context.Context, controllerName, actionName strin c.AppController = app c.EnableRender = true c.EnableXSRF = true - c.Data = ctx.Input.Data + c.Data = ctx.Input.Data() c.methodMapping = make(map[string]func()) } diff --git a/controller_test.go b/controller_test.go index ebf38b2c..51d3a5b7 100644 --- a/controller_test.go +++ b/controller_test.go @@ -21,7 +21,8 @@ import ( ) func TestGetInt(t *testing.T) { - i := &context.BeegoInput{Params: map[string]string{"age": "40"}} + i := context.NewInput() + i.SetParam("age", "40") ctx := &context.Context{Input: i} ctrlr := Controller{Ctx: ctx} val, _ := ctrlr.GetInt("age") @@ -31,7 +32,8 @@ func TestGetInt(t *testing.T) { } func TestGetInt8(t *testing.T) { - i := &context.BeegoInput{Params: map[string]string{"age": "40"}} + i := context.NewInput() + i.SetParam("age", "40") ctx := &context.Context{Input: i} ctrlr := Controller{Ctx: ctx} val, _ := ctrlr.GetInt8("age") @@ -42,7 +44,8 @@ func TestGetInt8(t *testing.T) { } func TestGetInt16(t *testing.T) { - i := &context.BeegoInput{Params: map[string]string{"age": "40"}} + i := context.NewInput() + i.SetParam("age", "40") ctx := &context.Context{Input: i} ctrlr := Controller{Ctx: ctx} val, _ := ctrlr.GetInt16("age") @@ -52,7 +55,8 @@ func TestGetInt16(t *testing.T) { } func TestGetInt32(t *testing.T) { - i := &context.BeegoInput{Params: map[string]string{"age": "40"}} + i := context.NewInput() + i.SetParam("age", "40") ctx := &context.Context{Input: i} ctrlr := Controller{Ctx: ctx} val, _ := ctrlr.GetInt32("age") @@ -62,7 +66,8 @@ func TestGetInt32(t *testing.T) { } func TestGetInt64(t *testing.T) { - i := &context.BeegoInput{Params: map[string]string{"age": "40"}} + i := context.NewInput() + i.SetParam("age", "40") ctx := &context.Context{Input: i} ctrlr := Controller{Ctx: ctx} val, _ := ctrlr.GetInt64("age") diff --git a/filter_test.go b/filter_test.go index b1cd9c94..d9928d8d 100644 --- a/filter_test.go +++ b/filter_test.go @@ -29,7 +29,7 @@ func init() { } var FilterUser = func(ctx *context.Context) { - ctx.Output.Body([]byte("i am " + ctx.Input.Params[":last"] + ctx.Input.Params[":first"])) + ctx.Output.Body([]byte("i am " + ctx.Input.Param(":last") + ctx.Input.Param(":first"))) } func TestFilter(t *testing.T) { diff --git a/router.go b/router.go index effc2b41..53469b21 100644 --- a/router.go +++ b/router.go @@ -466,8 +466,8 @@ func (p *ControllerRegister) URLFor(endpoint string, values ...interface{}) stri } func (p *ControllerRegister) geturl(t *Tree, url, controllName, methodName string, params map[string]string, httpMethod string) (bool, string) { - for k, subtree := range t.fixrouters { - u := path.Join(url, k) + for _, subtree := range t.fixrouters { + u := path.Join(url, subtree.prefix) ok, u := p.geturl(subtree, u, controllName, methodName, params, httpMethod) if ok { return ok, u @@ -675,10 +675,10 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) if r, ok := runObject.(*controllerInfo); ok { routerInfo = r findrouter = true - if splat, ok := context.Input.Params[":splat"]; ok { + if splat := context.Input.Param(":splat"); splat != "" { splatlist := strings.Split(splat, "/") for k, v := range splatlist { - context.Input.Params[strconv.Itoa(k)] = v + context.Input.SetParam(strconv.Itoa(k), v) } } } diff --git a/router_test.go b/router_test.go index 9598f99c..b0ae7a18 100644 --- a/router_test.go +++ b/router_test.go @@ -45,7 +45,7 @@ func (tc *TestController) List() { } func (tc *TestController) Params() { - tc.Ctx.Output.Body([]byte(tc.Ctx.Input.Params["0"] + tc.Ctx.Input.Params["1"] + tc.Ctx.Input.Params["2"])) + tc.Ctx.Output.Body([]byte(tc.Ctx.Input.Param("0") + tc.Ctx.Input.Param("1") + tc.Ctx.Input.Param("2"))) } func (tc *TestController) Myext() { diff --git a/tree.go b/tree.go index e23ce2fc..dbcc63c9 100644 --- a/tree.go +++ b/tree.go @@ -23,26 +23,28 @@ import ( "github.com/astaxie/beego/utils" ) +var ( + allowSuffixExt = []string{".json", ".xml", ".html"} +) + // Tree has three elements: FixRouter/wildcard/leaves // fixRouter sotres Fixed Router // wildcard stores params // leaves store the endpoint information type Tree struct { + //prefix set for static router + prefix string //search fix route first - fixrouters map[string]*Tree - + fixrouters []*Tree //if set, failure to match fixrouters search then search wildcard wildcard *Tree - //if set, failure to match wildcard search leaves []*leafInfo } // NewTree return a new Tree func NewTree() *Tree { - return &Tree{ - fixrouters: make(map[string]*Tree), - } + return &Tree{} } // AddTree will add tree to the exist Tree @@ -57,15 +59,31 @@ func (t *Tree) addtree(segments []string, tree *Tree, wildcards []string, reg st } seg := segments[0] iswild, params, regexpStr := splitSegment(seg) + // if it's ? meaning can igone this, so add one more rule for it + if len(params) > 0 && params[0] == ":" { + params = params[1:] + if len(segments[1:]) > 0 { + t.addtree(segments[1:], tree, append(wildcards, params...), reg) + } else { + filterTreeWithPrefix(tree, wildcards, reg) + } + } + //Rule: /login/*/access match /login/2009/11/access + //if already has *, and when loop the access, should as a regexpStr + if !iswild && utils.InSlice(":splat", wildcards) { + iswild = true + regexpStr = seg + } + //Rule: /user/:id/* + if seg == "*" && len(wildcards) > 0 && reg == "" { + regexpStr = "(.+)" + } if len(segments) == 1 { if iswild { if regexpStr != "" { if reg == "" { rr := "" for _, w := range wildcards { - if w == "." || w == ":" { - continue - } if w == ":splat" { rr = rr + "(.+)/" } else { @@ -94,10 +112,12 @@ func (t *Tree) addtree(segments []string, tree *Tree, wildcards []string, reg st } else { reg = strings.Trim(reg+"/"+regexpStr, "/") filterTreeWithPrefix(tree, append(wildcards, params...), reg) - t.fixrouters[seg] = tree + tree.prefix = seg + t.fixrouters = append(t.fixrouters, tree) } return } + if iswild { if t.wildcard == nil { t.wildcard = NewTree() @@ -106,9 +126,6 @@ func (t *Tree) addtree(segments []string, tree *Tree, wildcards []string, reg st if reg == "" { rr := "" for _, w := range wildcards { - if w == "." || w == ":" { - continue - } if w == ":splat" { rr = rr + "(.+)/" } else { @@ -122,20 +139,23 @@ func (t *Tree) addtree(segments []string, tree *Tree, wildcards []string, reg st } else if reg != "" { if seg == "*.*" { regexpStr = "([^.]+).(.+)" + params = params[1:] } else { - for _, w := range params { - if w == "." || w == ":" { - continue - } + for _ = range params { regexpStr = "([^/]+)/" + regexpStr } } + } else { + if seg == "*.*" { + params = params[1:] + } } reg = strings.TrimRight(strings.TrimRight(reg, "/")+"/"+regexpStr, "/") t.wildcard.addtree(segments[1:], tree, append(wildcards, params...), reg) } else { subTree := NewTree() - t.fixrouters[seg] = subTree + subTree.prefix = seg + t.fixrouters = append(t.fixrouters, subTree) subTree.addtree(segments[1:], tree, append(wildcards, params...), reg) } } @@ -154,9 +174,6 @@ func filterTreeWithPrefix(t *Tree, wildcards []string, reg string) { l.regexps = regexp.MustCompile("^" + reg + "/" + strings.Trim(l.regexps.String(), "^$") + "$") } else { for _, v := range l.wildcards { - if v == ":" || v == "." { - continue - } if v == ":splat" { reg = reg + "/(.+)" } else { @@ -166,21 +183,10 @@ func filterTreeWithPrefix(t *Tree, wildcards []string, reg string) { l.regexps = regexp.MustCompile("^" + reg + "$") l.wildcards = append(wildcards, l.wildcards...) } - filterCards := []string{} - for _, v := range l.wildcards { - if v == ":" || v == "." { - continue - } - filterCards = append(filterCards, v) - } - l.wildcards = filterCards } else { l.wildcards = append(wildcards, l.wildcards...) if l.regexps != nil { for _, w := range wildcards { - if w == "." || w == ":" { - continue - } if w == ":splat" { reg = "(.+)/" + reg } else { @@ -203,32 +209,26 @@ func (t *Tree) AddRouter(pattern string, runObject interface{}) { func (t *Tree) addseg(segments []string, route interface{}, wildcards []string, reg string) { if len(segments) == 0 { if reg != "" { - filterCards := []string{} - for _, v := range wildcards { - if v == ":" || v == "." { - continue - } - filterCards = append(filterCards, v) - } - t.leaves = append(t.leaves, &leafInfo{runObject: route, wildcards: filterCards, regexps: regexp.MustCompile("^" + reg + "$")}) + t.leaves = append(t.leaves, &leafInfo{runObject: route, wildcards: wildcards, regexps: regexp.MustCompile("^" + reg + "$")}) } else { t.leaves = append(t.leaves, &leafInfo{runObject: route, wildcards: wildcards}) } - for i, v := range wildcards { - if v == ":" { - t.leaves = append(t.leaves, &leafInfo{runObject: route, wildcards: wildcards[:i+1]}) - } - } } else { seg := segments[0] iswild, params, regexpStr := splitSegment(seg) - //for the router /login/*/access match /login/2009/11/access + // if it's ? meaning can igone this, so add one more rule for it + if len(params) > 0 && params[0] == ":" { + t.addseg(segments[1:], route, wildcards, reg) + params = params[1:] + } + //Rule: /login/*/access match /login/2009/11/access + //if already has *, and when loop the access, should as a regexpStr if !iswild && utils.InSlice(":splat", wildcards) { iswild = true regexpStr = seg } + //Rule: /user/:id/* if seg == "*" && len(wildcards) > 0 && reg == "" { - iswild = true regexpStr = "(.+)" } if iswild { @@ -239,9 +239,6 @@ func (t *Tree) addseg(segments []string, route interface{}, wildcards []string, if reg == "" { rr := "" for _, w := range wildcards { - if w == "." || w == ":" { - continue - } if w == ":splat" { rr = rr + "(.+)/" } else { @@ -255,22 +252,31 @@ func (t *Tree) addseg(segments []string, route interface{}, wildcards []string, } else if reg != "" { if seg == "*.*" { regexpStr = "/([^.]+).(.+)" + params = params[1:] } else { - for _, w := range params { - - if w == "." || w == ":" { - continue - } + for _ = range params { regexpStr = "/([^/]+)" + regexpStr } } + } else { + if seg == "*.*" { + params = params[1:] + } } t.wildcard.addseg(segments[1:], route, append(wildcards, params...), reg+regexpStr) } else { - subTree, ok := t.fixrouters[seg] + var ok bool + var subTree *Tree + for _, subTree = range t.fixrouters { + if t.prefix == seg { + ok = true + break + } + } if !ok { subTree = NewTree() - t.fixrouters[seg] = subTree + subTree.prefix = seg + t.fixrouters = append(t.fixrouters, subTree) } subTree.addseg(segments[1:], route, wildcards, reg) } @@ -282,13 +288,18 @@ func (t *Tree) Match(pattern string, ctx *context.Context) (runObject interface{ if len(pattern) == 0 || pattern[0] != '/' { return nil } - - return t.match(splitPath(pattern), nil, ctx) + return t.match(pattern, nil, ctx) } -func (t *Tree) match(segments []string, wildcardValues []string, ctx *context.Context) (runObject interface{}) { +func (t *Tree) match(pattern string, wildcardValues []string, ctx *context.Context) (runObject interface{}) { + if len(pattern) > 0 { + i := 0 + for ; i < len(pattern) && pattern[i] == '/'; i++ { + } + pattern = pattern[i:] + } // Handle leaf nodes: - if len(segments) == 0 { + if len(pattern) == 0 { for _, l := range t.leaves { if ok := l.match(wildcardValues, ctx); ok { return l.runObject @@ -303,28 +314,47 @@ func (t *Tree) match(segments []string, wildcardValues []string, ctx *context.Co } return nil } - - seg, segs := segments[0], segments[1:] - - subTree, ok := t.fixrouters[seg] - if ok { - runObject = subTree.match(segs, wildcardValues, ctx) - } else if len(segs) == 0 { //.json .xml - if subindex := strings.LastIndex(seg, "."); subindex != -1 { - subTree, ok = t.fixrouters[seg[:subindex]] - if ok { - runObject = subTree.match(segs, wildcardValues, ctx) - if runObject != nil { - ctx.Input.Params[":ext"] = seg[subindex+1:] - return runObject + var seg string + i, l := 0, len(pattern) + for ; i < l && pattern[i] != '/'; i++ { + } + if i == 0 { + seg = pattern + pattern = "" + } else { + seg = pattern[:i] + pattern = pattern[i:] + } + for _, subTree := range t.fixrouters { + if subTree.prefix == seg { + runObject = subTree.match(pattern, wildcardValues, ctx) + if runObject != nil { + break + } + } + } + if runObject == nil { + // Filter the .json .xml .html extension + for _, str := range allowSuffixExt { + if strings.HasSuffix(seg, str) { + for _, subTree := range t.fixrouters { + if subTree.prefix == seg[:len(seg)-len(str)] { + runObject = subTree.match(pattern, wildcardValues, ctx) + if runObject != nil { + ctx.Input.SetParam(":ext", str[1:]) + } + } } } } } if runObject == nil && t.wildcard != nil { - runObject = t.wildcard.match(segs, append(wildcardValues, seg), ctx) + runObject = t.wildcard.match(pattern, append(wildcardValues, seg), ctx) } + if runObject == nil { + segments := splitPath(pattern) + wildcardValues = append(wildcardValues, seg) for _, l := range t.leaves { if ok := l.match(append(wildcardValues, segments...), ctx); ok { return l.runObject @@ -345,71 +375,48 @@ type leafInfo struct { } func (leaf *leafInfo) match(wildcardValues []string, ctx *context.Context) (ok bool) { + //fmt.Println("Leaf:", wildcardValues, leaf.wildcards, leaf.regexps) if leaf.regexps == nil { - // has error - if len(wildcardValues) == 0 && len(leaf.wildcards) > 0 { - if utils.InSlice(":", leaf.wildcards) { - j := 0 - for _, v := range leaf.wildcards { - if v == ":" { - continue - } - ctx.Input.Params[v] = "" - j++ - } - return true - } - return false - } else if len(wildcardValues) == 0 { // static path + if len(wildcardValues) == 0 { // static path return true } // match * if len(leaf.wildcards) == 1 && leaf.wildcards[0] == ":splat" { - ctx.Input.Params[":splat"] = path.Join(wildcardValues...) + ctx.Input.SetParam(":splat", path.Join(wildcardValues...)) return true } - // match *.* - if len(leaf.wildcards) == 3 && leaf.wildcards[0] == "." { - lastone := wildcardValues[len(wildcardValues)-1] - strs := strings.SplitN(lastone, ".", 2) - if len(strs) == 2 { - ctx.Input.Params[":ext"] = strs[1] - } else { - ctx.Input.Params[":ext"] = "" - } - ctx.Input.Params[":path"] = path.Join(wildcardValues[:len(wildcardValues)-1]...) + "/" + strs[0] - return true - } - // match :id - j := 0 - for _, v := range leaf.wildcards { - if v == ":" { - continue - } - if v == "." { + // match *.* or :id + if len(leaf.wildcards) >= 2 && leaf.wildcards[len(leaf.wildcards)-2] == ":path" && leaf.wildcards[len(leaf.wildcards)-1] == ":ext" { + if len(leaf.wildcards) == 2 { lastone := wildcardValues[len(wildcardValues)-1] strs := strings.SplitN(lastone, ".", 2) if len(strs) == 2 { - ctx.Input.Params[":ext"] = strs[1] - } else { - ctx.Input.Params[":ext"] = "" - } - if len(wildcardValues[j:]) == 1 { - ctx.Input.Params[":path"] = strs[0] - } else { - ctx.Input.Params[":path"] = path.Join(wildcardValues[j:]...) + "/" + strs[0] + ctx.Input.SetParam(":ext", strs[1]) } + ctx.Input.SetParam(":path", path.Join(path.Join(wildcardValues[:len(wildcardValues)-1]...), strs[0])) return true - } - if len(wildcardValues) <= j { + } else if len(wildcardValues) < 2 { return false } - ctx.Input.Params[v] = wildcardValues[j] - j++ + var index int + for index = 0; index < len(leaf.wildcards)-2; index++ { + ctx.Input.SetParam(leaf.wildcards[index], wildcardValues[index]) + } + lastone := wildcardValues[len(wildcardValues)-1] + strs := strings.SplitN(lastone, ".", 2) + if len(strs) == 2 { + ctx.Input.SetParam(":ext", strs[1]) + } + ctx.Input.SetParam(":path", path.Join(path.Join(wildcardValues[index:len(wildcardValues)-1]...), strs[0])) + return true } - if len(ctx.Input.Params) != len(wildcardValues) { + // match :id + if len(leaf.wildcards) != len(wildcardValues) { return false } + for j, v := range leaf.wildcards { + ctx.Input.SetParam(v, wildcardValues[j]) + } return true } @@ -418,7 +425,7 @@ func (leaf *leafInfo) match(wildcardValues []string, ctx *context.Context) (ok b } matches := leaf.regexps.FindStringSubmatch(path.Join(wildcardValues...)) for i, match := range matches[1:] { - ctx.Input.Params[leaf.wildcards[i]] = match + ctx.Input.SetParam(leaf.wildcards[i], match) } return true } diff --git a/tree_test.go b/tree_test.go index 22a7b6f1..f0923c88 100644 --- a/tree_test.go +++ b/tree_test.go @@ -45,6 +45,7 @@ func init() { routers = append(routers, testinfo{"/*", "/customer/2009/12/11", map[string]string{":splat": "customer/2009/12/11"}}) routers = append(routers, testinfo{"/aa/*/bb", "/aa/2009/bb", map[string]string{":splat": "2009"}}) routers = append(routers, testinfo{"/cc/*/dd", "/cc/2009/11/dd", map[string]string{":splat": "2009/11"}}) + routers = append(routers, testinfo{"/cc/:id/*", "/cc/2009/11/dd", map[string]string{":id": "2009", ":splat": "11/dd"}}) routers = append(routers, testinfo{"/ee/:year/*/ff", "/ee/2009/11/ff", map[string]string{":year": "2009", ":splat": "11"}}) routers = append(routers, testinfo{"/thumbnail/:size/uploads/*", "/thumbnail/100x100/uploads/items/2014/04/20/dPRCdChkUd651t1Hvs18.jpg", @@ -76,14 +77,14 @@ func TestTreeRouters(t *testing.T) { ctx := context.NewContext() obj := tr.Match(r.requesturl, ctx) if obj == nil || obj.(string) != "astaxie" { - t.Fatal(r.url + " can't get obj ") + t.Fatal(r.url+" can't get obj, Expect ", r.requesturl) } if r.params != nil { for k, v := range r.params { - if vv, ok := ctx.Input.Params[k]; !ok { + if vv := ctx.Input.Param(k); vv != v { + t.Fatal("The Rule: " + r.url + "\nThe RequestURL:" + r.requesturl + "\nThe Key is " + k + ", The Value should be: " + v + ", but get: " + vv) + } else if vv == "" && v != "" { t.Fatal(r.url + " " + r.requesturl + " get param empty:" + k) - } else if vv != v { - t.Fatal(r.url + " " + r.requesturl + " should be:" + v + " get param:" + vv) } } } @@ -101,10 +102,10 @@ func TestAddTree(t *testing.T) { if obj == nil || obj.(string) != "astaxie" { t.Fatal("/v1/zl/shop/:id/account can't get obj ") } - if len(ctx.Input.Params) == 0 { + if ctx.Input.ParamsLen() == 0 { t.Fatal("get param error") } - if ctx.Input.Params[":id"] != "123" { + if ctx.Input.Param(":id") != "123" { t.Fatal("get :id param error") } ctx.Input.Reset(ctx) @@ -112,10 +113,10 @@ func TestAddTree(t *testing.T) { if obj == nil || obj.(string) != "astaxie" { t.Fatal("/v1/zl//shop/:sd/ttt_:id(.+)_:page(.+).html can't get obj ") } - if len(ctx.Input.Params) == 0 { + if ctx.Input.ParamsLen() == 0 { t.Fatal("get param error") } - if ctx.Input.Params[":sd"] != "123" || ctx.Input.Params[":id"] != "1" || ctx.Input.Params[":page"] != "12" { + if ctx.Input.Param(":sd") != "123" || ctx.Input.Param(":id") != "1" || ctx.Input.Param(":page") != "12" { t.Fatal("get :sd :id :page param error") } @@ -126,10 +127,10 @@ func TestAddTree(t *testing.T) { if obj == nil || obj.(string) != "astaxie" { t.Fatal("/v1/:shopid/shop/:id/account can't get obj ") } - if len(ctx.Input.Params) == 0 { + if ctx.Input.ParamsLen() == 0 { t.Fatal("get param error") } - if ctx.Input.Params[":id"] != "123" || ctx.Input.Params[":shopid"] != "zl" { + if ctx.Input.Param(":id") != "123" || ctx.Input.Param(":shopid") != "zl" { t.Fatal("get :id :shopid param error") } ctx.Input.Reset(ctx) @@ -137,10 +138,10 @@ func TestAddTree(t *testing.T) { if obj == nil || obj.(string) != "astaxie" { t.Fatal("/v1/:shopid/shop/:sd/ttt_:id(.+)_:page(.+).html can't get obj ") } - if len(ctx.Input.Params) == 0 { + if ctx.Input.ParamsLen() == 0 { t.Fatal("get :shopid param error") } - if ctx.Input.Params[":sd"] != "123" || ctx.Input.Params[":id"] != "1" || ctx.Input.Params[":page"] != "12" || ctx.Input.Params[":shopid"] != "zl" { + if ctx.Input.Param(":sd") != "123" || ctx.Input.Param(":id") != "1" || ctx.Input.Param(":page") != "12" || ctx.Input.Param(":shopid") != "zl" { t.Fatal("get :sd :id :page :shopid param error") } } @@ -156,10 +157,10 @@ func TestAddTree2(t *testing.T) { if obj == nil || obj.(string) != "astaxie" { t.Fatal("/:version(v1|v2)/:prefix/shop/:id/account can't get obj ") } - if len(ctx.Input.Params) == 0 { + if ctx.Input.ParamsLen() == 0 { t.Fatal("get param error") } - if ctx.Input.Params[":id"] != "123" || ctx.Input.Params[":prefix"] != "zl" || ctx.Input.Params[":version"] != "v1" { + if ctx.Input.Param(":id") != "123" || ctx.Input.Param(":prefix") != "zl" || ctx.Input.Param(":version") != "v1" { t.Fatal("get :id :prefix :version param error") } } @@ -175,10 +176,10 @@ func TestAddTree3(t *testing.T) { if obj == nil || obj.(string) != "astaxie" { t.Fatal("/table/:num/shop/:sd/account can't get obj ") } - if len(ctx.Input.Params) == 0 { + if ctx.Input.ParamsLen() == 0 { t.Fatal("get param error") } - if ctx.Input.Params[":num"] != "123" || ctx.Input.Params[":sd"] != "123" { + if ctx.Input.Param(":num") != "123" || ctx.Input.Param(":sd") != "123" { t.Fatal("get :num :sd param error") } ctx.Input.Reset(ctx) @@ -199,10 +200,12 @@ func TestAddTree4(t *testing.T) { if obj == nil || obj.(string) != "astaxie" { t.Fatal("/:info:int/:num/:id/shop/:sd/:account can't get obj ") } - if len(ctx.Input.Params) == 0 { + if ctx.Input.ParamsLen() == 0 { t.Fatal("get param error") } - if ctx.Input.Params[":info"] != "12" || ctx.Input.Params[":num"] != "123" || ctx.Input.Params[":id"] != "456" || ctx.Input.Params[":sd"] != "123" || ctx.Input.Params[":account"] != "account" { + if ctx.Input.Param(":info") != "12" || ctx.Input.Param(":num") != "123" || + ctx.Input.Param(":id") != "456" || ctx.Input.Param(":sd") != "123" || + ctx.Input.Param(":account") != "account" { t.Fatal("get :info :num :id :sd :account param error") } ctx.Input.Reset(ctx) From dbc4ac6945492da8aa9e84cab015d59cdf6b8fff Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 16 Dec 2015 23:43:32 +0800 Subject: [PATCH 329/436] reduce the slicegrow --- context/input.go | 8 +++++--- tree.go | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/context/input.go b/context/input.go index 3f73787d..7e9f50b6 100644 --- a/context/input.go +++ b/context/input.go @@ -50,7 +50,8 @@ type BeegoInput struct { // NewInput return BeegoInput generated by Context. func NewInput() *BeegoInput { return &BeegoInput{ - pvalues: make([]string, maxParam), + pnames: make([]string, 0, maxParam), + pvalues: make([]string, 0, maxParam), data: make(map[interface{}]interface{}), } } @@ -60,6 +61,7 @@ func (input *BeegoInput) Reset(ctx *Context) { input.Context = ctx input.CruSession = nil input.pnames = input.pnames[:0] + input.pvalues = input.pvalues[:0] input.data = nil input.RequestBody = []byte{} } @@ -264,7 +266,7 @@ func (input *BeegoInput) ParamsLen() int { // Param returns router param by a given key. func (input *BeegoInput) Param(key string) string { for i, v := range input.pnames { - if v == key { + if v == key && i <= len(input.pvalues) { return input.pvalues[i] } } @@ -273,7 +275,7 @@ func (input *BeegoInput) Param(key string) string { // SetParam will set the param with key and value func (input *BeegoInput) SetParam(key, val string) { - input.pvalues[len(input.pnames)] = val + input.pvalues = append(input.pvalues, val) input.pnames = append(input.pnames, key) } diff --git a/tree.go b/tree.go index dbcc63c9..2092016f 100644 --- a/tree.go +++ b/tree.go @@ -288,7 +288,8 @@ func (t *Tree) Match(pattern string, ctx *context.Context) (runObject interface{ if len(pattern) == 0 || pattern[0] != '/' { return nil } - return t.match(pattern, nil, ctx) + w := make([]string, 0, 20) + return t.match(pattern, w, ctx) } func (t *Tree) match(pattern string, wildcardValues []string, ctx *context.Context) (runObject interface{}) { From c3d1e4d088eeb217d04e18ac89d5ca1ad0a05899 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 17 Dec 2015 14:45:10 +0800 Subject: [PATCH 330/436] Revert "go test fixed" --- context/acceptencoder.go | 11 +++-------- staticfile_test.go | 3 +-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/context/acceptencoder.go b/context/acceptencoder.go index 0a0586ac..1bd2cc3d 100644 --- a/context/acceptencoder.go +++ b/context/acceptencoder.go @@ -18,7 +18,6 @@ import ( "bytes" "compress/flate" "compress/gzip" - "compress/zlib" "io" "net/http" "os" @@ -32,13 +31,9 @@ type acceptEncoder struct { } var ( - noneCompressEncoder = acceptEncoder{"", func(wr io.Writer, level int) (io.Writer, error) { return wr, nil }} - gzipCompressEncoder = acceptEncoder{"gzip", func(wr io.Writer, level int) (io.Writer, error) { return gzip.NewWriterLevel(wr, level) }} - //according to the sec :http://tools.ietf.org/html/rfc2616#section-3.5 ,the deflate compress in http is zlib indeed - //deflate - //The "zlib" format defined in RFC 1950 [31] in combination with - //the "deflate" compression mechanism described in RFC 1951 [29]. - deflateCompressEncoder = acceptEncoder{"deflate", func(wr io.Writer, level int) (io.Writer, error) { return zlib.NewWriterLevel(wr, level) }} + noneCompressEncoder = acceptEncoder{"", func(wr io.Writer, level int) (io.Writer, error) { return wr, nil }} + gzipCompressEncoder = acceptEncoder{"gzip", func(wr io.Writer, level int) (io.Writer, error) { return gzip.NewWriterLevel(wr, level) }} + deflateCompressEncoder = acceptEncoder{"deflate", func(wr io.Writer, level int) (io.Writer, error) { return flate.NewWriter(wr, level) }} ) var ( diff --git a/staticfile_test.go b/staticfile_test.go index 097ee07e..e635fcc6 100644 --- a/staticfile_test.go +++ b/staticfile_test.go @@ -4,7 +4,6 @@ import ( "bytes" "compress/flate" "compress/gzip" - "compress/zlib" "io" "io/ioutil" "os" @@ -44,7 +43,7 @@ func TestOpenStaticFileGzip_1(t *testing.T) { func TestOpenStaticFileDeflate_1(t *testing.T) { file, _ := os.Open(licenseFile) var zipBuf bytes.Buffer - fileWriter, _ := zlib.NewWriterLevel(&zipBuf, flate.BestCompression) + fileWriter, _ := flate.NewWriter(&zipBuf, flate.BestCompression) io.Copy(fileWriter, file) fileWriter.Close() content, _ := ioutil.ReadAll(&zipBuf) From f9138c5a99728146b9ad31de48c400d818c545b9 Mon Sep 17 00:00:00 2001 From: fuxiaohei Date: Thu, 17 Dec 2015 20:05:00 +0800 Subject: [PATCH 331/436] simplify config.go --- config.go | 72 ++++++++++++++++++++++--------------------------------- 1 file changed, 28 insertions(+), 44 deletions(-) diff --git a/config.go b/config.go index 87066e99..098ea7cb 100644 --- a/config.go +++ b/config.go @@ -177,8 +177,7 @@ func ParseConfig() (err error) { if utils.FileExists(filepath.Join("conf", "app.conf")) { AppConfigPath = filepath.Join("conf", "app.conf") } else { - ac := config.NewFakeConfig() - AppConfig = &beegoAppConfig{ac} + AppConfig = &beegoAppConfig{config.NewFakeConfig()} return } } @@ -186,9 +185,8 @@ func ParseConfig() (err error) { if err != nil { return err } - envRunMode := os.Getenv("BEEGO_RUNMODE") // set the runmode first - if envRunMode != "" { + if envRunMode := os.Getenv("BEEGO_RUNMODE"); envRunMode != "" { BConfig.RunMode = envRunMode } else if runmode := AppConfig.String("RunMode"); runmode != "" { BConfig.RunMode = runmode @@ -277,109 +275,95 @@ func newAppConfig(AppConfigProvider, AppConfigPath string) (*beegoAppConfig, err if err != nil { return nil, err } - rac := &beegoAppConfig{ac} - return rac, nil + return &beegoAppConfig{ac}, nil } func (b *beegoAppConfig) Set(key, val string) error { - err := b.innerConfig.Set(BConfig.RunMode+"::"+key, val) - if err == nil { + if err := b.innerConfig.Set(BConfig.RunMode+"::"+key, val); err != nil { return err } return b.innerConfig.Set(key, val) } func (b *beegoAppConfig) String(key string) string { - v := b.innerConfig.String(BConfig.RunMode + "::" + key) - if v == "" { - return b.innerConfig.String(key) + if v := b.innerConfig.String(BConfig.RunMode + "::" + key); v != "" { + return v } - return v + return b.innerConfig.String(key) } func (b *beegoAppConfig) Strings(key string) []string { - v := b.innerConfig.Strings(BConfig.RunMode + "::" + key) - if v[0] == "" { - return b.innerConfig.Strings(key) + if v := b.innerConfig.Strings(BConfig.RunMode + "::" + key); v[0] != "" { + return v[0] } - return v + return b.innerConfig.Strings(key) } func (b *beegoAppConfig) Int(key string) (int, error) { - v, err := b.innerConfig.Int(BConfig.RunMode + "::" + key) - if err != nil { - return b.innerConfig.Int(key) + if v, err := b.innerConfig.Int(BConfig.RunMode + "::" + key); err == nil { + return v, nil } - return v, nil + return b.innerConfig.Int(key) } func (b *beegoAppConfig) Int64(key string) (int64, error) { - v, err := b.innerConfig.Int64(BConfig.RunMode + "::" + key) - if err != nil { - return b.innerConfig.Int64(key) + if v, err := b.innerConfig.Int64(BConfig.RunMode + "::" + key); err == nil { + return v, nil } - return v, nil + return b.innerConfig.Int64(key) } func (b *beegoAppConfig) Bool(key string) (bool, error) { - v, err := b.innerConfig.Bool(BConfig.RunMode + "::" + key) - if err != nil { - return b.innerConfig.Bool(key) + if v, err := b.innerConfig.Bool(BConfig.RunMode + "::" + key); err == nil { + return v, nil } - return v, nil + return b.innerConfig.Bool(key) } func (b *beegoAppConfig) Float(key string) (float64, error) { - v, err := b.innerConfig.Float(BConfig.RunMode + "::" + key) - if err != nil { - return b.innerConfig.Float(key) + if v, err := b.innerConfig.Float(BConfig.RunMode + "::" + key); err == nil { + return v, nil } - return v, nil + return b.innerConfig.Float(key) } func (b *beegoAppConfig) DefaultString(key string, defaultval string) string { - v := b.String(key) - if v != "" { + if v := b.String(key); v != "" { return v } return defaultval } func (b *beegoAppConfig) DefaultStrings(key string, defaultval []string) []string { - v := b.Strings(key) - if len(v) != 0 { + if v := b.Strings(key); len(v) != 0 { return v } return defaultval } func (b *beegoAppConfig) DefaultInt(key string, defaultval int) int { - v, err := b.Int(key) - if err == nil { + if v, err := b.Int(key); err == nil { return v } return defaultval } func (b *beegoAppConfig) DefaultInt64(key string, defaultval int64) int64 { - v, err := b.Int64(key) - if err == nil { + if v, err := b.Int64(key); err == nil { return v } return defaultval } func (b *beegoAppConfig) DefaultBool(key string, defaultval bool) bool { - v, err := b.Bool(key) - if err == nil { + if v, err := b.Bool(key); err == nil { return v } return defaultval } func (b *beegoAppConfig) DefaultFloat(key string, defaultval float64) float64 { - v, err := b.Float(key) - if err == nil { + if v, err := b.Float(key); err == nil { return v } return defaultval From ae52d4aa1879749304072717831973399174ff04 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 17 Dec 2015 21:31:44 +0800 Subject: [PATCH 332/436] improve the splitPath --- tree.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tree.go b/tree.go index 2092016f..30108913 100644 --- a/tree.go +++ b/tree.go @@ -354,10 +354,22 @@ func (t *Tree) match(pattern string, wildcardValues []string, ctx *context.Conte } if runObject == nil { - segments := splitPath(pattern) wildcardValues = append(wildcardValues, seg) + start, i := 0, 0 + for ; i < len(pattern); i++ { + if pattern[i] == '/' { + if i != 0 && start < len(pattern) { + wildcardValues = append(wildcardValues, pattern[start:i]) + } + start = i + 1 + continue + } + } + if start > 0 { + wildcardValues = append(wildcardValues, pattern[start:i]) + } for _, l := range t.leaves { - if ok := l.match(append(wildcardValues, segments...), ctx); ok { + if ok := l.match(wildcardValues, ctx); ok { return l.runObject } } From 5e249772d5b4fa8a3c5285a91dcc63dab1d3fdff Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 18 Dec 2015 00:14:28 +0800 Subject: [PATCH 333/436] reduce loop --- tree.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tree.go b/tree.go index 30108913..b43db3a9 100644 --- a/tree.go +++ b/tree.go @@ -334,7 +334,7 @@ func (t *Tree) match(pattern string, wildcardValues []string, ctx *context.Conte } } } - if runObject == nil { + if runObject == nil && len(t.fixrouters) > 0 { // Filter the .json .xml .html extension for _, str := range allowSuffixExt { if strings.HasSuffix(seg, str) { @@ -353,7 +353,7 @@ func (t *Tree) match(pattern string, wildcardValues []string, ctx *context.Conte runObject = t.wildcard.match(pattern, append(wildcardValues, seg), ctx) } - if runObject == nil { + if runObject == nil && len(t.leaves) > 0 { wildcardValues = append(wildcardValues, seg) start, i := 0, 0 for ; i < len(pattern); i++ { From 80ac8aa40ed830305994fc5d2f0dca732c0d9021 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Fri, 18 Dec 2015 09:28:40 +0800 Subject: [PATCH 334/436] compress level test fixed --- context/acceptencoder.go | 11 ++++++++--- staticfile_test.go | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/context/acceptencoder.go b/context/acceptencoder.go index 1bd2cc3d..0a0586ac 100644 --- a/context/acceptencoder.go +++ b/context/acceptencoder.go @@ -18,6 +18,7 @@ import ( "bytes" "compress/flate" "compress/gzip" + "compress/zlib" "io" "net/http" "os" @@ -31,9 +32,13 @@ type acceptEncoder struct { } var ( - noneCompressEncoder = acceptEncoder{"", func(wr io.Writer, level int) (io.Writer, error) { return wr, nil }} - gzipCompressEncoder = acceptEncoder{"gzip", func(wr io.Writer, level int) (io.Writer, error) { return gzip.NewWriterLevel(wr, level) }} - deflateCompressEncoder = acceptEncoder{"deflate", func(wr io.Writer, level int) (io.Writer, error) { return flate.NewWriter(wr, level) }} + noneCompressEncoder = acceptEncoder{"", func(wr io.Writer, level int) (io.Writer, error) { return wr, nil }} + gzipCompressEncoder = acceptEncoder{"gzip", func(wr io.Writer, level int) (io.Writer, error) { return gzip.NewWriterLevel(wr, level) }} + //according to the sec :http://tools.ietf.org/html/rfc2616#section-3.5 ,the deflate compress in http is zlib indeed + //deflate + //The "zlib" format defined in RFC 1950 [31] in combination with + //the "deflate" compression mechanism described in RFC 1951 [29]. + deflateCompressEncoder = acceptEncoder{"deflate", func(wr io.Writer, level int) (io.Writer, error) { return zlib.NewWriterLevel(wr, level) }} ) var ( diff --git a/staticfile_test.go b/staticfile_test.go index e635fcc6..d3333570 100644 --- a/staticfile_test.go +++ b/staticfile_test.go @@ -2,8 +2,8 @@ package beego import ( "bytes" - "compress/flate" "compress/gzip" + "compress/zlib" "io" "io/ioutil" "os" @@ -43,7 +43,7 @@ func TestOpenStaticFileGzip_1(t *testing.T) { func TestOpenStaticFileDeflate_1(t *testing.T) { file, _ := os.Open(licenseFile) var zipBuf bytes.Buffer - fileWriter, _ := flate.NewWriter(&zipBuf, flate.BestCompression) + fileWriter, _ := zlib.NewWriterLevel(&zipBuf, zlib.BestCompression) io.Copy(fileWriter, file) fileWriter.Close() content, _ := ioutil.ReadAll(&zipBuf) From 083c1550792b6828ae043d89f1d4fb98a73e5965 Mon Sep 17 00:00:00 2001 From: nkbai Date: Sat, 19 Dec 2015 10:29:12 +0800 Subject: [PATCH 335/436] cors test benchmark doesn't use b.N --- plugins/cors/cors_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/cors/cors_test.go b/plugins/cors/cors_test.go index ee5ee238..84d21cd0 100644 --- a/plugins/cors/cors_test.go +++ b/plugins/cors/cors_test.go @@ -225,8 +225,8 @@ func Benchmark_WithoutCORS(b *testing.B) { ctx.Output.SetStatus(500) }) b.ResetTimer() - for i := 0; i < 100; i++ { - r, _ := http.NewRequest("PUT", "/foo", nil) + r, _ := http.NewRequest("PUT", "/foo", nil) + for i := 0; i < b.N; i++ { handler.ServeHTTP(recorder, r) } } @@ -246,8 +246,8 @@ func Benchmark_WithCORS(b *testing.B) { ctx.Output.SetStatus(500) }) b.ResetTimer() - for i := 0; i < 100; i++ { - r, _ := http.NewRequest("PUT", "/foo", nil) + r, _ := http.NewRequest("PUT", "/foo", nil) + for i := 0; i < b.N; i++ { handler.ServeHTTP(recorder, r) } } From c43e3d6684e1ae2532d0a72f64dc296ba799e702 Mon Sep 17 00:00:00 2001 From: fud Date: Mon, 21 Dec 2015 16:05:26 +0800 Subject: [PATCH 336/436] fix type mismatch error --- config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.go b/config.go index 098ea7cb..bb01e25f 100644 --- a/config.go +++ b/config.go @@ -294,7 +294,7 @@ func (b *beegoAppConfig) String(key string) string { func (b *beegoAppConfig) Strings(key string) []string { if v := b.innerConfig.Strings(BConfig.RunMode + "::" + key); v[0] != "" { - return v[0] + return v } return b.innerConfig.Strings(key) } From 92711e80a31019f570f87bcc48dd8941edb77d51 Mon Sep 17 00:00:00 2001 From: fud Date: Mon, 21 Dec 2015 16:23:31 +0800 Subject: [PATCH 337/436] refactor controller.go --- context/input.go | 2 +- controller.go | 122 +++++++++++++++++++++------------------------- namespace_test.go | 12 ++--- orm/types.go | 1 - 4 files changed, 62 insertions(+), 75 deletions(-) diff --git a/context/input.go b/context/input.go index 482b431a..90ebecfc 100644 --- a/context/input.go +++ b/context/input.go @@ -315,7 +315,7 @@ func (input *BeegoInput) Session(key interface{}) interface{} { // CopyBody returns the raw request body data as bytes. func (input *BeegoInput) CopyBody(MaxMemory int64) []byte { - safe := &io.LimitedReader{R:input.Context.Request.Body, N:MaxMemory} + safe := &io.LimitedReader{R: input.Context.Request.Body, N: MaxMemory} requestbody, _ := ioutil.ReadAll(safe) input.Context.Request.Body.Close() bf := bytes.NewBuffer(requestbody) diff --git a/controller.go b/controller.go index ebe99c5c..a5bb0607 100644 --- a/controller.go +++ b/controller.go @@ -19,7 +19,6 @@ import ( "errors" "html/template" "io" - "io/ioutil" "mime/multipart" "net/http" "net/url" @@ -57,22 +56,31 @@ type ControllerComments struct { // Controller defines some basic http request handler operations, such as // http context, template and view, session and xsrf. type Controller struct { - Ctx *context.Context - Data map[interface{}]interface{} + // context data + Ctx *context.Context + Data map[interface{}]interface{} + + // route controller info controllerName string actionName string + methodMapping map[string]func() //method:routertree + gotofunc string + AppController interface{} + + // template data TplNames string Layout string LayoutSections map[string]string // the key is the section name and the value is the template name TplExt string - _xsrfToken string - gotofunc string - CruSession session.Store - XSRFExpire int - AppController interface{} EnableRender bool - EnableXSRF bool - methodMapping map[string]func() //method:routertree + + // xsrf data + _xsrfToken string + XSRFExpire int + EnableXSRF bool + + // session + CruSession session.Store } // ControllerInterface is an interface to uniform all controller handler. @@ -110,14 +118,10 @@ func (c *Controller) Init(ctx *context.Context, controllerName, actionName strin } // Prepare runs after Init before request function execution. -func (c *Controller) Prepare() { - -} +func (c *Controller) Prepare() {} // Finish runs after request function execution. -func (c *Controller) Finish() { - -} +func (c *Controller) Finish() {} // Get adds a request function to handle GET request. func (c *Controller) Get() { @@ -164,8 +168,7 @@ func (c *Controller) HandlerFunc(fnname string) bool { } // URLMapping register the internal Controller router. -func (c *Controller) URLMapping() { -} +func (c *Controller) URLMapping() {} // Mapping the method to function func (c *Controller) Mapping(method string, fn func()) { @@ -195,14 +198,14 @@ func (c *Controller) RenderString() (string, error) { // RenderBytes returns the bytes of rendered template string. Do not send out response. func (c *Controller) RenderBytes() ([]byte, error) { //if the controller has set layout, then first get the tplname's content set the content to the layout + var buf bytes.Buffer if c.Layout != "" { if c.TplNames == "" { c.TplNames = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt } if BConfig.RunMode == "dev" { - buildFiles := make([]string, 1) - buildFiles = append(buildFiles, c.TplNames) + buildFiles := []string{c.TplNames} if c.LayoutSections != nil { for _, sectionTpl := range c.LayoutSections { if sectionTpl == "" { @@ -213,17 +216,15 @@ func (c *Controller) RenderBytes() ([]byte, error) { } BuildTemplate(BConfig.WebConfig.ViewsPath, buildFiles...) } - newbytes := bytes.NewBufferString("") if _, ok := BeeTemplates[c.TplNames]; !ok { panic("can't find templatefile in the path:" + c.TplNames) } - err := BeeTemplates[c.TplNames].ExecuteTemplate(newbytes, c.TplNames, c.Data) + err := BeeTemplates[c.TplNames].ExecuteTemplate(&buf, c.TplNames, c.Data) if err != nil { Trace("template Execute err:", err) return nil, err } - tplcontent, _ := ioutil.ReadAll(newbytes) - c.Data["LayoutContent"] = template.HTML(string(tplcontent)) + c.Data["LayoutContent"] = template.HTML(buf.String()) if c.LayoutSections != nil { for sectionName, sectionTpl := range c.LayoutSections { @@ -232,25 +233,23 @@ func (c *Controller) RenderBytes() ([]byte, error) { continue } - sectionBytes := bytes.NewBufferString("") - err = BeeTemplates[sectionTpl].ExecuteTemplate(sectionBytes, sectionTpl, c.Data) + buf.Reset() + err = BeeTemplates[sectionTpl].ExecuteTemplate(&buf, sectionTpl, c.Data) if err != nil { Trace("template Execute err:", err) return nil, err } - sectionContent, _ := ioutil.ReadAll(sectionBytes) - c.Data[sectionName] = template.HTML(string(sectionContent)) + c.Data[sectionName] = template.HTML(buf.String()) } } - ibytes := bytes.NewBufferString("") - err = BeeTemplates[c.Layout].ExecuteTemplate(ibytes, c.Layout, c.Data) + buf.Reset() + err = BeeTemplates[c.Layout].ExecuteTemplate(&buf, c.Layout, c.Data) if err != nil { Trace("template Execute err:", err) return nil, err } - icontent, _ := ioutil.ReadAll(ibytes) - return icontent, nil + return buf.Bytes(), nil } if c.TplNames == "" { @@ -259,17 +258,16 @@ func (c *Controller) RenderBytes() ([]byte, error) { if BConfig.RunMode == "dev" { BuildTemplate(BConfig.WebConfig.ViewsPath, c.TplNames) } - ibytes := bytes.NewBufferString("") if _, ok := BeeTemplates[c.TplNames]; !ok { panic("can't find templatefile in the path:" + c.TplNames) } - err := BeeTemplates[c.TplNames].ExecuteTemplate(ibytes, c.TplNames, c.Data) + buf.Reset() + err := BeeTemplates[c.TplNames].ExecuteTemplate(&buf, c.TplNames, c.Data) if err != nil { Trace("template Execute err:", err) return nil, err } - icontent, _ := ioutil.ReadAll(ibytes) - return icontent, nil + return buf.Bytes(), nil } // Redirect sends the redirection response to url with status code. @@ -306,7 +304,7 @@ func (c *Controller) StopRun() { // URLFor does another controller handler in this request function. // it goes to this controller method if endpoint is not clear. func (c *Controller) URLFor(endpoint string, values ...interface{}) string { - if len(endpoint) <= 0 { + if len(endpoint) == 0 { return "" } if endpoint[0] == '.' { @@ -317,37 +315,33 @@ func (c *Controller) URLFor(endpoint string, values ...interface{}) string { // ServeJSON sends a json response with encoding charset. func (c *Controller) ServeJSON(encoding ...bool) { - var hasIndent bool - var hasencoding bool + var ( + hasIndent = true + hasEncoding = false + ) if BConfig.RunMode == "prod" { hasIndent = false - } else { - hasIndent = true } if len(encoding) > 0 && encoding[0] == true { - hasencoding = true + hasEncoding = true } - c.Ctx.Output.JSON(c.Data["json"], hasIndent, hasencoding) + c.Ctx.Output.JSON(c.Data["json"], hasIndent, hasEncoding) } // ServeJSONP sends a jsonp response. func (c *Controller) ServeJSONP() { - var hasIndent bool + hasIndent := true if BConfig.RunMode == "prod" { hasIndent = false - } else { - hasIndent = true } c.Ctx.Output.JSONP(c.Data["jsonp"], hasIndent) } // ServeXML sends xml response. func (c *Controller) ServeXML() { - var hasIndent bool + hasIndent := true if BConfig.RunMode == "prod" { hasIndent = false - } else { - hasIndent = true } c.Ctx.Output.XML(c.Data["xml"], hasIndent) } @@ -380,15 +374,13 @@ func (c *Controller) ParseForm(obj interface{}) error { // GetString returns the input value by key string or the default value while it's present and input is blank func (c *Controller) GetString(key string, def ...string) string { - var defv string - if len(def) > 0 { - defv = def[0] - } - if v := c.Ctx.Input.Query(key); v != "" { return v } - return defv + if len(def) > 0 { + return def[0] + } + return "" } // GetStrings returns the input string slice by key string or the default value while it's present and input is blank @@ -399,15 +391,14 @@ func (c *Controller) GetStrings(key string, def ...[]string) []string { defv = def[0] } - f := c.Input() - if f == nil { + if f := c.Input(); f == nil { return defv + } else { + if vs := f[key]; len(vs) > 0 { + return vs + } } - vs := f[key] - if len(vs) > 0 { - return vs - } return defv } @@ -511,8 +502,7 @@ func (c *Controller) GetFile(key string) (multipart.File, *multipart.FileHeader, // } // } func (c *Controller) GetFiles(key string) ([]*multipart.FileHeader, error) { - files, ok := c.Ctx.Request.MultipartForm.File[key] - if ok { + if files, ok := c.Ctx.Request.MultipartForm.File[key]; ok { return files, nil } return nil, http.ErrMissingFile @@ -601,11 +591,9 @@ func (c *Controller) SetSecureCookie(Secret, name, value string, others ...inter // XSRFToken creates a CSRF token string and returns. func (c *Controller) XSRFToken() string { if c._xsrfToken == "" { - var expire int64 + expire := int64(BConfig.WebConfig.XSRFExpire) if c.XSRFExpire > 0 { expire = int64(c.XSRFExpire) - } else { - expire = int64(BConfig.WebConfig.XSRFExpire) } c._xsrfToken = c.Ctx.XSRFToken(BConfig.WebConfig.XSRFKEY, expire) } @@ -629,6 +617,6 @@ func (c *Controller) XSRFFormHTML() string { } // GetControllerAndAction gets the executing controller name and action name. -func (c *Controller) GetControllerAndAction() (controllerName, actionName string) { +func (c *Controller) GetControllerAndAction() (string, string) { return c.controllerName, c.actionName } diff --git a/namespace_test.go b/namespace_test.go index a92ae3ef..fc02b5fb 100644 --- a/namespace_test.go +++ b/namespace_test.go @@ -61,8 +61,8 @@ func TestNamespaceNest(t *testing.T) { ns.Namespace( NewNamespace("/admin"). Get("/order", func(ctx *context.Context) { - ctx.Output.Body([]byte("order")) - }), + ctx.Output.Body([]byte("order")) + }), ) AddNamespace(ns) BeeApp.Handlers.ServeHTTP(w, r) @@ -79,8 +79,8 @@ func TestNamespaceNestParam(t *testing.T) { ns.Namespace( NewNamespace("/admin"). Get("/order/:id", func(ctx *context.Context) { - ctx.Output.Body([]byte(ctx.Input.Param(":id"))) - }), + ctx.Output.Body([]byte(ctx.Input.Param(":id"))) + }), ) AddNamespace(ns) BeeApp.Handlers.ServeHTTP(w, r) @@ -124,8 +124,8 @@ func TestNamespaceFilter(t *testing.T) { ctx.Output.Body([]byte("this is Filter")) }). Get("/user/:id", func(ctx *context.Context) { - ctx.Output.Body([]byte(ctx.Input.Param(":id"))) - }) + ctx.Output.Body([]byte(ctx.Input.Param(":id"))) + }) AddNamespace(ns) BeeApp.Handlers.ServeHTTP(w, r) if w.Body.String() != "this is Filter" { diff --git a/orm/types.go b/orm/types.go index 3a3113f1..5fac5fed 100644 --- a/orm/types.go +++ b/orm/types.go @@ -275,7 +275,6 @@ type QueryM2Mer interface { Count() (int64, error) } - // RawPreparer raw query statement type RawPreparer interface { Exec(...interface{}) (sql.Result, error) From bbd42ce1522a6cab0a3d126437ff1025692996d8 Mon Sep 17 00:00:00 2001 From: fud Date: Mon, 21 Dec 2015 17:16:58 +0800 Subject: [PATCH 338/436] simplify docs.go and error.go, use http.StatusText instead of string codes --- docs.go | 10 +---- error.go | 112 ++++++++++++++++++++++++++++++------------------------- 2 files changed, 62 insertions(+), 60 deletions(-) diff --git a/docs.go b/docs.go index 0e0f13f7..72532876 100644 --- a/docs.go +++ b/docs.go @@ -15,8 +15,6 @@ package beego import ( - "encoding/json" - "github.com/astaxie/beego/context" ) @@ -33,14 +31,8 @@ func serverDocs(ctx *context.Context) { } } if obj != nil { - bt, err := json.Marshal(obj) - if err != nil { - ctx.Output.SetStatus(504) - return - } - ctx.Output.Header("Content-Type", "application/json;charset=UTF-8") ctx.Output.Header("Access-Control-Allow-Origin", "*") - ctx.Output.Body(bt) + ctx.Output.JSON(obj, false, false) return } ctx.Output.SetStatus(404) diff --git a/error.go b/error.go index 0010c814..af57b7c7 100644 --- a/error.go +++ b/error.go @@ -82,16 +82,17 @@ var tpl = ` ` // render default application error page with error and stack string. -func showErr(err interface{}, ctx *context.Context, Stack string) { +func showErr(err interface{}, ctx *context.Context, stack string) { t, _ := template.New("beegoerrortemp").Parse(tpl) - data := make(map[string]string) - data["AppError"] = BConfig.AppName + ":" + fmt.Sprint(err) - data["RequestMethod"] = ctx.Input.Method() - data["RequestURL"] = ctx.Input.URI() - data["RemoteAddr"] = ctx.Input.IP() - data["Stack"] = Stack - data["BeegoVersion"] = VERSION - data["GoVersion"] = runtime.Version() + data := map[string]string{ + "AppError": fmt.Sprintf("%s:%v", BConfig.AppName, err), + "RequestMethod": ctx.Input.Method(), + "RequestURL": ctx.Input.URI(), + "RemoteAddr": ctx.Input.IP(), + "Stack": stack, + "BeegoVersion": VERSION, + "GoVersion": runtime.Version(), + } ctx.ResponseWriter.WriteHeader(500) t.Execute(ctx.ResponseWriter, data) } @@ -210,38 +211,42 @@ var ErrorMaps = make(map[string]*errorInfo, 10) // show 401 unauthorized error. func unauthorized(rw http.ResponseWriter, r *http.Request) { t, _ := template.New("beegoerrortemp").Parse(errtpl) - data := make(map[string]interface{}) - data["Title"] = "Unauthorized" + data := map[string]interface{}{ + "Title": http.StatusText(401), + "BeegoVersion": VERSION, + } data["Content"] = template.HTML("
The page you have requested can't be authorized." + "
Perhaps you are here because:" + "

    " + "
    The credentials you supplied are incorrect" + "
    There are errors in the website address" + "
") - data["BeegoVersion"] = VERSION t.Execute(rw, data) } // show 402 Payment Required func paymentRequired(rw http.ResponseWriter, r *http.Request) { t, _ := template.New("beegoerrortemp").Parse(errtpl) - data := make(map[string]interface{}) - data["Title"] = "Payment Required" + data := map[string]interface{}{ + "Title": http.StatusText(402), + "BeegoVersion": VERSION, + } data["Content"] = template.HTML("
The page you have requested Payment Required." + "
Perhaps you are here because:" + "

    " + "
    The credentials you supplied are incorrect" + "
    There are errors in the website address" + "
") - data["BeegoVersion"] = VERSION t.Execute(rw, data) } // show 403 forbidden error. func forbidden(rw http.ResponseWriter, r *http.Request) { t, _ := template.New("beegoerrortemp").Parse(errtpl) - data := make(map[string]interface{}) - data["Title"] = "Forbidden" + data := map[string]interface{}{ + "Title": http.StatusText(403), + "BeegoVersion": VERSION, + } data["Content"] = template.HTML("
The page you have requested is forbidden." + "
Perhaps you are here because:" + "

    " + @@ -249,15 +254,16 @@ func forbidden(rw http.ResponseWriter, r *http.Request) { "
    The site may be disabled" + "
    You need to log in" + "
") - data["BeegoVersion"] = VERSION t.Execute(rw, data) } // show 404 notfound error. func notFound(rw http.ResponseWriter, r *http.Request) { t, _ := template.New("beegoerrortemp").Parse(errtpl) - data := make(map[string]interface{}) - data["Title"] = "Page Not Found" + data := map[string]interface{}{ + "Title": http.StatusText(404), + "BeegoVersion": VERSION, + } data["Content"] = template.HTML("
The page you have requested has flown the coop." + "
Perhaps you are here because:" + "

    " + @@ -266,92 +272,97 @@ func notFound(rw http.ResponseWriter, r *http.Request) { "
    You were looking for your puppy and got lost" + "
    You like 404 pages" + "
") - data["BeegoVersion"] = VERSION t.Execute(rw, data) } // show 405 Method Not Allowed func methodNotAllowed(rw http.ResponseWriter, r *http.Request) { t, _ := template.New("beegoerrortemp").Parse(errtpl) - data := make(map[string]interface{}) - data["Title"] = "Method Not Allowed" + data := map[string]interface{}{ + "Title": http.StatusText(405), + "BeegoVersion": VERSION, + } data["Content"] = template.HTML("
The method you have requested Not Allowed." + "
Perhaps you are here because:" + "

    " + "
    The method specified in the Request-Line is not allowed for the resource identified by the Request-URI" + "
    The response MUST include an Allow header containing a list of valid methods for the requested resource." + "
") - data["BeegoVersion"] = VERSION t.Execute(rw, data) } // show 500 internal server error. func internalServerError(rw http.ResponseWriter, r *http.Request) { t, _ := template.New("beegoerrortemp").Parse(errtpl) - data := make(map[string]interface{}) - data["Title"] = "Internal Server Error" + data := map[string]interface{}{ + "Title": http.StatusText(500), + "BeegoVersion": VERSION, + } data["Content"] = template.HTML("
The page you have requested is down right now." + "

    " + "
    Please try again later and report the error to the website administrator" + "
") - data["BeegoVersion"] = VERSION t.Execute(rw, data) } // show 501 Not Implemented. func notImplemented(rw http.ResponseWriter, r *http.Request) { t, _ := template.New("beegoerrortemp").Parse(errtpl) - data := make(map[string]interface{}) - data["Title"] = "Not Implemented" + data := map[string]interface{}{ + "Title": http.StatusText(504), + "BeegoVersion": VERSION, + } data["Content"] = template.HTML("
The page you have requested is Not Implemented." + "

    " + "
    Please try again later and report the error to the website administrator" + "
") - data["BeegoVersion"] = VERSION t.Execute(rw, data) } // show 502 Bad Gateway. func badGateway(rw http.ResponseWriter, r *http.Request) { t, _ := template.New("beegoerrortemp").Parse(errtpl) - data := make(map[string]interface{}) - data["Title"] = "Bad Gateway" + data := map[string]interface{}{ + "Title": http.StatusText(502), + "BeegoVersion": VERSION, + } data["Content"] = template.HTML("
The page you have requested is down right now." + "

    " + "
    The server, while acting as a gateway or proxy, received an invalid response from the upstream server it accessed in attempting to fulfill the request." + "
    Please try again later and report the error to the website administrator" + "
") - data["BeegoVersion"] = VERSION t.Execute(rw, data) } // show 503 service unavailable error. func serviceUnavailable(rw http.ResponseWriter, r *http.Request) { t, _ := template.New("beegoerrortemp").Parse(errtpl) - data := make(map[string]interface{}) - data["Title"] = "Service Unavailable" + data := map[string]interface{}{ + "Title": http.StatusText(503), + "BeegoVersion": VERSION, + } data["Content"] = template.HTML("
The page you have requested is unavailable." + "
Perhaps you are here because:" + "

    " + "

    The page is overloaded" + "
    Please try again later." + "
") - data["BeegoVersion"] = VERSION t.Execute(rw, data) } // show 504 Gateway Timeout. func gatewayTimeout(rw http.ResponseWriter, r *http.Request) { t, _ := template.New("beegoerrortemp").Parse(errtpl) - data := make(map[string]interface{}) - data["Title"] = "Gateway Timeout" + data := map[string]interface{}{ + "Title": http.StatusText(504), + "BeegoVersion": VERSION, + } data["Content"] = template.HTML("
The page you have requested is unavailable." + "
Perhaps you are here because:" + "

    " + "

    The server, while acting as a gateway or proxy, did not receive a timely response from the upstream server specified by the URI." + "
    Please try again later." + "
") - data["BeegoVersion"] = VERSION t.Execute(rw, data) } @@ -360,11 +371,11 @@ func gatewayTimeout(rw http.ResponseWriter, r *http.Request) { // beego.ErrorHandler("404",NotFound) // beego.ErrorHandler("500",InternalServerError) func ErrorHandler(code string, h http.HandlerFunc) *App { - errinfo := &errorInfo{} - errinfo.errorType = errorTypeHandler - errinfo.handler = h - errinfo.method = code - ErrorMaps[code] = errinfo + ErrorMaps[code] = &errorInfo{ + errorType: errorTypeHandler, + handler: h, + method: code, + } return BeeApp } @@ -378,12 +389,12 @@ func ErrorController(c ControllerInterface) *App { for i := 0; i < rt.NumMethod(); i++ { methodName := rt.Method(i).Name if !utils.InSlice(methodName, exceptMethod) && strings.HasPrefix(methodName, "Error") { - errinfo := &errorInfo{} - errinfo.errorType = errorTypeController - errinfo.controllerType = ct - errinfo.method = methodName errName := strings.TrimPrefix(methodName, "Error") - ErrorMaps[errName] = errinfo + ErrorMaps[errName] = &errorInfo{ + errorType: errorTypeController, + controllerType: ct, + method: methodName, + } } } return BeeApp @@ -432,9 +443,8 @@ func executeError(err *errorInfo, ctx *context.Context, code int) { execController.URLMapping() - var in []reflect.Value method := vc.MethodByName(err.method) - method.Call(in) + method.Call([]reflect.Value{}) //render template if BConfig.WebConfig.AutoRender { From 351dfac653aa2beb01d4c0ecc28aa914ad0b9902 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 21 Dec 2015 22:51:18 +0800 Subject: [PATCH 339/436] context.Response should implement Hijack/Flush/CloseNotify --- context/context.go | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/context/context.go b/context/context.go index f3dffdbd..db790ff2 100644 --- a/context/context.go +++ b/context/context.go @@ -23,10 +23,13 @@ package context import ( + "bufio" "crypto/hmac" "crypto/sha1" "encoding/base64" + "errors" "fmt" + "net" "net/http" "strconv" "strings" @@ -188,3 +191,27 @@ func (w *Response) WriteHeader(code int) { w.Started = true w.ResponseWriter.WriteHeader(code) } + +// Hijack hijacker for http +func (w *Response) Hijack() (net.Conn, *bufio.ReadWriter, error) { + hj, ok := w.ResponseWriter.(http.Hijacker) + if !ok { + return nil, nil, errors.New("webserver doesn't support hijacking") + } + return hj.Hijack() +} + +// Flush http.Flusher +func (w *Response) Flush() { + if f, ok := w.ResponseWriter.(http.Flusher); ok { + f.Flush() + } +} + +// CloseNotify http.CloseNotifier +func (w *Response) CloseNotify() <-chan bool { + if cn, ok := w.ResponseWriter.(http.CloseNotifier); ok { + return cn.CloseNotify() + } + return nil +} From cd514803a40b285302c30a98de30fc08c939d52d Mon Sep 17 00:00:00 2001 From: fud Date: Tue, 22 Dec 2015 10:02:59 +0800 Subject: [PATCH 340/436] simplify filter.go hooks.go --- filter.go | 11 +++++------ hooks.go | 43 +++++++++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/filter.go b/filter.go index cefd74a1..863223f7 100644 --- a/filter.go +++ b/filter.go @@ -33,12 +33,11 @@ type FilterRouter struct { // If the request is matched, the values of the URL parameters defined // by the filter pattern are also returned. func (f *FilterRouter) ValidRouter(url string, ctx *context.Context) bool { - isok := f.tree.Match(url, ctx) - if isok == nil { - return false - } - if isok, ok := isok.(bool); ok { - return isok + isOk := f.tree.Match(url, ctx) + if isOk != nil { + if b, ok := isOk.(bool); ok { + return b + } } return false } diff --git a/hooks.go b/hooks.go index 61b80ad3..0588206f 100644 --- a/hooks.go +++ b/hooks.go @@ -1,11 +1,10 @@ package beego import ( + "encoding/json" "mime" - "path/filepath" - "strconv" - "net/http" + "path/filepath" "github.com/astaxie/beego/session" ) @@ -20,8 +19,7 @@ func registerMime() error { // register default error http handlers, 404,401,403,500 and 503. func registerDefaultErrorHandler() error { - - for e, h := range map[string]func(http.ResponseWriter, *http.Request){ + m := map[string]func(http.ResponseWriter, *http.Request){ "401": unauthorized, "402": paymentRequired, "403": forbidden, @@ -32,7 +30,8 @@ func registerDefaultErrorHandler() error { "502": badGateway, "503": serviceUnavailable, "504": gatewayTimeout, - } { + } + for e, h := range m { if _, ok := ErrorMaps[e]; !ok { ErrorHandler(e, h) } @@ -45,16 +44,22 @@ func registerSession() error { var err error sessionConfig := AppConfig.String("sessionConfig") if sessionConfig == "" { - sessionConfig = `{"cookieName":"` + BConfig.WebConfig.Session.SessionName + `",` + - `"gclifetime":` + strconv.FormatInt(BConfig.WebConfig.Session.SessionGCMaxLifetime, 10) + `,` + - `"providerConfig":"` + filepath.ToSlash(BConfig.WebConfig.Session.SessionProviderConfig) + `",` + - `"secure":` + strconv.FormatBool(BConfig.Listen.HTTPSEnable) + `,` + - `"enableSetCookie":` + strconv.FormatBool(BConfig.WebConfig.Session.SessionAutoSetCookie) + `,` + - `"domain":"` + BConfig.WebConfig.Session.SessionDomain + `",` + - `"cookieLifeTime":` + strconv.Itoa(BConfig.WebConfig.Session.SessionCookieLifeTime) + `}` + conf := map[string]interface{}{ + "cookieName": BConfig.WebConfig.Session.SessionName, + "gclifetime": BConfig.WebConfig.Session.SessionGCMaxLifetime, + "providerConfig": filepath.ToSlash(BConfig.WebConfig.Session.SessionProviderConfig), + "secure": BConfig.Listen.HTTPSEnable, + "enableSetCookie": BConfig.WebConfig.Session.SessionAutoSetCookie, + "domain": BConfig.WebConfig.Session.SessionDomain, + "cookieLifeTime": BConfig.WebConfig.Session.SessionCookieLifeTime, + } + confBytes, err := json.Marshal(conf) + if err != nil { + return err + } + sessionConfig = string(confBytes) } - GlobalSessions, err = session.NewManager(BConfig.WebConfig.Session.SessionProvider, sessionConfig) - if err != nil { + if GlobalSessions, err = session.NewManager(BConfig.WebConfig.Session.SessionProvider, sessionConfig); err != nil { return err } go GlobalSessions.GC() @@ -64,9 +69,11 @@ func registerSession() error { func registerTemplate() error { if BConfig.WebConfig.AutoRender { - err := BuildTemplate(BConfig.WebConfig.ViewsPath) - if err != nil && BConfig.RunMode == "dev" { - Warn(err) + if err := BuildTemplate(BConfig.WebConfig.ViewsPath); err != nil { + if BConfig.RunMode == "dev" { + Warn(err) + } + return err } } return nil From da39082d4f14ba78eed6f518b6cd0d32e4eb7f7c Mon Sep 17 00:00:00 2001 From: Yandong Yao Date: Tue, 22 Dec 2015 09:20:53 +0800 Subject: [PATCH 341/436] Retrieve session identifier from cookie and query parameters --- session/session.go | 106 +++++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 52 deletions(-) diff --git a/session/session.go b/session/session.go index 947bfcbb..1c0a512b 100644 --- a/session/session.go +++ b/session/session.go @@ -133,63 +133,65 @@ func NewManager(provideName, config string) (*Manager, error) { }, nil } -// SessionStart Start session. generate or read the session id from http request. -// if session id exists, return SessionStore with this id. -func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (session Store, err error) { +// getSid retrieves session identifier from HTTP Request. +// First try to retrieve id by reading from cookie, session cookie name is configurable, +// if not exist, then retrieve id from querying parameters. +// +// error is not nil when there is anything wrong. +// sid is empty when need to generate a new session id +// otherwise return an valid session id. +func (manager *Manager) getSid(r *http.Request) (string, error) { cookie, errs := r.Cookie(manager.config.CookieName) if errs != nil || cookie.Value == "" { - sid, errs := manager.sessionID(r) + errs := r.ParseForm() if errs != nil { - return nil, errs - } - session, err = manager.provider.SessionRead(sid) - cookie = &http.Cookie{ - Name: manager.config.CookieName, - Value: url.QueryEscape(sid), - Path: "/", - HttpOnly: true, - Secure: manager.isSecure(r), - Domain: manager.config.Domain, - } - if manager.config.CookieLifeTime > 0 { - cookie.MaxAge = manager.config.CookieLifeTime - cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) - } - if manager.config.EnableSetCookie { - http.SetCookie(w, cookie) - } - r.AddCookie(cookie) - } else { - sid, errs := url.QueryUnescape(cookie.Value) - if errs != nil { - return nil, errs - } - if manager.provider.SessionExist(sid) { - session, err = manager.provider.SessionRead(sid) - } else { - sid, err = manager.sessionID(r) - if err != nil { - return nil, err - } - session, err = manager.provider.SessionRead(sid) - cookie = &http.Cookie{ - Name: manager.config.CookieName, - Value: url.QueryEscape(sid), - Path: "/", - HttpOnly: true, - Secure: manager.isSecure(r), - Domain: manager.config.Domain, - } - if manager.config.CookieLifeTime > 0 { - cookie.MaxAge = manager.config.CookieLifeTime - cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) - } - if manager.config.EnableSetCookie { - http.SetCookie(w, cookie) - } - r.AddCookie(cookie) + return "", errs } + + sid := r.FormValue(manager.config.CookieName) + return sid, nil } + + // HTTP Request contains cookie for sessionid info. + return url.QueryUnescape(cookie.Value) +} + +// Start session. generate or read the session id from http request. +// if session id exists, return SessionStore with this id. +func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (session SessionStore, err error) { + sid, errs := manager.getSid(r) + if errs != nil { + return nil, errs + } + + if sid != "" && manager.provider.SessionExist(sid) { + return manager.provider.SessionRead(sid) + } + + // Generate a new session + sid, errs = manager.sessionId(r) + if errs != nil { + return nil, errs + } + + session, err = manager.provider.SessionRead(sid) + cookie := &http.Cookie{ + Name: manager.config.CookieName, + Value: url.QueryEscape(sid), + Path: "/", + HttpOnly: true, + Secure: manager.isSecure(r), + Domain: manager.config.Domain, + } + if manager.config.CookieLifeTime > 0 { + cookie.MaxAge = manager.config.CookieLifeTime + cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) + } + if manager.config.EnableSetCookie { + http.SetCookie(w, cookie) + } + r.AddCookie(cookie) + return } From 2d4cc6e33d5f362423aba3aab4714e285ed7a90e Mon Sep 17 00:00:00 2001 From: John Doe Date: Sat, 26 Dec 2015 16:43:49 +0300 Subject: [PATCH 342/436] Add link to russian Add link to russian --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b1b48e75..3c8f3b8d 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,7 @@ Please see [Documentation](http://beego.me/docs) for more. * [English](http://beego.me/docs/intro/) * [中文文档](http://beego.me/docs/intro/) +* [Русский](http://beego.me/docs/intro/) ## Community From ac3a447479046559be0dc34a22b068b5169f8504 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 27 Dec 2015 14:09:20 +0800 Subject: [PATCH 343/436] fix the session update issues --- session/session.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/session/session.go b/session/session.go index 1c0a512b..da079180 100644 --- a/session/session.go +++ b/session/session.go @@ -156,9 +156,9 @@ func (manager *Manager) getSid(r *http.Request) (string, error) { return url.QueryUnescape(cookie.Value) } -// Start session. generate or read the session id from http request. +// SessionStart generate or read the session id from http request. // if session id exists, return SessionStore with this id. -func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (session SessionStore, err error) { +func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (session Store, err error) { sid, errs := manager.getSid(r) if errs != nil { return nil, errs @@ -169,7 +169,7 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se } // Generate a new session - sid, errs = manager.sessionId(r) + sid, errs = manager.sessionID(r) if errs != nil { return nil, errs } From 48fd9675ad9467588b3bd582489601b71cae7c4a Mon Sep 17 00:00:00 2001 From: Vitaly Velikodny Date: Tue, 29 Dec 2015 21:32:37 +0300 Subject: [PATCH 344/436] Refactoring: Move dev & prod runmodes to const --- beego.go | 10 ++++++++-- config.go | 2 +- config/ini_test.go | 4 +++- config/json_test.go | 4 +++- config/xml/xml_test.go | 3 ++- config/yaml/yaml_test.go | 3 ++- controller.go | 10 +++++----- hooks.go | 2 +- plugins/cors/cors_test.go | 4 ++-- router.go | 8 ++++---- staticfile.go | 4 ++-- 11 files changed, 33 insertions(+), 21 deletions(-) diff --git a/beego.go b/beego.go index a4d996e3..fd4600b7 100644 --- a/beego.go +++ b/beego.go @@ -24,8 +24,14 @@ import ( "github.com/astaxie/beego/logs" ) -// beego web framework version. -const VERSION = "1.5.0" +const ( + // beego web framework version. + VERSION = "1.5.0" + + // beego run modes + DEV = "dev" + PROD = "prod" +) //hook function to run type hookfunc func() error diff --git a/config.go b/config.go index bb01e25f..3a95d6fd 100644 --- a/config.go +++ b/config.go @@ -111,7 +111,7 @@ var ( func init() { BConfig = &BeegoConfig{ AppName: "beego", - RunMode: "dev", + RunMode: DEV, RouterCaseSensitive: true, ServerName: "beegoServer:" + VERSION, RecoverPanic: true, diff --git a/config/ini_test.go b/config/ini_test.go index 7599ab8b..38093e0e 100644 --- a/config/ini_test.go +++ b/config/ini_test.go @@ -17,6 +17,8 @@ package config import ( "os" "testing" + + "github.com/astaxie/beego" ) var inicontext = ` @@ -67,7 +69,7 @@ func TestIni(t *testing.T) { t.Error(pi) t.Fatal(err) } - if iniconf.String("runmode") != "dev" { + if iniconf.String("runmode") != beego.DEV { t.Fatal("runmode not equal to dev") } if v, err := iniconf.Bool("autorender"); err != nil || v != false { diff --git a/config/json_test.go b/config/json_test.go index 5aedae36..ca4dfffd 100644 --- a/config/json_test.go +++ b/config/json_test.go @@ -17,6 +17,8 @@ package config import ( "os" "testing" + + "github.com/astaxie/beego" ) var jsoncontext = `{ @@ -120,7 +122,7 @@ func TestJson(t *testing.T) { t.Error(pi) t.Fatal(err) } - if jsonconf.String("runmode") != "dev" { + if jsonconf.String("runmode") != beego.DEV { t.Fatal("runmode not equal to dev") } if v := jsonconf.Strings("unknown"); len(v) > 0 { diff --git a/config/xml/xml_test.go b/config/xml/xml_test.go index fa3c17f1..721a85fd 100644 --- a/config/xml/xml_test.go +++ b/config/xml/xml_test.go @@ -18,6 +18,7 @@ import ( "os" "testing" + "github.com/astaxie/beego" "github.com/astaxie/beego/config" ) @@ -65,7 +66,7 @@ func TestXML(t *testing.T) { t.Error(pi) t.Fatal(err) } - if xmlconf.String("runmode") != "dev" { + if xmlconf.String("runmode") != beego.DEV { t.Fatal("runmode not equal to dev") } if v, err := xmlconf.Bool("autorender"); err != nil || v != false { diff --git a/config/yaml/yaml_test.go b/config/yaml/yaml_test.go index 19ecdca1..09cde8fd 100644 --- a/config/yaml/yaml_test.go +++ b/config/yaml/yaml_test.go @@ -18,6 +18,7 @@ import ( "os" "testing" + "github.com/astaxie/beego" "github.com/astaxie/beego/config" ) @@ -62,7 +63,7 @@ func TestYaml(t *testing.T) { t.Error(pi) t.Fatal(err) } - if yamlconf.String("runmode") != "dev" { + if yamlconf.String("runmode") != beego.DEV { t.Fatal("runmode not equal to dev") } if v, err := yamlconf.Bool("autorender"); err != nil || v != false { diff --git a/controller.go b/controller.go index a5bb0607..1d0d9025 100644 --- a/controller.go +++ b/controller.go @@ -204,7 +204,7 @@ func (c *Controller) RenderBytes() ([]byte, error) { c.TplNames = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt } - if BConfig.RunMode == "dev" { + if BConfig.RunMode == DEV { buildFiles := []string{c.TplNames} if c.LayoutSections != nil { for _, sectionTpl := range c.LayoutSections { @@ -255,7 +255,7 @@ func (c *Controller) RenderBytes() ([]byte, error) { if c.TplNames == "" { c.TplNames = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt } - if BConfig.RunMode == "dev" { + if BConfig.RunMode == DEV { BuildTemplate(BConfig.WebConfig.ViewsPath, c.TplNames) } if _, ok := BeeTemplates[c.TplNames]; !ok { @@ -319,7 +319,7 @@ func (c *Controller) ServeJSON(encoding ...bool) { hasIndent = true hasEncoding = false ) - if BConfig.RunMode == "prod" { + if BConfig.RunMode == PROD { hasIndent = false } if len(encoding) > 0 && encoding[0] == true { @@ -331,7 +331,7 @@ func (c *Controller) ServeJSON(encoding ...bool) { // ServeJSONP sends a jsonp response. func (c *Controller) ServeJSONP() { hasIndent := true - if BConfig.RunMode == "prod" { + if BConfig.RunMode == PROD { hasIndent = false } c.Ctx.Output.JSONP(c.Data["jsonp"], hasIndent) @@ -340,7 +340,7 @@ func (c *Controller) ServeJSONP() { // ServeXML sends xml response. func (c *Controller) ServeXML() { hasIndent := true - if BConfig.RunMode == "prod" { + if BConfig.RunMode == PROD { hasIndent = false } c.Ctx.Output.XML(c.Data["xml"], hasIndent) diff --git a/hooks.go b/hooks.go index 0588206f..53b298a0 100644 --- a/hooks.go +++ b/hooks.go @@ -70,7 +70,7 @@ func registerSession() error { func registerTemplate() error { if BConfig.WebConfig.AutoRender { if err := BuildTemplate(BConfig.WebConfig.ViewsPath); err != nil { - if BConfig.RunMode == "dev" { + if BConfig.RunMode == DEV { Warn(err) } return err diff --git a/plugins/cors/cors_test.go b/plugins/cors/cors_test.go index 84d21cd0..34039143 100644 --- a/plugins/cors/cors_test.go +++ b/plugins/cors/cors_test.go @@ -220,7 +220,7 @@ func Test_Preflight(t *testing.T) { func Benchmark_WithoutCORS(b *testing.B) { recorder := httptest.NewRecorder() handler := beego.NewControllerRegister() - beego.BConfig.RunMode = "prod" + beego.BConfig.RunMode = beego.PROD handler.Any("/foo", func(ctx *context.Context) { ctx.Output.SetStatus(500) }) @@ -234,7 +234,7 @@ func Benchmark_WithoutCORS(b *testing.B) { func Benchmark_WithCORS(b *testing.B) { recorder := httptest.NewRecorder() handler := beego.NewControllerRegister() - beego.BConfig.RunMode = "prod" + beego.BConfig.RunMode = beego.PROD handler.InsertFilter("*", beego.BeforeRouter, Allow(&Options{ AllowAllOrigins: true, AllowCredentials: true, diff --git a/router.go b/router.go index 8d724ac6..69464ac2 100644 --- a/router.go +++ b/router.go @@ -204,7 +204,7 @@ func (p *ControllerRegister) addToRouter(method, pattern string, r *controllerIn // Include only when the Runmode is dev will generate router file in the router/auto.go from the controller // Include(&BankAccount{}, &OrderController{},&RefundController{},&ReceiptController{}) func (p *ControllerRegister) Include(cList ...ControllerInterface) { - if BConfig.RunMode == "dev" { + if BConfig.RunMode == DEV { skip := make(map[string]bool, 10) for _, c := range cList { reflectVal := reflect.ValueOf(c) @@ -609,7 +609,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) defer p.pool.Put(context) defer p.recoverPanic(context) - if BConfig.RunMode == "dev" { + if BConfig.RunMode == DEV { context.Output.Header("Server", BConfig.ServerName) } @@ -815,7 +815,7 @@ Admin: } } - if BConfig.RunMode == "dev" || BConfig.Log.AccessLogs { + if BConfig.RunMode == DEV || BConfig.Log.AccessLogs { var devinfo string if findrouter { if routerInfo != nil { @@ -862,7 +862,7 @@ func (p *ControllerRegister) recoverPanic(context *beecontext.Context) { Critical(fmt.Sprintf("%s:%d", file, line)) stack = stack + fmt.Sprintln(fmt.Sprintf("%s:%d", file, line)) } - if BConfig.RunMode == "dev" { + if BConfig.RunMode == DEV { showErr(err, context, stack) } } diff --git a/staticfile.go b/staticfile.go index f3ea59a9..f9f3dc3e 100644 --- a/staticfile.go +++ b/staticfile.go @@ -49,7 +49,7 @@ func serverStaticRouter(ctx *context.Context) { } if filePath == "" || fileInfo == nil { - if BConfig.RunMode == "dev" { + if BConfig.RunMode == DEV { Warn("Can't find/open the file:", filePath, err) } http.NotFound(ctx.ResponseWriter, ctx.Request) @@ -68,7 +68,7 @@ func serverStaticRouter(ctx *context.Context) { } b, n, sch, err := openFile(filePath, fileInfo, acceptEncoding) if err != nil { - if BConfig.RunMode == "dev" { + if BConfig.RunMode == DEV { Warn("Can't compress the file:", filePath, err) } http.NotFound(ctx.ResponseWriter, ctx.Request) From 4b368d9f5e4e7d2d5e7fde7fd1d2d027029ac7c6 Mon Sep 17 00:00:00 2001 From: Vitaly Velikodny Date: Wed, 30 Dec 2015 11:22:09 +0300 Subject: [PATCH 345/436] Refactoring: keep config package beego independent --- config/ini_test.go | 4 +--- config/json_test.go | 4 +--- config/xml/xml_test.go | 3 +-- config/yaml/yaml_test.go | 3 +-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/config/ini_test.go b/config/ini_test.go index 38093e0e..7599ab8b 100644 --- a/config/ini_test.go +++ b/config/ini_test.go @@ -17,8 +17,6 @@ package config import ( "os" "testing" - - "github.com/astaxie/beego" ) var inicontext = ` @@ -69,7 +67,7 @@ func TestIni(t *testing.T) { t.Error(pi) t.Fatal(err) } - if iniconf.String("runmode") != beego.DEV { + if iniconf.String("runmode") != "dev" { t.Fatal("runmode not equal to dev") } if v, err := iniconf.Bool("autorender"); err != nil || v != false { diff --git a/config/json_test.go b/config/json_test.go index ca4dfffd..5aedae36 100644 --- a/config/json_test.go +++ b/config/json_test.go @@ -17,8 +17,6 @@ package config import ( "os" "testing" - - "github.com/astaxie/beego" ) var jsoncontext = `{ @@ -122,7 +120,7 @@ func TestJson(t *testing.T) { t.Error(pi) t.Fatal(err) } - if jsonconf.String("runmode") != beego.DEV { + if jsonconf.String("runmode") != "dev" { t.Fatal("runmode not equal to dev") } if v := jsonconf.Strings("unknown"); len(v) > 0 { diff --git a/config/xml/xml_test.go b/config/xml/xml_test.go index 721a85fd..fa3c17f1 100644 --- a/config/xml/xml_test.go +++ b/config/xml/xml_test.go @@ -18,7 +18,6 @@ import ( "os" "testing" - "github.com/astaxie/beego" "github.com/astaxie/beego/config" ) @@ -66,7 +65,7 @@ func TestXML(t *testing.T) { t.Error(pi) t.Fatal(err) } - if xmlconf.String("runmode") != beego.DEV { + if xmlconf.String("runmode") != "dev" { t.Fatal("runmode not equal to dev") } if v, err := xmlconf.Bool("autorender"); err != nil || v != false { diff --git a/config/yaml/yaml_test.go b/config/yaml/yaml_test.go index 09cde8fd..19ecdca1 100644 --- a/config/yaml/yaml_test.go +++ b/config/yaml/yaml_test.go @@ -18,7 +18,6 @@ import ( "os" "testing" - "github.com/astaxie/beego" "github.com/astaxie/beego/config" ) @@ -63,7 +62,7 @@ func TestYaml(t *testing.T) { t.Error(pi) t.Fatal(err) } - if yamlconf.String("runmode") != beego.DEV { + if yamlconf.String("runmode") != "dev" { t.Fatal("runmode not equal to dev") } if v, err := yamlconf.Bool("autorender"); err != nil || v != false { From 59fa248292837fc6da30afc0a9aa43587f22f832 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Thu, 31 Dec 2015 18:50:52 +0800 Subject: [PATCH 346/436] use sync.Pool to decrease new compression writer --- context/acceptencoder.go | 71 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 6 deletions(-) diff --git a/context/acceptencoder.go b/context/acceptencoder.go index 0a0586ac..c5fe1ba0 100644 --- a/context/acceptencoder.go +++ b/context/acceptencoder.go @@ -24,21 +24,79 @@ import ( "os" "strconv" "strings" + "sync" ) +type resetWriter interface { + io.Writer + Reset(w io.Writer) +} + +type nopResetWriter struct { + io.Writer +} + +func (n nopResetWriter) Reset(w io.Writer) { + //do nothing +} + +type encodeFunc func(io.Writer, int) (resetWriter, error) type acceptEncoder struct { - name string - encode func(io.Writer, int) (io.Writer, error) + name string + bestSpeedPool *sync.Pool + bestCompressionPool *sync.Pool +} + +func (ac acceptEncoder) encode(wr io.Writer, level int) (resetWriter, error) { + if ac.bestSpeedPool == nil || ac.bestCompressionPool == nil { + return nopResetWriter{wr}, nil + } + var rwr resetWriter + if level == flate.BestSpeed { + rwr = ac.bestSpeedPool.Get().(resetWriter) + } else { + rwr = ac.bestCompressionPool.Get().(resetWriter) + } + rwr.Reset(wr) + return rwr, nil +} + +func (ac acceptEncoder) put(wr resetWriter, level int) { + if ac.bestSpeedPool == nil || ac.bestCompressionPool == nil { + return + } + wr.Reset(nil) + switch level { + case flate.BestSpeed: + ac.bestSpeedPool.Put(wr) + case flate.BestCompression: + ac.bestCompressionPool.Put(wr) + } } var ( - noneCompressEncoder = acceptEncoder{"", func(wr io.Writer, level int) (io.Writer, error) { return wr, nil }} - gzipCompressEncoder = acceptEncoder{"gzip", func(wr io.Writer, level int) (io.Writer, error) { return gzip.NewWriterLevel(wr, level) }} + noneCompressEncoder = acceptEncoder{"", nil, nil} + gzipCompressEncoder = acceptEncoder{"gzip", + &sync.Pool{ + New: func() interface{} { wr, _ := gzip.NewWriterLevel(nil, flate.BestSpeed); return wr }, + }, + &sync.Pool{ + New: func() interface{} { wr, _ := gzip.NewWriterLevel(nil, flate.BestCompression); return wr }, + }, + } + //according to the sec :http://tools.ietf.org/html/rfc2616#section-3.5 ,the deflate compress in http is zlib indeed //deflate //The "zlib" format defined in RFC 1950 [31] in combination with //the "deflate" compression mechanism described in RFC 1951 [29]. - deflateCompressEncoder = acceptEncoder{"deflate", func(wr io.Writer, level int) (io.Writer, error) { return zlib.NewWriterLevel(wr, level) }} + deflateCompressEncoder = acceptEncoder{"deflate", + &sync.Pool{ + New: func() interface{} { wr, _ := zlib.NewWriterLevel(nil, flate.BestSpeed); return wr }, + }, + &sync.Pool{ + New: func() interface{} { wr, _ := zlib.NewWriterLevel(nil, flate.BestCompression); return wr }, + }, + } ) var ( @@ -63,7 +121,7 @@ func WriteBody(encoding string, writer io.Writer, content []byte) (bool, string, // writeLevel reads from reader,writes to writer by specific encoding and compress level // the compress level is defined by deflate package func writeLevel(encoding string, writer io.Writer, reader io.Reader, level int) (bool, string, error) { - var outputWriter io.Writer + var outputWriter resetWriter var err error var ce = noneCompressEncoder @@ -72,6 +130,7 @@ func writeLevel(encoding string, writer io.Writer, reader io.Reader, level int) } encoding = ce.name outputWriter, err = ce.encode(writer, level) + defer ce.put(outputWriter, level) if err != nil { return false, "", err From ee2322e83b4a28a20e71849c519802e38395ea8b Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 3 Jan 2016 15:35:32 +0800 Subject: [PATCH 347/436] add any level compress --- context/acceptencoder.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/context/acceptencoder.go b/context/acceptencoder.go index c5fe1ba0..7d4b2dbe 100644 --- a/context/acceptencoder.go +++ b/context/acceptencoder.go @@ -40,9 +40,9 @@ func (n nopResetWriter) Reset(w io.Writer) { //do nothing } -type encodeFunc func(io.Writer, int) (resetWriter, error) type acceptEncoder struct { name string + levelEncode func(int) resetWriter bestSpeedPool *sync.Pool bestCompressionPool *sync.Pool } @@ -52,10 +52,13 @@ func (ac acceptEncoder) encode(wr io.Writer, level int) (resetWriter, error) { return nopResetWriter{wr}, nil } var rwr resetWriter - if level == flate.BestSpeed { + switch level { + case flate.BestSpeed: rwr = ac.bestSpeedPool.Get().(resetWriter) - } else { + case flate.BestCompression: rwr = ac.bestCompressionPool.Get().(resetWriter) + default: + rwr = ac.levelEncode(level) } rwr.Reset(wr) return rwr, nil @@ -75,8 +78,9 @@ func (ac acceptEncoder) put(wr resetWriter, level int) { } var ( - noneCompressEncoder = acceptEncoder{"", nil, nil} + noneCompressEncoder = acceptEncoder{"", nil, nil, nil} gzipCompressEncoder = acceptEncoder{"gzip", + func(level int) resetWriter { wr, _ := gzip.NewWriterLevel(nil, level); return wr }, &sync.Pool{ New: func() interface{} { wr, _ := gzip.NewWriterLevel(nil, flate.BestSpeed); return wr }, }, @@ -90,6 +94,7 @@ var ( //The "zlib" format defined in RFC 1950 [31] in combination with //the "deflate" compression mechanism described in RFC 1951 [29]. deflateCompressEncoder = acceptEncoder{"deflate", + func(level int) resetWriter { wr, _ := zlib.NewWriterLevel(nil, level); return wr }, &sync.Pool{ New: func() interface{} { wr, _ := zlib.NewWriterLevel(nil, flate.BestSpeed); return wr }, }, From 3ebf27515762608a3117d514721501c35012ae11 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Sun, 3 Jan 2016 15:40:44 +0800 Subject: [PATCH 348/436] fixed camel style name --- router.go | 73 +++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/router.go b/router.go index 69464ac2..195b20e5 100644 --- a/router.go +++ b/router.go @@ -391,14 +391,14 @@ func (p *ControllerRegister) AddAutoPrefix(prefix string, c ControllerInterface) route.controllerType = ct pattern := path.Join(prefix, strings.ToLower(controllerName), strings.ToLower(rt.Method(i).Name), "*") patternInit := path.Join(prefix, controllerName, rt.Method(i).Name, "*") - patternfix := path.Join(prefix, strings.ToLower(controllerName), strings.ToLower(rt.Method(i).Name)) - patternfixInit := path.Join(prefix, controllerName, rt.Method(i).Name) + patternFix := path.Join(prefix, strings.ToLower(controllerName), strings.ToLower(rt.Method(i).Name)) + patternFixInit := path.Join(prefix, controllerName, rt.Method(i).Name) route.pattern = pattern for _, m := range HTTPMETHOD { p.addToRouter(m, pattern, route) p.addToRouter(m, patternInit, route) - p.addToRouter(m, patternfix, route) - p.addToRouter(m, patternfixInit, route) + p.addToRouter(m, patternFix, route) + p.addToRouter(m, patternFixInit, route) } } } @@ -504,12 +504,12 @@ func (p *ControllerRegister) geturl(t *Tree, url, controllName, methodName strin if find { if l.regexps == nil { if len(l.wildcards) == 0 { - return true, strings.Replace(url, "/"+urlPlaceholder, "", 1) + tourl(params) + return true, strings.Replace(url, "/"+urlPlaceholder, "", 1) + toUrl(params) } if len(l.wildcards) == 1 { if v, ok := params[l.wildcards[0]]; ok { delete(params, l.wildcards[0]) - return true, strings.Replace(url, urlPlaceholder, v, 1) + tourl(params) + return true, strings.Replace(url, urlPlaceholder, v, 1) + toUrl(params) } return false, "" } @@ -518,7 +518,7 @@ func (p *ControllerRegister) geturl(t *Tree, url, controllName, methodName strin if e, isok := params[":ext"]; isok { delete(params, ":path") delete(params, ":ext") - return true, strings.Replace(url, urlPlaceholder, p+"."+e, -1) + tourl(params) + return true, strings.Replace(url, urlPlaceholder, p+"."+e, -1) + toUrl(params) } } } @@ -539,7 +539,7 @@ func (p *ControllerRegister) geturl(t *Tree, url, controllName, methodName strin return false, "" } } - return true, url + tourl(params) + return true, url + toUrl(params) } var i int var startreg bool @@ -566,7 +566,7 @@ func (p *ControllerRegister) geturl(t *Tree, url, controllName, methodName strin for _, p := range ps { url = strings.Replace(url, urlPlaceholder, p, 1) } - return true, url + tourl(params) + return true, url + toUrl(params) } } } @@ -597,10 +597,10 @@ func (p *ControllerRegister) execFilter(context *beecontext.Context, pos int, ur // Implement http.Handler interface. func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) { - starttime := time.Now() + startTime := time.Now() var ( - runrouter reflect.Type - findrouter bool + runRouter reflect.Type + findRouter bool runMethod string routerInfo *controllerInfo ) @@ -620,7 +620,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) urlPath = r.URL.Path } - // filter wrong httpmethod + // filter wrong http method if _, ok := HTTPMETHOD[r.Method]; !ok { http.Error(rw, "Method Not Allowed", 405) goto Admin @@ -633,7 +633,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) serverStaticRouter(context) if context.ResponseWriter.Started { - findrouter = true + findRouter = true goto Admin } @@ -662,7 +662,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) goto Admin } - if !findrouter { + if !findRouter { httpMethod := r.Method if httpMethod == "POST" && context.Input.Query("_method") == "PUT" { httpMethod = "PUT" @@ -674,10 +674,9 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) runObject := t.Match(urlPath, context) if r, ok := runObject.(*controllerInfo); ok { routerInfo = r - findrouter = true + findRouter = true if splat := context.Input.Param(":splat"); splat != "" { - splatlist := strings.Split(splat, "/") - for k, v := range splatlist { + for k, v := range strings.Split(splat, "/") { context.Input.SetParam(strconv.Itoa(k), v) } } @@ -687,12 +686,12 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) } //if no matches to url, throw a not found exception - if !findrouter { + if !findRouter { exception("404", context) goto Admin } - if findrouter { + if findRouter { //execute middleware filters if p.execFilter(context, BeforeExec, urlPath) { goto Admin @@ -711,7 +710,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) isRunnable = true routerInfo.handler.ServeHTTP(rw, r) } else { - runrouter = routerInfo.controllerType + runRouter = routerInfo.controllerType method := r.Method if r.Method == "POST" && context.Input.Query("_method") == "PUT" { method = "PUT" @@ -729,17 +728,17 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) } } - // also defined runrouter & runMethod from filter + // also defined runRouter & runMethod from filter if !isRunnable { //Invoke the request handler - vc := reflect.New(runrouter) + vc := reflect.New(runRouter) execController, ok := vc.Interface().(ControllerInterface) if !ok { panic("controller is not ControllerInterface") } //call the controller init function - execController.Init(context, runrouter.Name(), runMethod, vc.Interface()) + execController.Init(context, runRouter.Name(), runMethod, vc.Interface()) //call prepare function execController.Prepare() @@ -790,7 +789,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) } } - // finish all runrouter. release resource + // finish all runRouter. release resource execController.Finish() } @@ -803,31 +802,31 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) p.execFilter(context, FinishRouter, urlPath) Admin: - timeend := time.Since(starttime) + timeDur := time.Since(startTime) //admin module record QPS if BConfig.Listen.AdminEnable { - if FilterMonitorFunc(r.Method, r.URL.Path, timeend) { - if runrouter != nil { - go toolbox.StatisticsMap.AddStatistics(r.Method, r.URL.Path, runrouter.Name(), timeend) + if FilterMonitorFunc(r.Method, r.URL.Path, timeDur) { + if runRouter != nil { + go toolbox.StatisticsMap.AddStatistics(r.Method, r.URL.Path, runRouter.Name(), timeDur) } else { - go toolbox.StatisticsMap.AddStatistics(r.Method, r.URL.Path, "", timeend) + go toolbox.StatisticsMap.AddStatistics(r.Method, r.URL.Path, "", timeDur) } } } if BConfig.RunMode == DEV || BConfig.Log.AccessLogs { - var devinfo string - if findrouter { + var devInfo string + if findRouter { if routerInfo != nil { - devinfo = fmt.Sprintf("| % -10s | % -40s | % -16s | % -10s | % -40s |", r.Method, r.URL.Path, timeend.String(), "match", routerInfo.pattern) + devInfo = fmt.Sprintf("| % -10s | % -40s | % -16s | % -10s | % -40s |", r.Method, r.URL.Path, timeDur.String(), "match", routerInfo.pattern) } else { - devinfo = fmt.Sprintf("| % -10s | % -40s | % -16s | % -10s |", r.Method, r.URL.Path, timeend.String(), "match") + devInfo = fmt.Sprintf("| % -10s | % -40s | % -16s | % -10s |", r.Method, r.URL.Path, timeDur.String(), "match") } } else { - devinfo = fmt.Sprintf("| % -10s | % -40s | % -16s | % -10s |", r.Method, r.URL.Path, timeend.String(), "notmatch") + devInfo = fmt.Sprintf("| % -10s | % -40s | % -16s | % -10s |", r.Method, r.URL.Path, timeDur.String(), "notmatch") } if DefaultAccessLogFilter == nil || !DefaultAccessLogFilter.Filter(context) { - Debug(devinfo) + Debug(devInfo) } } @@ -869,7 +868,7 @@ func (p *ControllerRegister) recoverPanic(context *beecontext.Context) { } } -func tourl(params map[string]string) string { +func toUrl(params map[string]string) string { if len(params) == 0 { return "" } From 6585e66f97af69548cb2e4dbe594b99c1406372f Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 3 Jan 2016 20:36:16 +0800 Subject: [PATCH 349/436] all the browser should support delete and put now --- router.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/router.go b/router.go index 69464ac2..dc37d1e8 100644 --- a/router.go +++ b/router.go @@ -664,12 +664,6 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) if !findrouter { httpMethod := r.Method - if httpMethod == "POST" && context.Input.Query("_method") == "PUT" { - httpMethod = "PUT" - } - if httpMethod == "POST" && context.Input.Query("_method") == "DELETE" { - httpMethod = "DELETE" - } if t, ok := p.routers[httpMethod]; ok { runObject := t.Match(urlPath, context) if r, ok := runObject.(*controllerInfo); ok { From 92d157736b041307ccfddc69ec2c6cf54178063a Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 3 Jan 2016 21:06:35 +0800 Subject: [PATCH 350/436] add testing to test #1511 --- tree_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tree_test.go b/tree_test.go index f0923c88..15ab7ce4 100644 --- a/tree_test.go +++ b/tree_test.go @@ -68,6 +68,8 @@ func init() { routers = append(routers, testinfo{"/v1/:v/cms/aaa_:id(.+)_:page(.+).html", "/v1/2/cms/aaa_123_1.html", map[string]string{":v": "2", ":id": "123", ":page": "1"}}) routers = append(routers, testinfo{"/v1/:v/cms_:id(.+)_:page(.+).html", "/v1/2/cms_123_1.html", map[string]string{":v": "2", ":id": "123", ":page": "1"}}) routers = append(routers, testinfo{"/v1/:v(.+)_cms/ttt_:id(.+)_:page(.+).html", "/v1/2_cms/ttt_123_1.html", map[string]string{":v": "2", ":id": "123", ":page": "1"}}) + routers = append(routers, testinfo{"/api/projects/:pid/members/?:mid", "/api/projects/1/members", map[string]string{":pid": "1"}}) + routers = append(routers, testinfo{"/api/projects/:pid/members/?:mid", "/api/projects/1/members/2", map[string]string{":pid": "1", ":mid": "2"}}) } func TestTreeRouters(t *testing.T) { From d23291ccc783f9613f9d0bc848ca6b382c65b649 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Mon, 4 Jan 2016 08:50:59 +0800 Subject: [PATCH 351/436] remove a dump err --- context/acceptencoder.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/context/acceptencoder.go b/context/acceptencoder.go index 7d4b2dbe..07c5cb0b 100644 --- a/context/acceptencoder.go +++ b/context/acceptencoder.go @@ -47,9 +47,9 @@ type acceptEncoder struct { bestCompressionPool *sync.Pool } -func (ac acceptEncoder) encode(wr io.Writer, level int) (resetWriter, error) { +func (ac acceptEncoder) encode(wr io.Writer, level int) resetWriter { if ac.bestSpeedPool == nil || ac.bestCompressionPool == nil { - return nopResetWriter{wr}, nil + return nopResetWriter{wr} } var rwr resetWriter switch level { @@ -61,7 +61,7 @@ func (ac acceptEncoder) encode(wr io.Writer, level int) (resetWriter, error) { rwr = ac.levelEncode(level) } rwr.Reset(wr) - return rwr, nil + return rwr } func (ac acceptEncoder) put(wr resetWriter, level int) { @@ -134,13 +134,9 @@ func writeLevel(encoding string, writer io.Writer, reader io.Reader, level int) ce = cf } encoding = ce.name - outputWriter, err = ce.encode(writer, level) + outputWriter = ce.encode(writer, level) defer ce.put(outputWriter, level) - if err != nil { - return false, "", err - } - _, err = io.Copy(outputWriter, reader) if err != nil { return false, "", err From fd2ded190b351793327d9ab07d4e5bf5692ab16b Mon Sep 17 00:00:00 2001 From: JessonChan Date: Mon, 4 Jan 2016 09:27:58 +0800 Subject: [PATCH 352/436] EnableGzip bug fixed --- router.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/router.go b/router.go index 195b20e5..92ce2846 100644 --- a/router.go +++ b/router.go @@ -609,6 +609,8 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) defer p.pool.Put(context) defer p.recoverPanic(context) + context.Output.EnableGzip=BConfig.EnableGzip + if BConfig.RunMode == DEV { context.Output.Header("Server", BConfig.ServerName) } From a03fa0fb736ece41b6be2c30b1c3f92d88e07414 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 4 Jan 2016 10:50:04 +0800 Subject: [PATCH 353/436] improve cache modules. support mulit instances --- cache/cache.go | 11 +++++++---- cache/file.go | 10 +++++----- cache/memcache/memcache.go | 4 ++-- cache/memory.go | 4 ++-- cache/redis/redis.go | 4 ++-- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/cache/cache.go b/cache/cache.go index 6413e210..c9904444 100644 --- a/cache/cache.go +++ b/cache/cache.go @@ -37,7 +37,7 @@ import ( // Cache interface contains all behaviors for cache adapter. // usage: -// cache.Register("file",cache.NewFileCache()) // this operation is run in init method of file.go. +// cache.Register("file",cache.NewFileCache) // this operation is run in init method of file.go. // c,err := cache.NewCache("file","{....}") // c.Put("key",value,3600) // v := c.Get("key") @@ -66,12 +66,14 @@ type Cache interface { StartAndGC(config string) error } -var adapters = make(map[string]Cache) +type CacheInstance func() Cache + +var adapters = make(map[string]CacheInstance) // Register makes a cache adapter available by the adapter name. // If Register is called twice with the same name or if driver is nil, // it panics. -func Register(name string, adapter Cache) { +func Register(name string, adapter CacheInstance) { if adapter == nil { panic("cache: Register adapter is nil") } @@ -85,11 +87,12 @@ func Register(name string, adapter Cache) { // config need to be correct JSON as string: {"interval":360}. // it will start gc automatically. func NewCache(adapterName, config string) (adapter Cache, err error) { - adapter, ok := adapters[adapterName] + instanceFunc, ok := adapters[adapterName] if !ok { err = fmt.Errorf("cache: unknown adapter name %q (forgot to import?)", adapterName) return } + adapter = instanceFunc() err = adapter.StartAndGC(config) if err != nil { adapter = nil diff --git a/cache/file.go b/cache/file.go index 9233a852..2d77b567 100644 --- a/cache/file.go +++ b/cache/file.go @@ -29,10 +29,6 @@ import ( "time" ) -func init() { - Register("file", NewFileCache()) -} - // FileCacheItem is basic unit of file cache adapter. // it contains data and expire time. type FileCacheItem struct { @@ -59,7 +55,7 @@ type FileCache struct { // NewFileCache Create new file cache with no config. // the level and expiry need set in method StartAndGC as config string. -func NewFileCache() *FileCache { +func NewFileCache() Cache { // return &FileCache{CachePath:FileCachePath, FileSuffix:FileCacheFileSuffix} return &FileCache{} } @@ -272,3 +268,7 @@ func GobDecode(data []byte, to *FileCacheItem) error { dec := gob.NewDecoder(buf) return dec.Decode(&to) } + +func init() { + Register("file", NewFileCache) +} diff --git a/cache/memcache/memcache.go b/cache/memcache/memcache.go index 643fb130..272124da 100644 --- a/cache/memcache/memcache.go +++ b/cache/memcache/memcache.go @@ -46,7 +46,7 @@ type Cache struct { } // NewMemCache create new memcache adapter. -func NewMemCache() *Cache { +func NewMemCache() cache.Cache { return &Cache{} } @@ -184,5 +184,5 @@ func (rc *Cache) connectInit() error { } func init() { - cache.Register("memcache", NewMemCache()) + cache.Register("memcache", NewMemCache) } diff --git a/cache/memory.go b/cache/memory.go index ce1afa5f..5cc0ab52 100644 --- a/cache/memory.go +++ b/cache/memory.go @@ -44,7 +44,7 @@ type MemoryCache struct { } // NewMemoryCache returns a new MemoryCache. -func NewMemoryCache() *MemoryCache { +func NewMemoryCache() Cache { cache := MemoryCache{items: make(map[string]*MemoryItem)} return &cache } @@ -234,5 +234,5 @@ func (bc *MemoryCache) itemExpired(name string) bool { } func init() { - Register("memory", NewMemoryCache()) + Register("memory", NewMemoryCache) } diff --git a/cache/redis/redis.go b/cache/redis/redis.go index ed12cf26..60c1702a 100644 --- a/cache/redis/redis.go +++ b/cache/redis/redis.go @@ -55,7 +55,7 @@ type Cache struct { } // NewRedisCache create new redis cache with default collection name. -func NewRedisCache() *Cache { +func NewRedisCache() cache.Cache { return &Cache{key: DefaultKey} } @@ -236,5 +236,5 @@ func (rc *Cache) connectInit() { } func init() { - cache.Register("redis", NewRedisCache()) + cache.Register("redis", NewRedisCache) } From 7fbaf8289738a075b394fd6c22410a935eb54125 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 4 Jan 2016 22:10:18 +0800 Subject: [PATCH 354/436] fix #1424 --- orm/cmd_utils.go | 1 + 1 file changed, 1 insertion(+) diff --git a/orm/cmd_utils.go b/orm/cmd_utils.go index bddada7c..c2c4cfe4 100644 --- a/orm/cmd_utils.go +++ b/orm/cmd_utils.go @@ -271,6 +271,7 @@ func getColumnDefault(fi *fieldInfo) string { TypeBigIntegerField, TypePositiveBitField, TypePositiveSmallIntegerField, TypePositiveIntegerField, TypePositiveBigIntegerField, TypeFloatField, TypeDecimalField: + t = " DEFAULT %s " d = "0" } From f0be45dfffaee7dddd9a56af6f40878ff4a30e22 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 4 Jan 2016 22:18:59 +0800 Subject: [PATCH 355/436] fix the comments and json tag --- logs/smtp.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logs/smtp.go b/logs/smtp.go index aabb4581..3533c134 100644 --- a/logs/smtp.go +++ b/logs/smtp.go @@ -43,7 +43,7 @@ func newSMTPWriter() Logger { // Init smtp writer with json config. // config like: // { -// "Username":"example@gmail.com", +// "sername":"example@gmail.com", // "password:"password", // "host":"smtp.gmail.com:465", // "subject":"email title", From 3bb22d149e072ce925ca54c15352b381210af24b Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 4 Jan 2016 22:22:42 +0800 Subject: [PATCH 356/436] add the comments --- logs/smtp.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logs/smtp.go b/logs/smtp.go index 3533c134..748462f9 100644 --- a/logs/smtp.go +++ b/logs/smtp.go @@ -43,7 +43,7 @@ func newSMTPWriter() Logger { // Init smtp writer with json config. // config like: // { -// "sername":"example@gmail.com", +// "username":"example@gmail.com", // "password:"password", // "host":"smtp.gmail.com:465", // "subject":"email title", From 5c18d02b176e1b73aafb18a1e725117ed30f7ba7 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 4 Jan 2016 22:41:25 +0800 Subject: [PATCH 357/436] fix #1268 --- httplib/httplib.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/httplib/httplib.go b/httplib/httplib.go index dd59c18a..fb64a30a 100644 --- a/httplib/httplib.go +++ b/httplib/httplib.go @@ -82,7 +82,7 @@ func NewBeegoRequest(rawurl, method string) *BeegoHTTPRequest { var resp http.Response u, err := url.Parse(rawurl) if err != nil { - log.Fatal(err) + log.Println("Httplib:", err) } req := http.Request{ URL: u, @@ -334,17 +334,17 @@ func (b *BeegoHTTPRequest) buildURL(paramBody string) { for formname, filename := range b.files { fileWriter, err := bodyWriter.CreateFormFile(formname, filename) if err != nil { - log.Fatal(err) + log.Println("Httplib:", err) } fh, err := os.Open(filename) if err != nil { - log.Fatal(err) + log.Println("Httplib:", err) } //iocopy _, err = io.Copy(fileWriter, fh) fh.Close() if err != nil { - log.Fatal(err) + log.Println("Httplib:", err) } } for k, v := range b.params { From f7ef4aa7e5d37123d0718c5a1a557223793ddaed Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 4 Jan 2016 23:34:35 +0800 Subject: [PATCH 358/436] recover for conn.Close fix #1333 --- grace/conn.go | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/grace/conn.go b/grace/conn.go index c7b35b80..6807e1ac 100644 --- a/grace/conn.go +++ b/grace/conn.go @@ -1,13 +1,28 @@ package grace -import "net" +import ( + "errors" + "net" +) type graceConn struct { net.Conn server *Server } -func (c graceConn) Close() error { +func (c graceConn) Close() (err error) { + defer func() { + if r := recover(); r != nil { + switch x := r.(type) { + case string: + err = errors.New(x) + case error: + err = x + default: + err = errors.New("Unknown panic") + } + } + }() c.server.wg.Done() return c.Conn.Close() } From bef6bca3973f4e12cefa31d44ec104021f05850c Mon Sep 17 00:00:00 2001 From: miraclesu Date: Tue, 5 Jan 2016 21:14:35 +0800 Subject: [PATCH 359/436] Add function to set validation default messages --- validation/README.md | 2 +- validation/validation.go | 2 +- validation/validators.go | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/validation/README.md b/validation/README.md index e0c30df7..b4fc3fe5 100644 --- a/validation/README.md +++ b/validation/README.md @@ -41,7 +41,7 @@ Direct Use: } } // or use like this - if v := valid.Max(u.Age, 140); !v.Ok { + if v := valid.Max(u.Age, 140, "ageMax"); !v.Ok { log.Println(v.Error.Key, v.Error.Message) } } diff --git a/validation/validation.go b/validation/validation.go index 76683d91..2b020aa8 100644 --- a/validation/validation.go +++ b/validation/validation.go @@ -38,7 +38,7 @@ // } // } // // or use like this -// if v := valid.Max(u.Age, 140); !v.Ok { +// if v := valid.Max(u.Age, 140, "ageMax"); !v.Ok { // log.Println(v.Error.Key, v.Error.Message) // } // } diff --git a/validation/validators.go b/validation/validators.go index 2662b701..7e1822cf 100644 --- a/validation/validators.go +++ b/validation/validators.go @@ -46,6 +46,38 @@ var MessageTmpls = map[string]string{ "ZipCode": "Must be valid zipcode", } +// set default messages +// if not set, the default messages are +// "Required": "Can not be empty", +// "Min": "Minimum is %d", +// "Max": "Maximum is %d", +// "Range": "Range is %d to %d", +// "MinSize": "Minimum size is %d", +// "MaxSize": "Maximum size is %d", +// "Length": "Required length is %d", +// "Alpha": "Must be valid alpha characters", +// "Numeric": "Must be valid numeric characters", +// "AlphaNumeric": "Must be valid alpha or numeric characters", +// "Match": "Must match %s", +// "NoMatch": "Must not match %s", +// "AlphaDash": "Must be valid alpha or numeric or dash(-_) characters", +// "Email": "Must be a valid email address", +// "IP": "Must be a valid ip address", +// "Base64": "Must be valid base64 characters", +// "Mobile": "Must be valid mobile number", +// "Tel": "Must be valid telephone number", +// "Phone": "Must be valid telephone or mobile phone number", +// "ZipCode": "Must be valid zipcode", +func SetDefaultMessage(msg map[string]string) { + if len(msg) == 0 { + return + } + + for name := range msg { + MessageTmpls[name] = msg[name] + } +} + // Validator interface type Validator interface { IsSatisfied(interface{}) bool From 8929814126b4f1e421742e2daa347dda739898cb Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 6 Jan 2016 11:48:23 +0800 Subject: [PATCH 360/436] fix the log carsh before init --- beego.go | 12 +++++------- log.go | 6 +++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/beego.go b/beego.go index fd4600b7..3f0ae98f 100644 --- a/beego.go +++ b/beego.go @@ -20,16 +20,15 @@ import ( "path/filepath" "strconv" "strings" - - "github.com/astaxie/beego/logs" ) const ( - // beego web framework version. - VERSION = "1.5.0" + // VERSION represent beego web framework version. + VERSION = "1.6.0" - // beego run modes - DEV = "dev" + // DEV is for develop + DEV = "dev" + // PROD is for production PROD = "prod" ) @@ -75,7 +74,6 @@ func initBeforeHTTPRun() { panic(err) } //init log - BeeLogger = logs.NewLogger(10000) for adaptor, config := range BConfig.Log.Output { err = BeeLogger.SetLogger(adaptor, config) if err != nil { diff --git a/log.go b/log.go index 68252236..46ec57dd 100644 --- a/log.go +++ b/log.go @@ -32,6 +32,9 @@ const ( LevelDebug ) +// BeeLogger references the used application logger. +var BeeLogger = logs.NewLogger(100) + // SetLevel sets the global log level used by the simple logger. func SetLevel(l int) { BeeLogger.SetLevel(l) @@ -43,9 +46,6 @@ func SetLogFuncCall(b bool) { BeeLogger.SetLogFuncCallDepth(3) } -// BeeLogger references the used application logger. -var BeeLogger *logs.BeeLogger - // SetLogger sets a new logger. func SetLogger(adaptername string, config string) error { err := BeeLogger.SetLogger(adaptername, config) From a411042416cef1c59a136efbee6ea99e6e7949eb Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 6 Jan 2016 14:55:18 +0800 Subject: [PATCH 361/436] fix the init parse for config --- config.go | 1 + 1 file changed, 1 insertion(+) diff --git a/config.go b/config.go index 3a95d6fd..a941c99f 100644 --- a/config.go +++ b/config.go @@ -168,6 +168,7 @@ func init() { Output: map[string]string{"console": ""}, }, } + ParseConfig() } // ParseConfig parsed default config file. From 0b390912921919df1b75894a9ff06b6b2665cc75 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Wed, 6 Jan 2016 15:05:29 +0800 Subject: [PATCH 362/436] mem cache put function fixed when a expire duration==0,it means forever https://github.com/astaxie/beego/issues/1260 --- cache/memory.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cache/memory.go b/cache/memory.go index 5cc0ab52..2aea913f 100644 --- a/cache/memory.go +++ b/cache/memory.go @@ -79,6 +79,10 @@ func (bc *MemoryCache) GetMulti(names []string) []interface{} { func (bc *MemoryCache) Put(name string, value interface{}, expired int64) error { bc.lock.Lock() defer bc.lock.Unlock() + if expired == 0 { + //ten years,behave as the file cache + expired = 86400 * 365 * 10 + } bc.items[name] = &MemoryItem{ val: value, Lastaccess: time.Now(), From 8832334d6af275ff936494e7bdfc04d32390e07b Mon Sep 17 00:00:00 2001 From: JessonChan Date: Wed, 6 Jan 2016 15:12:25 +0800 Subject: [PATCH 363/436] tiny fix for error description and comment --- cache/memory.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cache/memory.go b/cache/memory.go index 2aea913f..1fe82fd6 100644 --- a/cache/memory.go +++ b/cache/memory.go @@ -106,7 +106,7 @@ func (bc *MemoryCache) Delete(name string) error { } // Incr increase cache counter in memory. -// it supports int,int64,int32,uint,uint64,uint32. +// it supports int,int32,int64,uint,uint32,uint64. func (bc *MemoryCache) Incr(key string) error { bc.lock.RLock() defer bc.lock.RUnlock() @@ -117,10 +117,10 @@ func (bc *MemoryCache) Incr(key string) error { switch itm.val.(type) { case int: itm.val = itm.val.(int) + 1 - case int64: - itm.val = itm.val.(int64) + 1 case int32: itm.val = itm.val.(int32) + 1 + case int64: + itm.val = itm.val.(int64) + 1 case uint: itm.val = itm.val.(uint) + 1 case uint32: @@ -128,7 +128,7 @@ func (bc *MemoryCache) Incr(key string) error { case uint64: itm.val = itm.val.(uint64) + 1 default: - return errors.New("item val is not int int64 int32") + return errors.New("item val is not (u)int (u)int32 (u)int64") } return nil } From eff200e014eb0072c9acad8ec06f13b6aa7bd4a9 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Thu, 7 Jan 2016 09:08:00 +0800 Subject: [PATCH 364/436] modify as xuxiaohei suggest https://github.com/astaxie/beego/issues/1259 --- cache/memory.go | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/cache/memory.go b/cache/memory.go index 1fe82fd6..67a38892 100644 --- a/cache/memory.go +++ b/cache/memory.go @@ -37,7 +37,7 @@ type MemoryItem struct { // MemoryCache is Memory cache adapter. // it contains a RW locker for safe map storage. type MemoryCache struct { - lock sync.RWMutex + sync.RWMutex dur time.Duration items map[string]*MemoryItem Every int // run an expiration check Every clock time @@ -52,8 +52,8 @@ func NewMemoryCache() Cache { // Get cache from memory. // if non-existed or expired, return nil. func (bc *MemoryCache) Get(name string) interface{} { - bc.lock.RLock() - defer bc.lock.RUnlock() + bc.RLock() + defer bc.RUnlock() if itm, ok := bc.items[name]; ok { if (time.Now().Unix() - itm.Lastaccess.Unix()) > itm.expired { go bc.Delete(name) @@ -77,12 +77,8 @@ func (bc *MemoryCache) GetMulti(names []string) []interface{} { // Put cache to memory. // if expired is 0, it will be cleaned by next gc operation ( default gc clock is 1 minute). func (bc *MemoryCache) Put(name string, value interface{}, expired int64) error { - bc.lock.Lock() - defer bc.lock.Unlock() - if expired == 0 { - //ten years,behave as the file cache - expired = 86400 * 365 * 10 - } + bc.Lock() + defer bc.Unlock() bc.items[name] = &MemoryItem{ val: value, Lastaccess: time.Now(), @@ -93,8 +89,8 @@ func (bc *MemoryCache) Put(name string, value interface{}, expired int64) error // Delete cache in memory. func (bc *MemoryCache) Delete(name string) error { - bc.lock.Lock() - defer bc.lock.Unlock() + bc.Lock() + defer bc.Unlock() if _, ok := bc.items[name]; !ok { return errors.New("key not exist") } @@ -108,8 +104,8 @@ func (bc *MemoryCache) Delete(name string) error { // Incr increase cache counter in memory. // it supports int,int32,int64,uint,uint32,uint64. func (bc *MemoryCache) Incr(key string) error { - bc.lock.RLock() - defer bc.lock.RUnlock() + bc.RLock() + defer bc.RUnlock() itm, ok := bc.items[key] if !ok { return errors.New("key not exist") @@ -135,8 +131,8 @@ func (bc *MemoryCache) Incr(key string) error { // Decr decrease counter in memory. func (bc *MemoryCache) Decr(key string) error { - bc.lock.RLock() - defer bc.lock.RUnlock() + bc.RLock() + defer bc.RUnlock() itm, ok := bc.items[key] if !ok { return errors.New("key not exist") @@ -174,16 +170,16 @@ func (bc *MemoryCache) Decr(key string) error { // IsExist check cache exist in memory. func (bc *MemoryCache) IsExist(name string) bool { - bc.lock.RLock() - defer bc.lock.RUnlock() + bc.RLock() + defer bc.RUnlock() _, ok := bc.items[name] return ok } // ClearAll will delete all cache in memory. func (bc *MemoryCache) ClearAll() error { - bc.lock.Lock() - defer bc.lock.Unlock() + bc.Lock() + defer bc.Unlock() bc.items = make(map[string]*MemoryItem) return nil } @@ -224,12 +220,16 @@ func (bc *MemoryCache) vaccuum() { // itemExpired returns true if an item is expired. func (bc *MemoryCache) itemExpired(name string) bool { - bc.lock.Lock() - defer bc.lock.Unlock() + bc.Lock() + defer bc.Unlock() itm, ok := bc.items[name] if !ok { return true } + // expired==0 means never + if itm.expired==0{ + return false + } if time.Now().Unix()-itm.Lastaccess.Unix() >= itm.expired { delete(bc.items, name) return true From b0b9812de6c4af7de825ae2770a007a67452c765 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Thu, 7 Jan 2016 09:13:47 +0800 Subject: [PATCH 365/436] extract a expire fun --- cache/memory.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/cache/memory.go b/cache/memory.go index 67a38892..2ad1da06 100644 --- a/cache/memory.go +++ b/cache/memory.go @@ -34,6 +34,14 @@ type MemoryItem struct { expired int64 } +func (mi *MemoryItem) isExpire() bool { + // expired==0 means never + if mi.expired == 0 { + return false + } + return time.Now().Unix()-mi.Lastaccess.Unix() > mi.expired +} + // MemoryCache is Memory cache adapter. // it contains a RW locker for safe map storage. type MemoryCache struct { @@ -55,7 +63,7 @@ func (bc *MemoryCache) Get(name string) interface{} { bc.RLock() defer bc.RUnlock() if itm, ok := bc.items[name]; ok { - if (time.Now().Unix() - itm.Lastaccess.Unix()) > itm.expired { + if itm.isExpire() { go bc.Delete(name) return nil } @@ -222,15 +230,12 @@ func (bc *MemoryCache) vaccuum() { func (bc *MemoryCache) itemExpired(name string) bool { bc.Lock() defer bc.Unlock() + itm, ok := bc.items[name] if !ok { return true } - // expired==0 means never - if itm.expired==0{ - return false - } - if time.Now().Unix()-itm.Lastaccess.Unix() >= itm.expired { + if itm.isExpire() { delete(bc.items, name) return true } From 98e0626f0cee373a7924edd698c84d4cb2d8e5f3 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Thu, 7 Jan 2016 09:25:06 +0800 Subject: [PATCH 366/436] rename vals --- cache/memory.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cache/memory.go b/cache/memory.go index 2ad1da06..4980b9aa 100644 --- a/cache/memory.go +++ b/cache/memory.go @@ -30,16 +30,16 @@ var ( // MemoryItem store enery cache item. type MemoryItem struct { val interface{} - Lastaccess time.Time - expired int64 + cratedTime time.Time + lifespan int64 } func (mi *MemoryItem) isExpire() bool { - // expired==0 means never - if mi.expired == 0 { + // 0 means forever + if mi.lifespan == 0 { return false } - return time.Now().Unix()-mi.Lastaccess.Unix() > mi.expired + return time.Now().Unix()-mi.cratedTime.Unix() > mi.lifespan } // MemoryCache is Memory cache adapter. @@ -89,8 +89,8 @@ func (bc *MemoryCache) Put(name string, value interface{}, expired int64) error defer bc.Unlock() bc.items[name] = &MemoryItem{ val: value, - Lastaccess: time.Now(), - expired: expired, + cratedTime: time.Now(), + lifespan: expired, } return nil } From 6465dbd703deb2924216fa68cdca3d90eed6ea34 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Thu, 7 Jan 2016 09:28:40 +0800 Subject: [PATCH 367/436] no more goroutine ,i will be GCed at a gc goroutine --- cache/memory.go | 1 - 1 file changed, 1 deletion(-) diff --git a/cache/memory.go b/cache/memory.go index 4980b9aa..44aaf89a 100644 --- a/cache/memory.go +++ b/cache/memory.go @@ -64,7 +64,6 @@ func (bc *MemoryCache) Get(name string) interface{} { defer bc.RUnlock() if itm, ok := bc.items[name]; ok { if itm.isExpire() { - go bc.Delete(name) return nil } return itm.val From 8aed4c13d7c0e6e49598689c2cf1ab7583c67922 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Thu, 7 Jan 2016 09:36:23 +0800 Subject: [PATCH 368/436] isExist func will check if the value is expired --- cache/memory.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cache/memory.go b/cache/memory.go index 44aaf89a..b31eb84d 100644 --- a/cache/memory.go +++ b/cache/memory.go @@ -82,14 +82,14 @@ func (bc *MemoryCache) GetMulti(names []string) []interface{} { } // Put cache to memory. -// if expired is 0, it will be cleaned by next gc operation ( default gc clock is 1 minute). -func (bc *MemoryCache) Put(name string, value interface{}, expired int64) error { +// if lifespan is 0, it will be forever till restart. +func (bc *MemoryCache) Put(name string, value interface{}, lifespan int64) error { bc.Lock() defer bc.Unlock() bc.items[name] = &MemoryItem{ val: value, cratedTime: time.Now(), - lifespan: expired, + lifespan: lifespan, } return nil } @@ -179,8 +179,10 @@ func (bc *MemoryCache) Decr(key string) error { func (bc *MemoryCache) IsExist(name string) bool { bc.RLock() defer bc.RUnlock() - _, ok := bc.items[name] - return ok + if v, ok := bc.items[name]; ok { + return !v.isExpire() + } + return false } // ClearAll will delete all cache in memory. From 3821b2cb269085f7ac4489c8594b0636fd12d4db Mon Sep 17 00:00:00 2001 From: JessonChan Date: Thu, 7 Jan 2016 09:37:50 +0800 Subject: [PATCH 369/436] createdTime typo fixed --- cache/memory.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cache/memory.go b/cache/memory.go index b31eb84d..f8cccb14 100644 --- a/cache/memory.go +++ b/cache/memory.go @@ -27,11 +27,11 @@ var ( DefaultEvery = 60 // 1 minute ) -// MemoryItem store enery cache item. +// MemoryItem store memory cache item. type MemoryItem struct { - val interface{} - cratedTime time.Time - lifespan int64 + val interface{} + createdTime time.Time + lifespan int64 } func (mi *MemoryItem) isExpire() bool { @@ -39,7 +39,7 @@ func (mi *MemoryItem) isExpire() bool { if mi.lifespan == 0 { return false } - return time.Now().Unix()-mi.cratedTime.Unix() > mi.lifespan + return time.Now().Unix()-mi.createdTime.Unix() > mi.lifespan } // MemoryCache is Memory cache adapter. @@ -88,7 +88,7 @@ func (bc *MemoryCache) Put(name string, value interface{}, lifespan int64) error defer bc.Unlock() bc.items[name] = &MemoryItem{ val: value, - cratedTime: time.Now(), + createdTime: time.Now(), lifespan: lifespan, } return nil From 80912b621064b142b3b3f58cae14835bc81716d4 Mon Sep 17 00:00:00 2001 From: ysqi Date: Thu, 7 Jan 2016 13:15:40 +0800 Subject: [PATCH 370/436] change get sessionID logic from cookie --- session/sess_cookie_test.go | 41 +++++++++++++++++++++++++++++++++++++ session/session.go | 25 +++++++++++++--------- 2 files changed, 56 insertions(+), 10 deletions(-) diff --git a/session/sess_cookie_test.go b/session/sess_cookie_test.go index fe3ac806..b5982260 100644 --- a/session/sess_cookie_test.go +++ b/session/sess_cookie_test.go @@ -53,3 +53,44 @@ func TestCookie(t *testing.T) { } } } + +func TestDestorySessionCookie(t *testing.T) { + config := `{"cookieName":"gosessionid","enableSetCookie":true,"gclifetime":3600,"ProviderConfig":"{\"cookieName\":\"gosessionid\",\"securityKey\":\"beegocookiehashkey\"}"}` + globalSessions, err := NewManager("cookie", config) + if err != nil { + t.Fatal("init cookie session err", err) + } + + r, _ := http.NewRequest("GET", "/", nil) + w := httptest.NewRecorder() + session, err := globalSessions.SessionStart(w, r) + if err != nil { + t.Fatal("session start err,", err) + } + + // request again ,will get same sesssion id . + r1, _ := http.NewRequest("GET", "/", nil) + r1.Header.Set("Cookie", w.Header().Get("Set-Cookie")) + w = httptest.NewRecorder() + newSession, err := globalSessions.SessionStart(w, r1) + if err != nil { + t.Fatal("session start err,", err) + } + if newSession.SessionID() != session.SessionID() { + t.Fatal("get cookie session id is not the same again.") + } + + // After destory session , will get a new session id . + globalSessions.SessionDestroy(w, r1) + r2, _ := http.NewRequest("GET", "/", nil) + r2.Header.Set("Cookie", w.Header().Get("Set-Cookie")) + + w = httptest.NewRecorder() + newSession, err = globalSessions.SessionStart(w, r2) + if err != nil { + t.Fatal("session start error") + } + if newSession.SessionID() == session.SessionID() { + t.Fatal("after destory session and reqeust again ,get cookie session id is same.") + } +} diff --git a/session/session.go b/session/session.go index da079180..1a58ab13 100644 --- a/session/session.go +++ b/session/session.go @@ -142,7 +142,7 @@ func NewManager(provideName, config string) (*Manager, error) { // otherwise return an valid session id. func (manager *Manager) getSid(r *http.Request) (string, error) { cookie, errs := r.Cookie(manager.config.CookieName) - if errs != nil || cookie.Value == "" { + if errs != nil || cookie.Value == "" || cookie.MaxAge < 0 { errs := r.ParseForm() if errs != nil { return "", errs @@ -202,13 +202,16 @@ func (manager *Manager) SessionDestroy(w http.ResponseWriter, r *http.Request) { return } manager.provider.SessionDestroy(cookie.Value) - expiration := time.Now() - cookie = &http.Cookie{Name: manager.config.CookieName, - Path: "/", - HttpOnly: true, - Expires: expiration, - MaxAge: -1} - http.SetCookie(w, cookie) + if manager.config.EnableSetCookie { + expiration := time.Now() + cookie = &http.Cookie{Name: manager.config.CookieName, + Path: "/", + HttpOnly: true, + Expires: expiration, + MaxAge: -1} + + http.SetCookie(w, cookie) + } } // GetSessionStore Get SessionStore by its id. @@ -231,7 +234,7 @@ func (manager *Manager) SessionRegenerateID(w http.ResponseWriter, r *http.Reque return } cookie, err := r.Cookie(manager.config.CookieName) - if err != nil && cookie.Value == "" { + if err != nil || cookie.Value == "" { //delete old cookie session, _ = manager.provider.SessionRead(sid) cookie = &http.Cookie{Name: manager.config.CookieName, @@ -252,7 +255,9 @@ func (manager *Manager) SessionRegenerateID(w http.ResponseWriter, r *http.Reque cookie.MaxAge = manager.config.CookieLifeTime cookie.Expires = time.Now().Add(time.Duration(manager.config.CookieLifeTime) * time.Second) } - http.SetCookie(w, cookie) + if manager.config.EnableSetCookie { + http.SetCookie(w, cookie) + } r.AddCookie(cookie) return } From 4c0c0ec2a7bd9e55fb64948ace96ddafda173725 Mon Sep 17 00:00:00 2001 From: ysqi Date: Thu, 7 Jan 2016 16:16:39 +0800 Subject: [PATCH 371/436] TplNames renamed TplName ,fix #1229,Remember modify bee tool. --- controller.go | 28 ++++++++++++++-------------- namespace_test.go | 12 ++++++------ utils/captcha/README.md | 4 ++-- utils/captcha/captcha.go | 4 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/controller.go b/controller.go index 1d0d9025..3bc871cc 100644 --- a/controller.go +++ b/controller.go @@ -68,7 +68,7 @@ type Controller struct { AppController interface{} // template data - TplNames string + TplName string Layout string LayoutSections map[string]string // the key is the section name and the value is the template name TplExt string @@ -105,7 +105,7 @@ type ControllerInterface interface { // Init generates default values of controller operations. func (c *Controller) Init(ctx *context.Context, controllerName, actionName string, app interface{}) { c.Layout = "" - c.TplNames = "" + c.TplName = "" c.controllerName = controllerName c.actionName = actionName c.Ctx = ctx @@ -200,12 +200,12 @@ func (c *Controller) RenderBytes() ([]byte, error) { //if the controller has set layout, then first get the tplname's content set the content to the layout var buf bytes.Buffer if c.Layout != "" { - if c.TplNames == "" { - c.TplNames = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt + if c.TplName == "" { + c.TplName = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt } if BConfig.RunMode == DEV { - buildFiles := []string{c.TplNames} + buildFiles := []string{c.TplName} if c.LayoutSections != nil { for _, sectionTpl := range c.LayoutSections { if sectionTpl == "" { @@ -216,10 +216,10 @@ func (c *Controller) RenderBytes() ([]byte, error) { } BuildTemplate(BConfig.WebConfig.ViewsPath, buildFiles...) } - if _, ok := BeeTemplates[c.TplNames]; !ok { - panic("can't find templatefile in the path:" + c.TplNames) + if _, ok := BeeTemplates[c.TplName]; !ok { + panic("can't find templatefile in the path:" + c.TplName) } - err := BeeTemplates[c.TplNames].ExecuteTemplate(&buf, c.TplNames, c.Data) + err := BeeTemplates[c.TplName].ExecuteTemplate(&buf, c.TplName, c.Data) if err != nil { Trace("template Execute err:", err) return nil, err @@ -252,17 +252,17 @@ func (c *Controller) RenderBytes() ([]byte, error) { return buf.Bytes(), nil } - if c.TplNames == "" { - c.TplNames = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt + if c.TplName == "" { + c.TplName = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt } if BConfig.RunMode == DEV { - BuildTemplate(BConfig.WebConfig.ViewsPath, c.TplNames) + BuildTemplate(BConfig.WebConfig.ViewsPath, c.TplName) } - if _, ok := BeeTemplates[c.TplNames]; !ok { - panic("can't find templatefile in the path:" + c.TplNames) + if _, ok := BeeTemplates[c.TplName]; !ok { + panic("can't find templatefile in the path:" + c.TplName) } buf.Reset() - err := BeeTemplates[c.TplNames].ExecuteTemplate(&buf, c.TplNames, c.Data) + err := BeeTemplates[c.TplName].ExecuteTemplate(&buf, c.TplName, c.Data) if err != nil { Trace("template Execute err:", err) return nil, err diff --git a/namespace_test.go b/namespace_test.go index fc02b5fb..a92ae3ef 100644 --- a/namespace_test.go +++ b/namespace_test.go @@ -61,8 +61,8 @@ func TestNamespaceNest(t *testing.T) { ns.Namespace( NewNamespace("/admin"). Get("/order", func(ctx *context.Context) { - ctx.Output.Body([]byte("order")) - }), + ctx.Output.Body([]byte("order")) + }), ) AddNamespace(ns) BeeApp.Handlers.ServeHTTP(w, r) @@ -79,8 +79,8 @@ func TestNamespaceNestParam(t *testing.T) { ns.Namespace( NewNamespace("/admin"). Get("/order/:id", func(ctx *context.Context) { - ctx.Output.Body([]byte(ctx.Input.Param(":id"))) - }), + ctx.Output.Body([]byte(ctx.Input.Param(":id"))) + }), ) AddNamespace(ns) BeeApp.Handlers.ServeHTTP(w, r) @@ -124,8 +124,8 @@ func TestNamespaceFilter(t *testing.T) { ctx.Output.Body([]byte("this is Filter")) }). Get("/user/:id", func(ctx *context.Context) { - ctx.Output.Body([]byte(ctx.Input.Param(":id"))) - }) + ctx.Output.Body([]byte(ctx.Input.Param(":id"))) + }) AddNamespace(ns) BeeApp.Handlers.ServeHTTP(w, r) if w.Body.String() != "this is Filter" { diff --git a/utils/captcha/README.md b/utils/captcha/README.md index cbdd5bde..dbc2026b 100644 --- a/utils/captcha/README.md +++ b/utils/captcha/README.md @@ -24,11 +24,11 @@ type MainController struct { } func (this *MainController) Get() { - this.TplNames = "index.tpl" + this.TplName = "index.tpl" } func (this *MainController) Post() { - this.TplNames = "index.tpl" + this.TplName = "index.tpl" this.Data["Success"] = cpt.VerifyReq(this.Ctx.Request) } diff --git a/utils/captcha/captcha.go b/utils/captcha/captcha.go index 3616cc7e..76301a03 100644 --- a/utils/captcha/captcha.go +++ b/utils/captcha/captcha.go @@ -37,11 +37,11 @@ // } // // func (this *MainController) Get() { -// this.TplNames = "index.tpl" +// this.TplName = "index.tpl" // } // // func (this *MainController) Post() { -// this.TplNames = "index.tpl" +// this.TplName = "index.tpl" // // this.Data["Success"] = cpt.VerifyReq(this.Ctx.Request) // } From 58e2a7c0999697ea8866236ecf83a3a7d57b8541 Mon Sep 17 00:00:00 2001 From: ysqi Date: Thu, 7 Jan 2016 20:42:26 +0800 Subject: [PATCH 372/436] fix #1473,Only update redis session if it already exist --- session/redis/sess_redis.go | 9 +++-- session/redis/sess_redis_test.go | 64 ++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 3 deletions(-) create mode 100644 session/redis/sess_redis_test.go diff --git a/session/redis/sess_redis.go b/session/redis/sess_redis.go index 6e85c449..99a672d5 100644 --- a/session/redis/sess_redis.go +++ b/session/redis/sess_redis.go @@ -98,15 +98,18 @@ func (rs *SessionStore) SessionID() string { // SessionRelease save session values to redis func (rs *SessionStore) SessionRelease(w http.ResponseWriter) { - c := rs.p.Get() - defer c.Close() b, err := session.EncodeGob(rs.values) if err != nil { return } - c.Do("SETEX", rs.sid, rs.maxlifetime, string(b)) + c := rs.p.Get() + defer c.Close() + // Update session value if exists or error. + if existed, err := redis.Bool(c.Do("EXISTS", rs.sid)); existed || err != nil { + c.Do("SETEX", rs.sid, rs.maxlifetime, string(b)) + } } // Provider redis session provider diff --git a/session/redis/sess_redis_test.go b/session/redis/sess_redis_test.go new file mode 100644 index 00000000..0c634428 --- /dev/null +++ b/session/redis/sess_redis_test.go @@ -0,0 +1,64 @@ +// Copyright 2016 beego Author. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package redis + +import ( + "testing" +) + +func TestSessionRelease(t *testing.T) { + + provider := Provider{} + if err := provider.SessionInit(3, "127.0.0.1:6379"); err != nil { + t.Fatal("init session err,", err) + } + + sessionID := "beegosessionid_00001" + + session, err := provider.SessionRegenerate("", sessionID) + if err != nil { + t.Fatal("new session error,", err) + } + + // set item. + session.Set("k1", "v1") + // update. + session.SessionRelease(nil) + + session, err = provider.SessionRead(sessionID) + if err != nil { + t.Fatal("read session error,", err) + } + if v1 := session.Get("k1"); v1 == nil { + t.Fatal("want v1 got nil") + } else if v, _ := v1.(string); v != "v1" { + t.Fatalf("want v1 got %s", v) + } + + // delete + provider.SessionDestroy(sessionID) + session.Set("k2", "v2") + + session.SessionRelease(nil) + + session, err = provider.SessionRead(sessionID) + if err != nil { + t.Fatal("read session error,", err) + } + if session.Get("k1") != nil || session.Get("k2") != nil { + t.Fatalf("want emtpy session value,got %s,%s", session.Get("k1"), session.Get("k2")) + } + +} From 6eff2e433f784fd3b5d4e26cb35f7c74f9da33d1 Mon Sep 17 00:00:00 2001 From: ysqi Date: Thu, 7 Jan 2016 20:55:28 +0800 Subject: [PATCH 373/436] fix #1502,Notes error repair --- tree.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tree.go b/tree.go index b43db3a9..70321d67 100644 --- a/tree.go +++ b/tree.go @@ -468,7 +468,8 @@ func splitPath(key string) []string { // ":name:string" -> true, [:name], ([\w]+) // ":id([0-9]+)" -> true, [:id], ([0-9]+) // ":id([0-9]+)_:name" -> true, [:id :name], ([0-9]+)_(.+) -// "cms_:id_:page.html" -> true, [:id :page], cms_(.+)_(.+).html +// "cms_:id_:page.html" -> true, [:id_ :page], cms_(.+)(.+).html +// "cms_:id(.+)_:page.html" -> true, [:id :page], cms_(.+)_(.+).html // "*" -> true, [:splat], "" // "*.*" -> true,[. :path :ext], "" . meaning separator func splitSegment(key string) (bool, []string, string) { From 103ac3ee5bc03e90c30d3acf68220f4c6cbe1ae0 Mon Sep 17 00:00:00 2001 From: miraclesu Date: Thu, 7 Jan 2016 22:42:04 +0800 Subject: [PATCH 374/436] Add custom validation function --- validation/util.go | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/validation/util.go b/validation/util.go index 9e4f642d..7c3fd20c 100644 --- a/validation/util.go +++ b/validation/util.go @@ -56,6 +56,27 @@ func init() { } } +type CustomFunc func(v *Validation, obj interface{}, key string) + +// Add a custom function to validation +// The name can not be: +// Clear +// HasErrors +// ErrorMap +// Error +// Check +// Valid +// NoMatch +// If the name is same with exists function, it will replace the origin valid function +func AddCustomFunc(name string, f CustomFunc) error { + if unFuncs[name] { + return fmt.Errorf("invalid function name: %s", name) + } + + funcs[name] = reflect.ValueOf(f) + return nil +} + // ValidFunc Valid function type type ValidFunc struct { Name string @@ -102,7 +123,6 @@ func getValidFuncs(f reflect.StructField) (vfs []ValidFunc, err error) { return } if vfs, tag, err = getRegFuncs(tag, f.Name); err != nil { - fmt.Printf("%+v\n", err) return } fs := strings.Split(tag, ";") @@ -214,7 +234,7 @@ func trim(name, key string, s []string) (ts []interface{}, err error) { for i := 0; i < len(s); i++ { var param interface{} // skip *Validation and obj params - if param, err = magic(fn.Type().In(i+2), strings.TrimSpace(s[i])); err != nil { + if param, err = parseParam(fn.Type().In(i+2), strings.TrimSpace(s[i])); err != nil { return } ts[i] = param @@ -224,7 +244,7 @@ func trim(name, key string, s []string) (ts []interface{}, err error) { } // modify the parameters's type to adapt the function input parameters' type -func magic(t reflect.Type, s string) (i interface{}, err error) { +func parseParam(t reflect.Type, s string) (i interface{}, err error) { switch t.Kind() { case reflect.Int: i, err = strconv.Atoi(s) From 21f767784bf4865b8aa6a144e5a56dbf28e34ee0 Mon Sep 17 00:00:00 2001 From: miraclesu Date: Thu, 7 Jan 2016 22:55:12 +0800 Subject: [PATCH 375/436] Add custom validation function doc --- validation/README.md | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/validation/README.md b/validation/README.md index b4fc3fe5..5c3212b0 100644 --- a/validation/README.md +++ b/validation/README.md @@ -63,7 +63,48 @@ Struct Tag Use: } func main() { - valid := Validation{} + valid := validation.Validation{} + u := user{Name: "test", Age: 40} + b, err := valid.Valid(u) + if err != nil { + // handle error + } + if !b { + // validation does not pass + // blabla... + } + } + +Use custom function: + + import ( + "github.com/astaxie/beego/validation" + ) + + type user struct { + Id int + Name string `valid:"Required;IsMe"` + Age int `valid:"Required;Range(1, 140)"` + } + + func IsMe(v *validation.Validation, obj interface{}, key string) { + name, ok:= obj.(string) + if !ok { + // wrong use case? + return + } + + if name != "me" { + // valid false + v.SetError("Name", "is not me!") + } + } + + func main() { + valid := validation.Validation{} + if err := validation.AddCustomFunc("IsMe", IsMe); err != nil { + // hadle error + } u := user{Name: "test", Age: 40} b, err := valid.Valid(u) if err != nil { From 687266fb646313d0556d9468098c33ef6a8ea4dd Mon Sep 17 00:00:00 2001 From: miraclesu Date: Thu, 7 Jan 2016 23:03:32 +0800 Subject: [PATCH 376/436] Add 179 to valid Phone number --- validation/validators.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validation/validators.go b/validation/validators.go index 7e1822cf..9d9df467 100644 --- a/validation/validators.go +++ b/validation/validators.go @@ -588,7 +588,7 @@ func (b Base64) GetLimitValue() interface{} { } // just for chinese mobile phone number -var mobilePattern = regexp.MustCompile("^((\\+86)|(86))?(1(([35][0-9])|[8][0-9]|[7][067]|[4][579]))\\d{8}$") +var mobilePattern = regexp.MustCompile("^((\\+86)|(86))?(1(([35][0-9])|[8][0-9]|[7][0679]|[4][579]))\\d{8}$") // Mobile check struct type Mobile struct { From c6141f5d94bd8fda27570ead83a7045e71430231 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 7 Jan 2016 23:31:33 +0800 Subject: [PATCH 377/436] add httpsaddr --- config.go | 1 + 1 file changed, 1 insertion(+) diff --git a/config.go b/config.go index a941c99f..4f9870f1 100644 --- a/config.go +++ b/config.go @@ -207,6 +207,7 @@ func ParseConfig() (err error) { BConfig.Listen.ListenTCP4 = AppConfig.DefaultBool("ListenTCP4", BConfig.Listen.ListenTCP4) BConfig.Listen.HTTPEnable = AppConfig.DefaultBool("EnableHTTPListen", BConfig.Listen.HTTPEnable) BConfig.Listen.HTTPSEnable = AppConfig.DefaultBool("EnableHTTPTLS", BConfig.Listen.HTTPSEnable) + BConfig.Listen.HTTPSAddr = AppConfig.DefaultInt("HTTPSAddr", BConfig.Listen.HTTPSAddr) BConfig.Listen.HTTPSPort = AppConfig.DefaultInt("HTTPSPort", BConfig.Listen.HTTPSPort) BConfig.Listen.HTTPSCertFile = AppConfig.DefaultString("HTTPCertFile", BConfig.Listen.HTTPSCertFile) BConfig.Listen.HTTPSKeyFile = AppConfig.DefaultString("HTTPKeyFile", BConfig.Listen.HTTPSKeyFile) From 98f3fecc0303e57c80881a7c6cac838c569ee022 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 7 Jan 2016 23:35:01 +0800 Subject: [PATCH 378/436] fix the typo --- config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.go b/config.go index 4f9870f1..728f0bf4 100644 --- a/config.go +++ b/config.go @@ -207,7 +207,7 @@ func ParseConfig() (err error) { BConfig.Listen.ListenTCP4 = AppConfig.DefaultBool("ListenTCP4", BConfig.Listen.ListenTCP4) BConfig.Listen.HTTPEnable = AppConfig.DefaultBool("EnableHTTPListen", BConfig.Listen.HTTPEnable) BConfig.Listen.HTTPSEnable = AppConfig.DefaultBool("EnableHTTPTLS", BConfig.Listen.HTTPSEnable) - BConfig.Listen.HTTPSAddr = AppConfig.DefaultInt("HTTPSAddr", BConfig.Listen.HTTPSAddr) + BConfig.Listen.HTTPSAddr = AppConfig.DefaultString("HTTPSAddr", BConfig.Listen.HTTPSAddr) BConfig.Listen.HTTPSPort = AppConfig.DefaultInt("HTTPSPort", BConfig.Listen.HTTPSPort) BConfig.Listen.HTTPSCertFile = AppConfig.DefaultString("HTTPCertFile", BConfig.Listen.HTTPSCertFile) BConfig.Listen.HTTPSKeyFile = AppConfig.DefaultString("HTTPKeyFile", BConfig.Listen.HTTPSKeyFile) From c68505e4511787d52243434f6a96788c9266bca3 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 7 Jan 2016 23:55:55 +0800 Subject: [PATCH 379/436] read config from app.conf for session --- config.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config.go b/config.go index 728f0bf4..cb38f4f3 100644 --- a/config.go +++ b/config.go @@ -233,6 +233,8 @@ func ParseConfig() (err error) { BConfig.WebConfig.Session.SessionProviderConfig = AppConfig.DefaultString("SessionProviderConfig", BConfig.WebConfig.Session.SessionProviderConfig) BConfig.WebConfig.Session.SessionGCMaxLifetime = AppConfig.DefaultInt64("SessionGCMaxLifetime", BConfig.WebConfig.Session.SessionGCMaxLifetime) BConfig.WebConfig.Session.SessionCookieLifeTime = AppConfig.DefaultInt("SessionCookieLifeTime", BConfig.WebConfig.Session.SessionCookieLifeTime) + BConfig.WebConfig.Session.SessionAutoSetCookie = AppConfig.DefaultBool("SessionAutoSetCookie", BConfig.WebConfig.Session.SessionAutoSetCookie) + BConfig.WebConfig.Session.SessionDomain = AppConfig.DefaultString("SessionDomain", BConfig.WebConfig.Session.SessionDomain) if sd := AppConfig.String("StaticDir"); sd != "" { for k := range BConfig.WebConfig.StaticDir { From 91675879292b38ca27c5dd14c47ca711e30b4112 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 8 Jan 2016 01:20:34 +0800 Subject: [PATCH 380/436] add Params for input --- context/input.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/context/input.go b/context/input.go index 90ebecfc..c37204bd 100644 --- a/context/input.go +++ b/context/input.go @@ -274,6 +274,17 @@ func (input *BeegoInput) Param(key string) string { return "" } +// Params returns the map[key]value. +func (input *BeegoInput) Params() map[string]string { + m := make(map[string]string) + for i, v := range input.pnames { + if i <= len(input.pvalues) { + m[v] = input.pvalues[i] + } + } + return m +} + // SetParam will set the param with key and value func (input *BeegoInput) SetParam(key, val string) { input.pvalues = append(input.pvalues, val) From 01012fa898b77cd5cc053be9931584b3d9c777bd Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 8 Jan 2016 01:40:19 +0800 Subject: [PATCH 381/436] admin configure --- admin.go | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- beego.go | 2 +- config.go | 5 +++-- 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/admin.go b/admin.go index 0be95e04..d143c212 100644 --- a/admin.go +++ b/admin.go @@ -89,11 +89,63 @@ func listConf(rw http.ResponseWriter, r *http.Request) { data := make(map[interface{}]interface{}) switch command { case "conf": + m := make(map[string]interface{}) + m["AppConfigPath"] = AppConfigPath + m["AppConfigProvider"] = AppConfigProvider + m["BConfig.AppName"] = BConfig.AppName + m["BConfig.RunMode"] = BConfig.RunMode + m["BConfig.RouterCaseSensitive"] = BConfig.RouterCaseSensitive + m["BConfig.ServerName"] = BConfig.ServerName + m["BConfig.RecoverPanic"] = BConfig.RecoverPanic + m["BConfig.CopyRequestBody"] = BConfig.CopyRequestBody + m["BConfig.EnableGzip"] = BConfig.EnableGzip + m["BConfig.MaxMemory"] = BConfig.MaxMemory + m["BConfig.EnableErrorsShow"] = BConfig.EnableErrorsShow + m["BConfig.Listen.Graceful"] = BConfig.Listen.Graceful + m["BConfig.Listen.ServerTimeOut"] = BConfig.Listen.ServerTimeOut + m["BConfig.Listen.ListenTCP4"] = BConfig.Listen.ListenTCP4 + m["BConfig.Listen.HTTPEnable"] = BConfig.Listen.HTTPEnable + m["BConfig.Listen.HTTPAddr"] = BConfig.Listen.HTTPAddr + m["BConfig.Listen.HTTPPort"] = BConfig.Listen.HTTPPort + m["BConfig.Listen.HTTPSEnable"] = BConfig.Listen.HTTPSEnable + m["BConfig.Listen.HTTPSAddr"] = BConfig.Listen.HTTPSAddr + m["BConfig.Listen.HTTPSPort"] = BConfig.Listen.HTTPSPort + m["BConfig.Listen.HTTPSCertFile"] = BConfig.Listen.HTTPSCertFile + m["BConfig.Listen.HTTPSKeyFile"] = BConfig.Listen.HTTPSKeyFile + m["BConfig.Listen.AdminEnable"] = BConfig.Listen.AdminEnable + m["BConfig.Listen.AdminAddr"] = BConfig.Listen.AdminAddr + m["BConfig.Listen.AdminPort"] = BConfig.Listen.AdminPort + m["BConfig.Listen.EnableFcgi"] = BConfig.Listen.EnableFcgi + m["BConfig.Listen.EnableStdIo"] = BConfig.Listen.EnableStdIo + m["BConfig.WebConfig.AutoRender"] = BConfig.WebConfig.AutoRender + m["BConfig.WebConfig.EnableDocs"] = BConfig.WebConfig.EnableDocs + m["BConfig.WebConfig.FlashName"] = BConfig.WebConfig.FlashName + m["BConfig.WebConfig.FlashSeperator"] = BConfig.WebConfig.FlashSeperator + m["BConfig.WebConfig.DirectoryIndex"] = BConfig.WebConfig.DirectoryIndex + m["BConfig.WebConfig.StaticDir"] = BConfig.WebConfig.StaticDir + m["BConfig.WebConfig.StaticExtensionsToGzip"] = BConfig.WebConfig.StaticExtensionsToGzip + m["BConfig.WebConfig.TemplateLeft"] = BConfig.WebConfig.TemplateLeft + m["BConfig.WebConfig.TemplateRight"] = BConfig.WebConfig.TemplateRight + m["BConfig.WebConfig.ViewsPath"] = BConfig.WebConfig.ViewsPath + m["BConfig.WebConfig.EnableXSRF"] = BConfig.WebConfig.EnableXSRF + m["BConfig.WebConfig.XSRFKEY"] = BConfig.WebConfig.XSRFKEY + m["BConfig.WebConfig.XSRFExpire"] = BConfig.WebConfig.XSRFExpire + m["BConfig.WebConfig.Session.SessionOn"] = BConfig.WebConfig.Session.SessionOn + m["BConfig.WebConfig.Session.SessionProvider"] = BConfig.WebConfig.Session.SessionProvider + m["BConfig.WebConfig.Session.SessionName"] = BConfig.WebConfig.Session.SessionName + m["BConfig.WebConfig.Session.SessionGCMaxLifetime"] = BConfig.WebConfig.Session.SessionGCMaxLifetime + m["BConfig.WebConfig.Session.SessionProviderConfig"] = BConfig.WebConfig.Session.SessionProviderConfig + m["BConfig.WebConfig.Session.SessionCookieLifeTime"] = BConfig.WebConfig.Session.SessionCookieLifeTime + m["BConfig.WebConfig.Session.SessionAutoSetCookie"] = BConfig.WebConfig.Session.SessionAutoSetCookie + m["BConfig.WebConfig.Session.SessionDomain"] = BConfig.WebConfig.Session.SessionDomain + m["BConfig.Log.AccessLogs"] = BConfig.Log.AccessLogs + m["BConfig.Log.FileLineNum"] = BConfig.Log.FileLineNum + m["BConfig.Log.Outputs"] = BConfig.Log.Outputs tmpl := template.Must(template.New("dashboard").Parse(dashboardTpl)) tmpl = template.Must(tmpl.Parse(configTpl)) tmpl = template.Must(tmpl.Parse(defaultScriptsTpl)) - data["Content"] = BConfig + data["Content"] = m tmpl.Execute(rw, data) diff --git a/beego.go b/beego.go index 3f0ae98f..04f02071 100644 --- a/beego.go +++ b/beego.go @@ -74,7 +74,7 @@ func initBeforeHTTPRun() { panic(err) } //init log - for adaptor, config := range BConfig.Log.Output { + for adaptor, config := range BConfig.Log.Outputs { err = BeeLogger.SetLogger(adaptor, config) if err != nil { fmt.Printf("%s with the config `%s` got err:%s\n", adaptor, config, err) diff --git a/config.go b/config.go index cb38f4f3..a5229c85 100644 --- a/config.go +++ b/config.go @@ -90,7 +90,7 @@ type SessionConfig struct { type LogConfig struct { AccessLogs bool FileLineNum bool - Output map[string]string // Store Adaptor : config + Outputs map[string]string // Store Adaptor : config } var ( @@ -165,7 +165,7 @@ func init() { Log: LogConfig{ AccessLogs: false, FileLineNum: true, - Output: map[string]string{"console": ""}, + Outputs: map[string]string{"console": ""}, }, } ParseConfig() @@ -215,6 +215,7 @@ func ParseConfig() (err error) { BConfig.Listen.AdminAddr = AppConfig.DefaultString("AdminHTTPAddr", BConfig.Listen.AdminAddr) BConfig.Listen.AdminPort = AppConfig.DefaultInt("AdminHTTPPort", BConfig.Listen.AdminPort) BConfig.Listen.EnableFcgi = AppConfig.DefaultBool("EnableFcgi", BConfig.Listen.EnableFcgi) + BConfig.Listen.EnableStdIo = AppConfig.DefaultBool("EnableStdIo", BConfig.Listen.EnableStdIo) BConfig.Listen.ServerTimeOut = AppConfig.DefaultInt64("HTTPServerTimeOut", BConfig.Listen.ServerTimeOut) BConfig.WebConfig.AutoRender = AppConfig.DefaultBool("AutoRender", BConfig.WebConfig.AutoRender) BConfig.WebConfig.ViewsPath = AppConfig.DefaultString("ViewsPath", BConfig.WebConfig.ViewsPath) From bb43d3a78c7561769e1ba2f8a7208fa3c81ef634 Mon Sep 17 00:00:00 2001 From: youngsterxyf Date: Fri, 8 Jan 2016 13:47:14 +0800 Subject: [PATCH 382/436] fix #1530 --- cache/README.md | 2 +- cache/cache.go | 7 ++++--- cache/cache_test.go | 16 +++++++++------- cache/file.go | 18 +++++++++--------- cache/memcache/memcache.go | 5 +++-- cache/memcache/memcache_test.go | 9 +++++---- cache/memory.go | 12 ++++-------- cache/redis/redis.go | 4 ++-- cache/redis/redis_test.go | 9 +++++---- 9 files changed, 42 insertions(+), 40 deletions(-) diff --git a/cache/README.md b/cache/README.md index 4152c57e..c8cb7454 100644 --- a/cache/README.md +++ b/cache/README.md @@ -26,7 +26,7 @@ Then init a Cache (example with memory adapter) Use it like this: - bm.Put("astaxie", 1, 10) + bm.Put("astaxie", 1, time.Second * 10) bm.Get("astaxie") bm.IsExist("astaxie") bm.Delete("astaxie") diff --git a/cache/cache.go b/cache/cache.go index c9904444..78643aea 100644 --- a/cache/cache.go +++ b/cache/cache.go @@ -23,7 +23,7 @@ // // Use it like this: // -// bm.Put("astaxie", 1, 10) +// bm.Put("astaxie", 1, time.Second * 10) // bm.Get("astaxie") // bm.IsExist("astaxie") // bm.Delete("astaxie") @@ -33,13 +33,14 @@ package cache import ( "fmt" + "time" ) // Cache interface contains all behaviors for cache adapter. // usage: // cache.Register("file",cache.NewFileCache) // this operation is run in init method of file.go. // c,err := cache.NewCache("file","{....}") -// c.Put("key",value,3600) +// c.Put("key",value, time.Second * 3600) // v := c.Get("key") // // c.Incr("counter") // now is 1 @@ -51,7 +52,7 @@ type Cache interface { // GetMulti is a batch version of Get. GetMulti(keys []string) []interface{} // set cached value with key and expire time. - Put(key string, val interface{}, timeout int64) error + Put(key string, val interface{}, timeout time.Duration) error // delete cached value by key. Delete(key string) error // increase cached int value by key, as a counter. diff --git a/cache/cache_test.go b/cache/cache_test.go index 481309fd..73e593e9 100644 --- a/cache/cache_test.go +++ b/cache/cache_test.go @@ -25,7 +25,8 @@ func TestCache(t *testing.T) { if err != nil { t.Error("init err") } - if err = bm.Put("astaxie", 1, 10); err != nil { + timeoutDuration := time.Second * 10 + if err = bm.Put("astaxie", 1, timeoutDuration); err != nil { t.Error("set Error", err) } if !bm.IsExist("astaxie") { @@ -42,7 +43,7 @@ func TestCache(t *testing.T) { t.Error("check err") } - if err = bm.Put("astaxie", 1, 10); err != nil { + if err = bm.Put("astaxie", 1, timeoutDuration); err != nil { t.Error("set Error", err) } @@ -67,7 +68,7 @@ func TestCache(t *testing.T) { } //test GetMulti - if err = bm.Put("astaxie", "author", 10); err != nil { + if err = bm.Put("astaxie", "author", timeoutDuration); err != nil { t.Error("set Error", err) } if !bm.IsExist("astaxie") { @@ -77,7 +78,7 @@ func TestCache(t *testing.T) { t.Error("get err") } - if err = bm.Put("astaxie1", "author1", 10); err != nil { + if err = bm.Put("astaxie1", "author1", timeoutDuration); err != nil { t.Error("set Error", err) } if !bm.IsExist("astaxie1") { @@ -101,7 +102,8 @@ func TestFileCache(t *testing.T) { if err != nil { t.Error("init err") } - if err = bm.Put("astaxie", 1, 10); err != nil { + timeoutDuration := time.Second * 10 + if err = bm.Put("astaxie", 1, timeoutDuration); err != nil { t.Error("set Error", err) } if !bm.IsExist("astaxie") { @@ -133,7 +135,7 @@ func TestFileCache(t *testing.T) { } //test string - if err = bm.Put("astaxie", "author", 10); err != nil { + if err = bm.Put("astaxie", "author", timeoutDuration); err != nil { t.Error("set Error", err) } if !bm.IsExist("astaxie") { @@ -144,7 +146,7 @@ func TestFileCache(t *testing.T) { } //test GetMulti - if err = bm.Put("astaxie1", "author1", 10); err != nil { + if err = bm.Put("astaxie1", "author1", timeoutDuration); err != nil { t.Error("set Error", err) } if !bm.IsExist("astaxie1") { diff --git a/cache/file.go b/cache/file.go index 2d77b567..80f93bce 100644 --- a/cache/file.go +++ b/cache/file.go @@ -33,8 +33,8 @@ import ( // it contains data and expire time. type FileCacheItem struct { Data interface{} - Lastaccess int64 - Expired int64 + Lastaccess time.Time + Expired time.Time } // FileCache Config @@ -42,7 +42,7 @@ var ( FileCachePath = "cache" // cache directory FileCacheFileSuffix = ".bin" // cache file suffix FileCacheDirectoryLevel = 2 // cache file deep level if auto generated cache files. - FileCacheEmbedExpiry int64 // cache expire time, default is no expire forever. + FileCacheEmbedExpiry time.Duration = 0 // cache expire time, default is no expire forever. ) // FileCache is cache adapter for file storage. @@ -76,7 +76,7 @@ func (fc *FileCache) StartAndGC(config string) error { cfg["DirectoryLevel"] = strconv.Itoa(FileCacheDirectoryLevel) } if _, ok := cfg["EmbedExpiry"]; !ok { - cfg["EmbedExpiry"] = strconv.FormatInt(FileCacheEmbedExpiry, 10) + cfg["EmbedExpiry"] = strconv.FormatInt(int64(FileCacheEmbedExpiry.Seconds()), 10) } fc.CachePath = cfg["CachePath"] fc.FileSuffix = cfg["FileSuffix"] @@ -123,7 +123,7 @@ func (fc *FileCache) Get(key string) interface{} { } var to FileCacheItem GobDecode(fileData, &to) - if to.Expired < time.Now().Unix() { + if to.Expired.Before(time.Now()) { return "" } return to.Data @@ -142,16 +142,16 @@ func (fc *FileCache) GetMulti(keys []string) []interface{} { // Put value into file cache. // timeout means how long to keep this file, unit of ms. // if timeout equals FileCacheEmbedExpiry(default is 0), cache this item forever. -func (fc *FileCache) Put(key string, val interface{}, timeout int64) error { +func (fc *FileCache) Put(key string, val interface{}, timeout time.Duration) error { gob.Register(val) item := FileCacheItem{Data: val} if timeout == FileCacheEmbedExpiry { - item.Expired = time.Now().Unix() + (86400 * 365 * 10) // ten years + item.Expired = time.Now().Add(time.Second * (86400 * 365 * 10)) // ten years } else { - item.Expired = time.Now().Unix() + timeout + item.Expired = time.Now().Add(timeout) } - item.Lastaccess = time.Now().Unix() + item.Lastaccess = time.Now() data, err := GobEncode(item) if err != nil { return err diff --git a/cache/memcache/memcache.go b/cache/memcache/memcache.go index 272124da..ea77be38 100644 --- a/cache/memcache/memcache.go +++ b/cache/memcache/memcache.go @@ -37,6 +37,7 @@ import ( "github.com/bradfitz/gomemcache/memcache" "github.com/astaxie/beego/cache" + "time" ) // Cache Memcache adapter. @@ -89,7 +90,7 @@ func (rc *Cache) GetMulti(keys []string) []interface{} { } // Put put value to memcache. only support string. -func (rc *Cache) Put(key string, val interface{}, timeout int64) error { +func (rc *Cache) Put(key string, val interface{}, timeout time.Duration) error { if rc.conn == nil { if err := rc.connectInit(); err != nil { return err @@ -99,7 +100,7 @@ func (rc *Cache) Put(key string, val interface{}, timeout int64) error { if !ok { return errors.New("val must string") } - item := memcache.Item{Key: key, Value: []byte(v), Expiration: int32(timeout)} + item := memcache.Item{Key: key, Value: []byte(v), Expiration: int32(timeout.Seconds())} return rc.conn.Set(&item) } diff --git a/cache/memcache/memcache_test.go b/cache/memcache/memcache_test.go index 27b085e6..93484f6b 100644 --- a/cache/memcache/memcache_test.go +++ b/cache/memcache/memcache_test.go @@ -28,7 +28,8 @@ func TestMemcacheCache(t *testing.T) { if err != nil { t.Error("init err") } - if err = bm.Put("astaxie", "1", 10); err != nil { + timeoutDuration := time.Second * 10 + if err = bm.Put("astaxie", "1", timeoutDuration); err != nil { t.Error("set Error", err) } if !bm.IsExist("astaxie") { @@ -40,7 +41,7 @@ func TestMemcacheCache(t *testing.T) { if bm.IsExist("astaxie") { t.Error("check err") } - if err = bm.Put("astaxie", "1", 10); err != nil { + if err = bm.Put("astaxie", "1", timeoutDuration); err != nil { t.Error("set Error", err) } @@ -69,7 +70,7 @@ func TestMemcacheCache(t *testing.T) { } //test string - if err = bm.Put("astaxie", "author", 10); err != nil { + if err = bm.Put("astaxie", "author", timeoutDuration); err != nil { t.Error("set Error", err) } if !bm.IsExist("astaxie") { @@ -81,7 +82,7 @@ func TestMemcacheCache(t *testing.T) { } //test GetMulti - if err = bm.Put("astaxie1", "author1", 10); err != nil { + if err = bm.Put("astaxie1", "author1", timeoutDuration); err != nil { t.Error("set Error", err) } if !bm.IsExist("astaxie1") { diff --git a/cache/memory.go b/cache/memory.go index f8cccb14..5ba11b3c 100644 --- a/cache/memory.go +++ b/cache/memory.go @@ -17,7 +17,6 @@ package cache import ( "encoding/json" "errors" - "fmt" "sync" "time" ) @@ -31,7 +30,7 @@ var ( type MemoryItem struct { val interface{} createdTime time.Time - lifespan int64 + lifespan time.Duration } func (mi *MemoryItem) isExpire() bool { @@ -39,7 +38,7 @@ func (mi *MemoryItem) isExpire() bool { if mi.lifespan == 0 { return false } - return time.Now().Unix()-mi.createdTime.Unix() > mi.lifespan + return time.Now().Sub(mi.createdTime) > mi.lifespan } // MemoryCache is Memory cache adapter. @@ -83,7 +82,7 @@ func (bc *MemoryCache) GetMulti(names []string) []interface{} { // Put cache to memory. // if lifespan is 0, it will be forever till restart. -func (bc *MemoryCache) Put(name string, value interface{}, lifespan int64) error { +func (bc *MemoryCache) Put(name string, value interface{}, lifespan time.Duration) error { bc.Lock() defer bc.Unlock() bc.items[name] = &MemoryItem{ @@ -201,10 +200,7 @@ func (bc *MemoryCache) StartAndGC(config string) error { cf = make(map[string]int) cf["interval"] = DefaultEvery } - dur, err := time.ParseDuration(fmt.Sprintf("%ds", cf["interval"])) - if err != nil { - return err - } + dur := time.Second * time.Duration(cf["interval"]) bc.Every = cf["interval"] bc.dur = dur go bc.vaccuum() diff --git a/cache/redis/redis.go b/cache/redis/redis.go index 60c1702a..316cb423 100644 --- a/cache/redis/redis.go +++ b/cache/redis/redis.go @@ -109,9 +109,9 @@ ERROR: } // Put put cache to redis. -func (rc *Cache) Put(key string, val interface{}, timeout int64) error { +func (rc *Cache) Put(key string, val interface{}, timeout time.Duration) error { var err error - if _, err = rc.do("SETEX", key, timeout, val); err != nil { + if _, err = rc.do("SETEX", key, int64(timeout.Seconds()), val); err != nil { return err } diff --git a/cache/redis/redis_test.go b/cache/redis/redis_test.go index 1f74fd27..22059508 100644 --- a/cache/redis/redis_test.go +++ b/cache/redis/redis_test.go @@ -28,7 +28,8 @@ func TestRedisCache(t *testing.T) { if err != nil { t.Error("init err") } - if err = bm.Put("astaxie", 1, 10); err != nil { + timeoutDuration := time.Second * 10 + if err = bm.Put("astaxie", 1, timeoutDuration); err != nil { t.Error("set Error", err) } if !bm.IsExist("astaxie") { @@ -40,7 +41,7 @@ func TestRedisCache(t *testing.T) { if bm.IsExist("astaxie") { t.Error("check err") } - if err = bm.Put("astaxie", 1, 10); err != nil { + if err = bm.Put("astaxie", 1, timeoutDuration); err != nil { t.Error("set Error", err) } @@ -69,7 +70,7 @@ func TestRedisCache(t *testing.T) { } //test string - if err = bm.Put("astaxie", "author", 10); err != nil { + if err = bm.Put("astaxie", "author", timeoutDuration); err != nil { t.Error("set Error", err) } if !bm.IsExist("astaxie") { @@ -81,7 +82,7 @@ func TestRedisCache(t *testing.T) { } //test GetMulti - if err = bm.Put("astaxie1", "author1", 10); err != nil { + if err = bm.Put("astaxie1", "author1", timeoutDuration); err != nil { t.Error("set Error", err) } if !bm.IsExist("astaxie1") { From 69bcbcdb31425cd260ee17123bb6982698ccc635 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 8 Jan 2016 15:34:02 +0800 Subject: [PATCH 383/436] add travis --- .travis.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..5d9833ea --- /dev/null +++ b/.travis.yml @@ -0,0 +1,18 @@ +language: go + +go: + - 1.5.1 + +services: + - redis-server + - mysql + - postgresql + - memcached +env: + - ORM_DRIVER=sqlite + - ORM_DRIVER=mysql + - ORM_DRIVER=postgres +before_script: + - sh -c "if [ '$DB' = 'postgres' ]; then export ORM_SOURCE='user=postgres dbname=orm_test sslmode=disable'; psql -c 'create database orm_test;' -U postgres; fi" + - sh -c "if [ '$DB' = 'mysql' ]; then export ORM_SOURCE='root:@/orm_test?charset=utf8'; mysql -u root -e 'create database orm_test;'; fi" + - sh -c "if [ '$DB' = 'sqlite' ]; then export ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db; touch $TRAVIS_BUILD_DIR/orm_test.db; fi" From 77fa8914999f721f7e66043cf8050c4648ab9bcc Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 8 Jan 2016 15:47:13 +0800 Subject: [PATCH 384/436] update dependence --- session/couchbase/sess_couchbase.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/session/couchbase/sess_couchbase.go b/session/couchbase/sess_couchbase.go index f5320dd7..d5be11d0 100644 --- a/session/couchbase/sess_couchbase.go +++ b/session/couchbase/sess_couchbase.go @@ -37,7 +37,7 @@ import ( "strings" "sync" - "gh.apple.com/md/go-couchbase" + couchbase "github.com/couchbase/go-couchbase" "github.com/astaxie/beego/session" ) From 302b1ef7df054aec5eec6e2371646c4b372940d1 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 8 Jan 2016 15:52:57 +0800 Subject: [PATCH 385/436] fix the data --- utils/pagination/controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/pagination/controller.go b/utils/pagination/controller.go index e42c4075..1d99cac5 100644 --- a/utils/pagination/controller.go +++ b/utils/pagination/controller.go @@ -21,6 +21,6 @@ import ( // SetPaginator Instantiates a Paginator and assigns it to context.Input.Data["paginator"]. func SetPaginator(context *context.Context, per int, nums int64) (paginator *Paginator) { paginator = NewPaginator(context.Request, per, nums) - context.Input.Data["paginator"] = &paginator + context.Input.SetData("paginator", &paginator) return } From d2de71d8ab3e3f18d1c7b052a3e25f6d1c04e936 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 8 Jan 2016 16:01:07 +0800 Subject: [PATCH 386/436] update the dependence --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5d9833ea..f87802e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,6 @@ env: - ORM_DRIVER=mysql - ORM_DRIVER=postgres before_script: - - sh -c "if [ '$DB' = 'postgres' ]; then export ORM_SOURCE='user=postgres dbname=orm_test sslmode=disable'; psql -c 'create database orm_test;' -U postgres; fi" - - sh -c "if [ '$DB' = 'mysql' ]; then export ORM_SOURCE='root:@/orm_test?charset=utf8'; mysql -u root -e 'create database orm_test;'; fi" - - sh -c "if [ '$DB' = 'sqlite' ]; then export ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db; touch $TRAVIS_BUILD_DIR/orm_test.db; fi" + - sh -c "if [ '$ORM_DRIVER' = 'postgres' ]; then export ORM_SOURCE='user=postgres dbname=orm_test sslmode=disable'; psql -c 'create database orm_test;' -U postgres; fi" + - sh -c "if [ '$ORM_DRIVER' = 'mysql' ]; then export ORM_SOURCE='root:@/orm_test?charset=utf8'; mysql -u root -e 'create database orm_test;'; fi" + - sh -c "if [ '$ORM_DRIVER' = 'sqlite' ]; then export ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db; touch $TRAVIS_BUILD_DIR/orm_test.db; fi" From 5b028796b87cb47640a710a936e54cc08c901f24 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 8 Jan 2016 16:24:59 +0800 Subject: [PATCH 387/436] fix the test case for input --- context/input_test.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/context/input_test.go b/context/input_test.go index 4566f6d6..618e1254 100644 --- a/context/input_test.go +++ b/context/input_test.go @@ -17,12 +17,15 @@ package context import ( "fmt" "net/http" + "net/http/httptest" "testing" ) func TestParse(t *testing.T) { r, _ := http.NewRequest("GET", "/?id=123&isok=true&ft=1.2&ol[0]=1&ol[1]=2&ul[]=str&ul[]=array&user.Name=astaxie", nil) - beegoInput := NewInput(r) + beegoInput := NewInput() + beegoInput.Context = NewContext() + beegoInput.Context.Reset(httptest.NewRecorder(), r) beegoInput.ParseFormOrMulitForm(1 << 20) var id int @@ -73,7 +76,9 @@ func TestParse(t *testing.T) { func TestSubDomain(t *testing.T) { r, _ := http.NewRequest("GET", "http://www.example.com/?id=123&isok=true&ft=1.2&ol[0]=1&ol[1]=2&ul[]=str&ul[]=array&user.Name=astaxie", nil) - beegoInput := NewInput(r) + beegoInput := NewInput() + beegoInput.Context = NewContext() + beegoInput.Context.Reset(httptest.NewRecorder(), r) subdomain := beegoInput.SubDomains() if subdomain != "www" { @@ -81,13 +86,13 @@ func TestSubDomain(t *testing.T) { } r, _ = http.NewRequest("GET", "http://localhost/", nil) - beegoInput.Request = r + beegoInput.Context.Request = r if beegoInput.SubDomains() != "" { t.Fatal("Subdomain parse error, should be empty, got " + beegoInput.SubDomains()) } r, _ = http.NewRequest("GET", "http://aa.bb.example.com/", nil) - beegoInput.Request = r + beegoInput.Context.Request = r if beegoInput.SubDomains() != "aa.bb" { t.Fatal("Subdomain parse error, got " + beegoInput.SubDomains()) } @@ -101,13 +106,13 @@ func TestSubDomain(t *testing.T) { */ r, _ = http.NewRequest("GET", "http://example.com/", nil) - beegoInput.Request = r + beegoInput.Context.Request = r if beegoInput.SubDomains() != "" { t.Fatal("Subdomain parse error, got " + beegoInput.SubDomains()) } r, _ = http.NewRequest("GET", "http://aa.bb.cc.dd.example.com/", nil) - beegoInput.Request = r + beegoInput.Context.Request = r if beegoInput.SubDomains() != "aa.bb.cc.dd" { t.Fatal("Subdomain parse error, got " + beegoInput.SubDomains()) } From fd608d2bf673af9a1ec69b589506302e5efd12dc Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 8 Jan 2016 19:59:20 +0800 Subject: [PATCH 388/436] disable tidb testing --- orm/models_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/orm/models_test.go b/orm/models_test.go index 54e5c6ae..1ad8c601 100644 --- a/orm/models_test.go +++ b/orm/models_test.go @@ -25,7 +25,9 @@ import ( _ "github.com/go-sql-driver/mysql" _ "github.com/lib/pq" _ "github.com/mattn/go-sqlite3" - _ "github.com/pingcap/tidb" + + // As tidb can't use go get, so disable the tidb testing now + // _ "github.com/pingcap/tidb" ) // A slice string field. From 0b0904db131236e42e38f61aab35960d08bee020 Mon Sep 17 00:00:00 2001 From: youngsterxyf Date: Fri, 8 Jan 2016 20:16:58 +0800 Subject: [PATCH 389/436] for issue #1530, accept @JessonChan's suggestion --- cache/README.md | 2 +- cache/cache.go | 4 ++-- cache/cache_test.go | 4 ++-- cache/file.go | 2 +- cache/memcache/memcache.go | 2 +- cache/memcache/memcache_test.go | 2 +- cache/memory.go | 2 +- cache/redis/redis.go | 2 +- cache/redis/redis_test.go | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cache/README.md b/cache/README.md index c8cb7454..957790e7 100644 --- a/cache/README.md +++ b/cache/README.md @@ -26,7 +26,7 @@ Then init a Cache (example with memory adapter) Use it like this: - bm.Put("astaxie", 1, time.Second * 10) + bm.Put("astaxie", 1, 10 * time.Second) bm.Get("astaxie") bm.IsExist("astaxie") bm.Delete("astaxie") diff --git a/cache/cache.go b/cache/cache.go index 78643aea..2008402e 100644 --- a/cache/cache.go +++ b/cache/cache.go @@ -23,7 +23,7 @@ // // Use it like this: // -// bm.Put("astaxie", 1, time.Second * 10) +// bm.Put("astaxie", 1, 10 * time.Second) // bm.Get("astaxie") // bm.IsExist("astaxie") // bm.Delete("astaxie") @@ -40,7 +40,7 @@ import ( // usage: // cache.Register("file",cache.NewFileCache) // this operation is run in init method of file.go. // c,err := cache.NewCache("file","{....}") -// c.Put("key",value, time.Second * 3600) +// c.Put("key",value, 3600 * time.Second) // v := c.Get("key") // // c.Incr("counter") // now is 1 diff --git a/cache/cache_test.go b/cache/cache_test.go index 73e593e9..9ceb606a 100644 --- a/cache/cache_test.go +++ b/cache/cache_test.go @@ -25,7 +25,7 @@ func TestCache(t *testing.T) { if err != nil { t.Error("init err") } - timeoutDuration := time.Second * 10 + timeoutDuration := 10 * time.Second if err = bm.Put("astaxie", 1, timeoutDuration); err != nil { t.Error("set Error", err) } @@ -102,7 +102,7 @@ func TestFileCache(t *testing.T) { if err != nil { t.Error("init err") } - timeoutDuration := time.Second * 10 + timeoutDuration := 10 * time.Second if err = bm.Put("astaxie", 1, timeoutDuration); err != nil { t.Error("set Error", err) } diff --git a/cache/file.go b/cache/file.go index 80f93bce..3a7aa8b0 100644 --- a/cache/file.go +++ b/cache/file.go @@ -147,7 +147,7 @@ func (fc *FileCache) Put(key string, val interface{}, timeout time.Duration) err item := FileCacheItem{Data: val} if timeout == FileCacheEmbedExpiry { - item.Expired = time.Now().Add(time.Second * (86400 * 365 * 10)) // ten years + item.Expired = time.Now().Add((86400 * 365 * 10) * time.Second) // ten years } else { item.Expired = time.Now().Add(timeout) } diff --git a/cache/memcache/memcache.go b/cache/memcache/memcache.go index ea77be38..15ea5d3e 100644 --- a/cache/memcache/memcache.go +++ b/cache/memcache/memcache.go @@ -100,7 +100,7 @@ func (rc *Cache) Put(key string, val interface{}, timeout time.Duration) error { if !ok { return errors.New("val must string") } - item := memcache.Item{Key: key, Value: []byte(v), Expiration: int32(timeout.Seconds())} + item := memcache.Item{Key: key, Value: []byte(v), Expiration: int32(timeout/time.Second)} return rc.conn.Set(&item) } diff --git a/cache/memcache/memcache_test.go b/cache/memcache/memcache_test.go index 93484f6b..19629059 100644 --- a/cache/memcache/memcache_test.go +++ b/cache/memcache/memcache_test.go @@ -28,7 +28,7 @@ func TestMemcacheCache(t *testing.T) { if err != nil { t.Error("init err") } - timeoutDuration := time.Second * 10 + timeoutDuration := 10 * time.Second if err = bm.Put("astaxie", "1", timeoutDuration); err != nil { t.Error("set Error", err) } diff --git a/cache/memory.go b/cache/memory.go index 5ba11b3c..d928afdb 100644 --- a/cache/memory.go +++ b/cache/memory.go @@ -200,7 +200,7 @@ func (bc *MemoryCache) StartAndGC(config string) error { cf = make(map[string]int) cf["interval"] = DefaultEvery } - dur := time.Second * time.Duration(cf["interval"]) + dur := time.Duration(cf["interval"]) * time.Second bc.Every = cf["interval"] bc.dur = dur go bc.vaccuum() diff --git a/cache/redis/redis.go b/cache/redis/redis.go index 316cb423..781e3836 100644 --- a/cache/redis/redis.go +++ b/cache/redis/redis.go @@ -111,7 +111,7 @@ ERROR: // Put put cache to redis. func (rc *Cache) Put(key string, val interface{}, timeout time.Duration) error { var err error - if _, err = rc.do("SETEX", key, int64(timeout.Seconds()), val); err != nil { + if _, err = rc.do("SETEX", key, int64(timeout/time.Second), val); err != nil { return err } diff --git a/cache/redis/redis_test.go b/cache/redis/redis_test.go index 22059508..e51e409b 100644 --- a/cache/redis/redis_test.go +++ b/cache/redis/redis_test.go @@ -28,7 +28,7 @@ func TestRedisCache(t *testing.T) { if err != nil { t.Error("init err") } - timeoutDuration := time.Second * 10 + timeoutDuration := 10 * time.Second if err = bm.Put("astaxie", 1, timeoutDuration); err != nil { t.Error("set Error", err) } From 0c4873884184eac6a135e44b86dd4985df4076c7 Mon Sep 17 00:00:00 2001 From: youngsterxyf Date: Fri, 8 Jan 2016 21:29:12 +0800 Subject: [PATCH 390/436] for issue #1530, fix incompatible bug --- utils/captcha/captcha.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/captcha/captcha.go b/utils/captcha/captcha.go index 76301a03..4ac5c9f9 100644 --- a/utils/captcha/captcha.go +++ b/utils/captcha/captcha.go @@ -64,6 +64,7 @@ import ( "net/http" "path" "strings" + "time" "github.com/astaxie/beego" "github.com/astaxie/beego/cache" @@ -78,7 +79,7 @@ var ( const ( // default captcha attributes challengeNums = 6 - expiration = 600 + expiration = 600 * time.Second fieldIDName = "captcha_id" fieldCaptchaName = "captcha" cachePrefix = "captcha_" @@ -106,7 +107,7 @@ type Captcha struct { ChallengeNums int // captcha expiration seconds - Expiration int64 + Expiration time.Duration // cache key prefix CachePrefix string From d0dd68351a9fc5345469c6367f79b8117a186c8d Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 8 Jan 2016 22:34:23 +0800 Subject: [PATCH 391/436] update travis --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f87802e4..a60b7c84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,8 @@ env: - ORM_DRIVER=mysql - ORM_DRIVER=postgres before_script: - - sh -c "if [ '$ORM_DRIVER' = 'postgres' ]; then export ORM_SOURCE='user=postgres dbname=orm_test sslmode=disable'; psql -c 'create database orm_test;' -U postgres; fi" - - sh -c "if [ '$ORM_DRIVER' = 'mysql' ]; then export ORM_SOURCE='root:@/orm_test?charset=utf8'; mysql -u root -e 'create database orm_test;'; fi" - - sh -c "if [ '$ORM_DRIVER' = 'sqlite' ]; then export ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db; touch $TRAVIS_BUILD_DIR/orm_test.db; fi" + - sh -c "touch $HOME/db.sh; chmod 777 $HOME/db.sh;" + - sh -c "echo \"if [ '$ORM_DRIVER' = 'postgres' ]; then export ORM_SOURCE='user=postgres dbname=orm_test sslmode=disable'; psql -c 'create database orm_test;' -U postgres; fi\" >> $HOME/db.sh;" + - sh -c "echo \"if [ '$ORM_DRIVER' = 'mysql' ]; then export ORM_SOURCE='root:@/orm_test?charset=utf8'; mysql -u root -e 'create database orm_test;'; fi\" >> $HOME/db.sh;" + - sh -c "echo \"if [ '$ORM_DRIVER' = 'sqlite' ]; then export ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db; touch $TRAVIS_BUILD_DIR/orm_test.db; fi\" >> $HOME/db.sh;" + - sh -c "source $HOME/db.sh" From c59bc431e3b87a24c688dd44f7b4493cf27da9ad Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 8 Jan 2016 23:00:22 +0800 Subject: [PATCH 392/436] mulit variable --- .travis.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index a60b7c84..29577b28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,10 @@ services: - postgresql - memcached env: - - ORM_DRIVER=sqlite - - ORM_DRIVER=mysql - - ORM_DRIVER=postgres + - ORM_DRIVER=sqlite ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db + - ORM_DRIVER=mysql ORM_SOURCE="root:@/orm_test?charset=utf8" + - ORM_DRIVER=postgres ORM_SOURCE="user=postgres dbname=orm_test sslmode=disable" before_script: - - sh -c "touch $HOME/db.sh; chmod 777 $HOME/db.sh;" - - sh -c "echo \"if [ '$ORM_DRIVER' = 'postgres' ]; then export ORM_SOURCE='user=postgres dbname=orm_test sslmode=disable'; psql -c 'create database orm_test;' -U postgres; fi\" >> $HOME/db.sh;" - - sh -c "echo \"if [ '$ORM_DRIVER' = 'mysql' ]; then export ORM_SOURCE='root:@/orm_test?charset=utf8'; mysql -u root -e 'create database orm_test;'; fi\" >> $HOME/db.sh;" - - sh -c "echo \"if [ '$ORM_DRIVER' = 'sqlite' ]; then export ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db; touch $TRAVIS_BUILD_DIR/orm_test.db; fi\" >> $HOME/db.sh;" - - sh -c "source $HOME/db.sh" + - sh -c "if [ '$ORM_DRIVER' = 'postgres' ]; then psql -c 'create database orm_test;' -U postgres; fi" + - sh -c "if [ '$ORM_DRIVER' = 'mysql' ]; then mysql -u root -e 'create database orm_test;'; fi" + - sh -c "if [ '$ORM_DRIVER' = 'sqlite' ]; then touch $TRAVIS_BUILD_DIR/orm_test.db; fi" From 1aff26cc318e88d4a22786d24abf2cd22425f8f8 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 8 Jan 2016 23:10:50 +0800 Subject: [PATCH 393/436] add dependence database --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 29577b28..caf0693e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,10 @@ env: - ORM_DRIVER=sqlite ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db - ORM_DRIVER=mysql ORM_SOURCE="root:@/orm_test?charset=utf8" - ORM_DRIVER=postgres ORM_SOURCE="user=postgres dbname=orm_test sslmode=disable" +install: + - go get github.com/lib/pq + - go get github.com/go-sql-driver/mysql + - go get github.com/mattn/go-sqlite3 before_script: - sh -c "if [ '$ORM_DRIVER' = 'postgres' ]; then psql -c 'create database orm_test;' -U postgres; fi" - sh -c "if [ '$ORM_DRIVER' = 'mysql' ]; then mysql -u root -e 'create database orm_test;'; fi" From c7146d22f4e27909b1ede2d48b1b41b239f64685 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 8 Jan 2016 23:20:25 +0800 Subject: [PATCH 394/436] add all dependence --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index caf0693e..7b566d9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,14 @@ install: - go get github.com/lib/pq - go get github.com/go-sql-driver/mysql - go get github.com/mattn/go-sqlite3 + - go get github.com/bradfitz/gomemcache/memcache + - go get github.com/garyburd/redigo/redis + - go get github.com/beego/x2j + - go get github.com/beego/goyaml2 + - go get github.com/belogik/goes + - go get github.com/couchbase/go-couchbase + - go get github.com/siddontang/ledisdb/config + - go get github.com/siddontang/ledisdb/ledis before_script: - sh -c "if [ '$ORM_DRIVER' = 'postgres' ]; then psql -c 'create database orm_test;' -U postgres; fi" - sh -c "if [ '$ORM_DRIVER' = 'mysql' ]; then mysql -u root -e 'create database orm_test;'; fi" From dc278da17c34d8f2892fcfb2e3158e6f05a66f64 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 8 Jan 2016 23:30:19 +0800 Subject: [PATCH 395/436] fix the sqlite3 & cache sleep 11 second --- .travis.yml | 2 +- cache/redis/redis_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7b566d9b..c59cef61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ services: - postgresql - memcached env: - - ORM_DRIVER=sqlite ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db + - ORM_DRIVER=sqlite3 ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db - ORM_DRIVER=mysql ORM_SOURCE="root:@/orm_test?charset=utf8" - ORM_DRIVER=postgres ORM_SOURCE="user=postgres dbname=orm_test sslmode=disable" install: diff --git a/cache/redis/redis_test.go b/cache/redis/redis_test.go index 1f74fd27..142b6d3c 100644 --- a/cache/redis/redis_test.go +++ b/cache/redis/redis_test.go @@ -35,7 +35,7 @@ func TestRedisCache(t *testing.T) { t.Error("check err") } - time.Sleep(10 * time.Second) + time.Sleep(11 * time.Second) if bm.IsExist("astaxie") { t.Error("check err") From 391f897eb17430028ebadd31a13492c190adf559 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 11 Jan 2016 16:49:56 +0800 Subject: [PATCH 396/436] simplify sessionID --- session/session.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/session/session.go b/session/session.go index 1a58ab13..39d475fc 100644 --- a/session/session.go +++ b/session/session.go @@ -20,7 +20,7 @@ // ) // // func init() { -// globalSessions, _ = session.NewManager("memory", `{"cookieName":"gosessionid", "enableSetCookie,omitempty": true, "gclifetime":3600, "maxLifetime": 3600, "secure": false, "sessionIDHashFunc": "sha1", "sessionIDHashKey": "", "cookieLifeTime": 3600, "providerConfig": ""}`) +// globalSessions, _ = session.NewManager("memory", `{"cookieName":"gosessionid", "enableSetCookie,omitempty": true, "gclifetime":3600, "maxLifetime": 3600, "secure": false, "cookieLifeTime": 3600, "providerConfig": ""}`) // go globalSessions.GC() // } // @@ -169,7 +169,7 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se } // Generate a new session - sid, errs = manager.sessionID(r) + sid, errs = manager.sessionID() if errs != nil { return nil, errs } @@ -229,7 +229,7 @@ func (manager *Manager) GC() { // SessionRegenerateID Regenerate a session id for this SessionStore who's id is saving in http request. func (manager *Manager) SessionRegenerateID(w http.ResponseWriter, r *http.Request) (session Store) { - sid, err := manager.sessionID(r) + sid, err := manager.sessionID() if err != nil { return } @@ -272,7 +272,7 @@ func (manager *Manager) SetSecure(secure bool) { manager.config.Secure = secure } -func (manager *Manager) sessionID(r *http.Request) (string, error) { +func (manager *Manager) sessionID() (string, error) { b := make([]byte, manager.config.SessionIDLength) n, err := rand.Read(b) if n != len(b) || err != nil { From e32e3a759c4c06bbfa0f30acacde90426f1edf81 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 12 Jan 2016 17:46:10 +0800 Subject: [PATCH 397/436] console type no need to bench --- logs/console_test.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/logs/console_test.go b/logs/console_test.go index 2fad7241..c4bb1da2 100644 --- a/logs/console_test.go +++ b/logs/console_test.go @@ -43,11 +43,3 @@ func TestConsole(t *testing.T) { testConsoleCalls(log2) } -func BenchmarkConsole(b *testing.B) { - log := NewLogger(10000) - log.EnableFuncCallDepth(true) - log.SetLogger("console", "") - for i := 0; i < b.N; i++ { - log.Debug("debug") - } -} From c9b890b10ee0949dc2e70997faa300774f914edf Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 12 Jan 2016 17:59:23 +0800 Subject: [PATCH 398/436] add asynchronous benchmark --- logs/file_test.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/logs/file_test.go b/logs/file_test.go index 97260f12..f7929942 100644 --- a/logs/file_test.go +++ b/logs/file_test.go @@ -131,3 +131,13 @@ func BenchmarkFile(b *testing.B) { } os.Remove("test4.log") } + +func BenchmarkAsynchronousFile(b *testing.B) { + log := NewLogger(100000) + log.SetLogger("file", `{"filename":"test4.log"}`) + log.Async() + for i := 0; i < b.N; i++ { + log.Debug("debug") + } + os.Remove("test4.log") +} From 2479e61db99f753104b4506d47733975c6fbcedd Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 12 Jan 2016 19:09:00 +0800 Subject: [PATCH 399/436] add asynchronous and call depth benchmark --- logs/file_test.go | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/logs/file_test.go b/logs/file_test.go index f7929942..d03d3ca5 100644 --- a/logs/file_test.go +++ b/logs/file_test.go @@ -141,3 +141,26 @@ func BenchmarkAsynchronousFile(b *testing.B) { } os.Remove("test4.log") } + +func BenchmarkCallDepthFile(b *testing.B) { + log := NewLogger(100000) + log.SetLogger("file", `{"filename":"test4.log"}`) + log.EnableFuncCallDepth(true) + log.SetLogFuncCallDepth(2) + for i := 0; i < b.N; i++ { + log.Debug("debug") + } + os.Remove("test4.log") +} + +func BenchmarkAsynchronousCallDepthFile(b *testing.B) { + log := NewLogger(100000) + log.SetLogger("file", `{"filename":"test4.log"}`) + log.EnableFuncCallDepth(true) + log.SetLogFuncCallDepth(2) + log.Async() + for i := 0; i < b.N; i++ { + log.Debug("debug") + } + os.Remove("test4.log") +} From 9507e59c2f9155045d58bb2e8e40572f621f4b2f Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 12 Jan 2016 19:10:08 +0800 Subject: [PATCH 400/436] camel name fixed --- logs/file.go | 72 ++++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/logs/file.go b/logs/file.go index 9596258c..abc700cf 100644 --- a/logs/file.go +++ b/logs/file.go @@ -32,29 +32,29 @@ import ( // It writes messages by lines limit, file size limit, or time frequency. type fileLogWriter struct { *log.Logger - mw *MuxWriter + mw *MuxWriter // The opened file - Filename string `json:"filename"` + Filename string `json:"filename"` - Maxlines int `json:"maxlines"` - maxlinesCurlines int + MaxLines int `json:"maxlines"` + maxLinesCurLines int // Rotate at size - Maxsize int `json:"maxsize"` - maxsizeCursize int + MaxSize int `json:"maxsize"` + maxSizeCurSize int // Rotate daily - Daily bool `json:"daily"` - Maxdays int64 `json:"maxdays"` - dailyOpendate int + Daily bool `json:"daily"` + MaxDays int64 `json:"maxdays"` + dailyOpenDate int - Rotate bool `json:"rotate"` + Rotate bool `json:"rotate"` - startLock sync.Mutex // Only one log can write to the file + startLock sync.Mutex // Only one log can write to the file - Level int `json:"level"` + Level int `json:"level"` - Perm os.FileMode `json:"perm"` + Perm os.FileMode `json:"perm"` } // MuxWriter is an *os.File writer with locker. @@ -63,7 +63,7 @@ type MuxWriter struct { fd *os.File } -// write to os.File. +// Write to os.File. func (l *MuxWriter) Write(b []byte) (int, error) { l.Lock() defer l.Unlock() @@ -82,10 +82,10 @@ func (l *MuxWriter) SetFd(fd *os.File) { func newFileWriter() Logger { w := &fileLogWriter{ Filename: "", - Maxlines: 1000000, - Maxsize: 1 << 28, //256 MB + MaxLines: 1000000, + MaxSize: 1 << 28, //256 MB Daily: true, - Maxdays: 7, + MaxDays: 7, Rotate: true, Level: LevelTrace, Perm: 0660, @@ -98,18 +98,18 @@ func newFileWriter() Logger { } // Init file logger with json config. -// jsonconfig like: +// jsonConfig like: // { // "filename":"logs/beego.log", -// "maxlines":10000, +// "maxLines":10000, // "maxsize":1<<30, // "daily":true, -// "maxdays":15, +// "maxDays":15, // "rotate":true, -// "perm":0600 +// "perm":0600 // } -func (w *fileLogWriter) Init(jsonconfig string) error { - err := json.Unmarshal([]byte(jsonconfig), w) +func (w *fileLogWriter) Init(jsonConfig string) error { + err := json.Unmarshal([]byte(jsonConfig), w) if err != nil { return err } @@ -130,19 +130,19 @@ func (w *fileLogWriter) startLogger() error { return w.initFd() } -func (w *fileLogWriter) docheck(size int) { +func (w *fileLogWriter) doCheck(size int) { w.startLock.Lock() defer w.startLock.Unlock() - if w.Rotate && ((w.Maxlines > 0 && w.maxlinesCurlines >= w.Maxlines) || - (w.Maxsize > 0 && w.maxsizeCursize >= w.Maxsize) || - (w.Daily && time.Now().Day() != w.dailyOpendate)) { + if w.Rotate && ((w.MaxLines > 0 && w.maxLinesCurLines >= w.MaxLines) || + (w.MaxSize > 0 && w.maxSizeCurSize >= w.MaxSize) || + (w.Daily && time.Now().Day() != w.dailyOpenDate)) { if err := w.DoRotate(); err != nil { fmt.Fprintf(os.Stderr, "FileLogWriter(%q): %s\n", w.Filename, err) return } } - w.maxlinesCurlines++ - w.maxsizeCursize += size + w.maxLinesCurLines++ + w.maxSizeCurSize += size } // WriteMsg write logger message into file. @@ -151,7 +151,7 @@ func (w *fileLogWriter) WriteMsg(msg string, level int) error { return nil } n := 24 + len(msg) // 24 stand for the length "2013/06/23 21:00:22 [T] " - w.docheck(n) + w.doCheck(n) w.Logger.Println(msg) return nil } @@ -168,15 +168,15 @@ func (w *fileLogWriter) initFd() error { if err != nil { return fmt.Errorf("get stat err: %s\n", err) } - w.maxsizeCursize = int(finfo.Size()) - w.dailyOpendate = time.Now().Day() - w.maxlinesCurlines = 0 + w.maxSizeCurSize = int(finfo.Size()) + w.dailyOpenDate = time.Now().Day() + w.maxLinesCurLines = 0 if finfo.Size() > 0 { count, err := w.lines() if err != nil { return err } - w.maxlinesCurlines = count + w.maxLinesCurLines = count } return nil } @@ -266,7 +266,7 @@ func (w *fileLogWriter) deleteOldLog() { } }() - if !info.IsDir() && info.ModTime().Unix() < (time.Now().Unix()-60*60*24*w.Maxdays) { + if !info.IsDir() && info.ModTime().Unix() < (time.Now().Unix()-60*60*24*w.MaxDays) { if strings.HasPrefix(filepath.Base(path), filepath.Base(w.Filename)) { os.Remove(path) } @@ -275,7 +275,7 @@ func (w *fileLogWriter) deleteOldLog() { }) } -// Destroy close the file desciption, close file writer. +// Destroy close the file description, close file writer. func (w *fileLogWriter) Destroy() { w.mw.fd.Close() } From 5511e03b5225ae1a203b02154ffb98638680e8b8 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 12 Jan 2016 19:25:33 +0800 Subject: [PATCH 401/436] embedding file writer --- logs/file.go | 67 ++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/logs/file.go b/logs/file.go index abc700cf..193a7cc6 100644 --- a/logs/file.go +++ b/logs/file.go @@ -32,32 +32,32 @@ import ( // It writes messages by lines limit, file size limit, or time frequency. type fileLogWriter struct { *log.Logger - mw *MuxWriter + *MuxWriter // The opened file - Filename string `json:"filename"` + Filename string `json:"filename"` MaxLines int `json:"maxlines"` maxLinesCurLines int // Rotate at size - MaxSize int `json:"maxsize"` - maxSizeCurSize int + MaxSize int `json:"maxsize"` + maxSizeCurSize int // Rotate daily - Daily bool `json:"daily"` - MaxDays int64 `json:"maxdays"` - dailyOpenDate int + Daily bool `json:"daily"` + MaxDays int64 `json:"maxdays"` + dailyOpenDate int - Rotate bool `json:"rotate"` + Rotate bool `json:"rotate"` - startLock sync.Mutex // Only one log can write to the file + startLock sync.Mutex // Only one log can write to the file - Level int `json:"level"` + Level int `json:"level"` - Perm os.FileMode `json:"perm"` + Perm os.FileMode `json:"perm"` } -// MuxWriter is an *os.File writer with locker. +// MuxWriter is an *os.File writer with locker,lock write when rotate type MuxWriter struct { sync.Mutex fd *os.File @@ -81,19 +81,18 @@ func (l *MuxWriter) SetFd(fd *os.File) { // NewFileWriter create a FileLogWriter returning as LoggerInterface. func newFileWriter() Logger { w := &fileLogWriter{ - Filename: "", - MaxLines: 1000000, - MaxSize: 1 << 28, //256 MB - Daily: true, - MaxDays: 7, - Rotate: true, - Level: LevelTrace, - Perm: 0660, + Filename: "", + MaxLines: 1000000, + MaxSize: 1 << 28, //256 MB + Daily: true, + MaxDays: 7, + Rotate: true, + Level: LevelTrace, + Perm: 0660, + MuxWriter: new(MuxWriter), } - // use MuxWriter instead direct use os.File for lock write when rotate - w.mw = new(MuxWriter) // set MuxWriter as Logger's io.Writer - w.Logger = log.New(w.mw, "", log.Ldate|log.Ltime) + w.Logger = log.New(w, "", log.Ldate|log.Ltime) return w } @@ -126,7 +125,7 @@ func (w *fileLogWriter) startLogger() error { if err != nil { return err } - w.mw.SetFd(fd) + w.SetFd(fd) return w.initFd() } @@ -163,7 +162,7 @@ func (w *fileLogWriter) createLogFile() (*os.File, error) { } func (w *fileLogWriter) initFd() error { - fd := w.mw.fd + fd := w.fd finfo, err := fd.Stat() if err != nil { return fmt.Errorf("get stat err: %s\n", err) @@ -215,15 +214,15 @@ func (w *fileLogWriter) DoRotate() error { if err == nil { // file exists // Find the next available number num := 1 - fname := "" + fName := "" suffix := filepath.Ext(w.Filename) filenameOnly := strings.TrimSuffix(w.Filename, suffix) if suffix == "" { suffix = ".log" } for ; err == nil && num <= 999; num++ { - fname = filenameOnly + fmt.Sprintf(".%s.%03d%s", time.Now().Format("2006-01-02"), num, suffix) - _, err = os.Lstat(fname) + fName = filenameOnly + fmt.Sprintf(".%s.%03d%s", time.Now().Format("2006-01-02"), num, suffix) + _, err = os.Lstat(fName) } // return error if the last file checked still existed if err == nil { @@ -231,15 +230,15 @@ func (w *fileLogWriter) DoRotate() error { } // block Logger's io.Writer - w.mw.Lock() - defer w.mw.Unlock() + w.Lock() + defer w.Unlock() - fd := w.mw.fd + fd := w.fd fd.Close() // close fd before rename // Rename the file to its newfound home - err = os.Rename(w.Filename, fname) + err = os.Rename(w.Filename, fName) if err != nil { return fmt.Errorf("Rotate: %s\n", err) } @@ -277,14 +276,14 @@ func (w *fileLogWriter) deleteOldLog() { // Destroy close the file description, close file writer. func (w *fileLogWriter) Destroy() { - w.mw.fd.Close() + w.fd.Close() } // Flush flush file logger. // there are no buffering messages in file logger in memory. // flush file means sync file from disk. func (w *fileLogWriter) Flush() { - w.mw.fd.Sync() + w.fd.Sync() } func init() { From baa2e9d64a5eae33e5246a07cf5d106d5d1da653 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 12 Jan 2016 19:44:28 +0800 Subject: [PATCH 402/436] code format --- logs/file.go | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/logs/file.go b/logs/file.go index 193a7cc6..16c23de5 100644 --- a/logs/file.go +++ b/logs/file.go @@ -131,17 +131,20 @@ func (w *fileLogWriter) startLogger() error { func (w *fileLogWriter) doCheck(size int) { w.startLock.Lock() - defer w.startLock.Unlock() - if w.Rotate && ((w.MaxLines > 0 && w.maxLinesCurLines >= w.MaxLines) || - (w.MaxSize > 0 && w.maxSizeCurSize >= w.MaxSize) || - (w.Daily && time.Now().Day() != w.dailyOpenDate)) { - if err := w.DoRotate(); err != nil { - fmt.Fprintf(os.Stderr, "FileLogWriter(%q): %s\n", w.Filename, err) - return + if w.Rotate { + if (w.MaxLines > 0 && w.maxLinesCurLines >= w.MaxLines) || + (w.MaxSize > 0 && w.maxSizeCurSize >= w.MaxSize) || + (w.Daily && time.Now().Day() != w.dailyOpenDate) { + if err := w.DoRotate(); err != nil { + fmt.Fprintf(os.Stderr, "FileLogWriter(%q): %s\n", w.Filename, err) + w.startLock.Unlock() + return + } } } w.maxLinesCurLines++ w.maxSizeCurSize += size + w.startLock.Unlock() } // WriteMsg write logger message into file. @@ -163,14 +166,14 @@ func (w *fileLogWriter) createLogFile() (*os.File, error) { func (w *fileLogWriter) initFd() error { fd := w.fd - finfo, err := fd.Stat() + fInfo, err := fd.Stat() if err != nil { return fmt.Errorf("get stat err: %s\n", err) } - w.maxSizeCurSize = int(finfo.Size()) + w.maxSizeCurSize = int(fInfo.Size()) w.dailyOpenDate = time.Now().Day() w.maxLinesCurLines = 0 - if finfo.Size() > 0 { + if fInfo.Size() > 0 { count, err := w.lines() if err != nil { return err @@ -211,7 +214,8 @@ func (w *fileLogWriter) lines() (int, error) { // new file name like xx.2013-01-01.2.log func (w *fileLogWriter) DoRotate() error { _, err := os.Lstat(w.Filename) - if err == nil { // file exists + if err == nil { + // file exists // Find the next available number num := 1 fName := "" @@ -237,7 +241,7 @@ func (w *fileLogWriter) DoRotate() error { fd.Close() // close fd before rename - // Rename the file to its newfound home + // Rename the file to its new found name err = os.Rename(w.Filename, fName) if err != nil { return fmt.Errorf("Rotate: %s\n", err) @@ -260,8 +264,7 @@ func (w *fileLogWriter) deleteOldLog() { filepath.Walk(dir, func(path string, info os.FileInfo, err error) (returnErr error) { defer func() { if r := recover(); r != nil { - returnErr = fmt.Errorf("Unable to delete old log '%s', error: %+v", path, r) - fmt.Println(returnErr) + fmt.Fprintf(os.Stderr, "Unable to delete old log '%s', error: %+v", path, r) } }() From 482b7a62bda3ec44cacc3949f579ff1e05960341 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 12 Jan 2016 21:05:06 +0800 Subject: [PATCH 403/436] use array not map --- logs/log.go | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/logs/log.go b/logs/log.go index 28b5937c..7e6e1f15 100644 --- a/logs/log.go +++ b/logs/log.go @@ -35,6 +35,7 @@ package logs import ( "fmt" + "os" "path" "runtime" "sync" @@ -95,7 +96,12 @@ type BeeLogger struct { loggerFuncCallDepth int asynchronous bool msg chan *logMsg - outputs map[string]Logger + outputs []*nameLogger +} + +type nameLogger struct { + Logger + name string } type logMsg struct { @@ -104,14 +110,13 @@ type logMsg struct { } // NewLogger returns a new BeeLogger. -// channellen means the number of messages in chan. +// channelLen means the number of messages in chan(used where asynchronous is true). // if the buffering chan is full, logger adapters write to file or other way. -func NewLogger(channellen int64) *BeeLogger { +func NewLogger(channelLen int64) *BeeLogger { bl := new(BeeLogger) bl.level = LevelDebug bl.loggerFuncCallDepth = 2 - bl.msg = make(chan *logMsg, channellen) - bl.outputs = make(map[string]Logger) + bl.msg = make(chan *logMsg, channelLen) return bl } @@ -124,33 +129,40 @@ func (bl *BeeLogger) Async() *BeeLogger { // SetLogger provides a given logger adapter into BeeLogger with config string. // config need to be correct JSON as string: {"interval":360}. -func (bl *BeeLogger) SetLogger(adaptername string, config string) error { +func (bl *BeeLogger) SetLogger(adapterName string, config string) error { bl.lock.Lock() defer bl.lock.Unlock() - if log, ok := adapters[adaptername]; ok { + if log, ok := adapters[adapterName]; ok { lg := log() err := lg.Init(config) - bl.outputs[adaptername] = lg if err != nil { - fmt.Println("logs.BeeLogger.SetLogger: " + err.Error()) + fmt.Fprintln(os.Stderr, "logs.BeeLogger.SetLogger: "+err.Error()) return err } + bl.outputs = append(bl.outputs, &nameLogger{name: adapterName, Logger: lg}) } else { - return fmt.Errorf("logs: unknown adaptername %q (forgotten Register?)", adaptername) + return fmt.Errorf("logs: unknown adaptername %q (forgotten Register?)", adapterName) } return nil } // DelLogger remove a logger adapter in BeeLogger. -func (bl *BeeLogger) DelLogger(adaptername string) error { +func (bl *BeeLogger) DelLogger(adapterName string) error { bl.lock.Lock() defer bl.lock.Unlock() - if lg, ok := bl.outputs[adaptername]; ok { - lg.Destroy() - delete(bl.outputs, adaptername) - return nil + outputs := []*nameLogger{} + for _, lg := range bl.outputs { + if lg.name == adapterName { + lg.Destroy() + } else { + outputs = append(outputs, lg) + } } - return fmt.Errorf("logs: unknown adaptername %q (forgotten Register?)", adaptername) + if len(outputs) == len(bl.outputs) { + return fmt.Errorf("logs: unknown adaptername %q (forgotten Register?)", adapterName) + } + bl.outputs = outputs + return nil } func (bl *BeeLogger) writerMsg(loglevel int, msg string) error { @@ -170,10 +182,10 @@ func (bl *BeeLogger) writerMsg(loglevel int, msg string) error { if bl.asynchronous { bl.msg <- lm } else { - for name, l := range bl.outputs { + for _, l := range bl.outputs { err := l.WriteMsg(lm.msg, lm.level) if err != nil { - fmt.Println("unable to WriteMsg to adapter:", name, err) + fmt.Println("unable to WriteMsg to adapter:", l.name, err) return err } } From 12e7f0f94a754879d1343ce8f040481bb170943d Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 12 Jan 2016 21:15:25 +0800 Subject: [PATCH 404/436] extract a func to write to every logger --- logs/log.go | 55 +++++++++++++++++++++++------------------------------ 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/logs/log.go b/logs/log.go index 7e6e1f15..295b0811 100644 --- a/logs/log.go +++ b/logs/log.go @@ -165,7 +165,16 @@ func (bl *BeeLogger) DelLogger(adapterName string) error { return nil } -func (bl *BeeLogger) writerMsg(loglevel int, msg string) error { +func (bl *BeeLogger) writeToLoggers(msg string, level int) { + for _, l := range bl.outputs { + err := l.WriteMsg(msg, level) + if err != nil { + fmt.Fprintf(os.Stderr, "unable to WriteMsg to adapter:%v,error:%v\n", l.name, err) + } + } +} + +func (bl *BeeLogger) writeMsg(loglevel int, msg string) error { lm := new(logMsg) lm.level = loglevel if bl.enableFuncCallDepth { @@ -182,13 +191,7 @@ func (bl *BeeLogger) writerMsg(loglevel int, msg string) error { if bl.asynchronous { bl.msg <- lm } else { - for _, l := range bl.outputs { - err := l.WriteMsg(lm.msg, lm.level) - if err != nil { - fmt.Println("unable to WriteMsg to adapter:", l.name, err) - return err - } - } + bl.writeToLoggers(msg, loglevel) } return nil } @@ -221,12 +224,7 @@ func (bl *BeeLogger) startLogger() { for { select { case bm := <-bl.msg: - for _, l := range bl.outputs { - err := l.WriteMsg(bm.msg, bm.level) - if err != nil { - fmt.Println("ERROR, unable to WriteMsg:", err) - } - } + bl.writeToLoggers(bm.msg, bm.level) } } } @@ -237,7 +235,7 @@ func (bl *BeeLogger) Emergency(format string, v ...interface{}) { return } msg := fmt.Sprintf("[M] "+format, v...) - bl.writerMsg(LevelEmergency, msg) + bl.writeMsg(LevelEmergency, msg) } // Alert Log ALERT level message. @@ -246,7 +244,7 @@ func (bl *BeeLogger) Alert(format string, v ...interface{}) { return } msg := fmt.Sprintf("[A] "+format, v...) - bl.writerMsg(LevelAlert, msg) + bl.writeMsg(LevelAlert, msg) } // Critical Log CRITICAL level message. @@ -255,7 +253,7 @@ func (bl *BeeLogger) Critical(format string, v ...interface{}) { return } msg := fmt.Sprintf("[C] "+format, v...) - bl.writerMsg(LevelCritical, msg) + bl.writeMsg(LevelCritical, msg) } // Error Log ERROR level message. @@ -264,7 +262,7 @@ func (bl *BeeLogger) Error(format string, v ...interface{}) { return } msg := fmt.Sprintf("[E] "+format, v...) - bl.writerMsg(LevelError, msg) + bl.writeMsg(LevelError, msg) } // Warning Log WARNING level message. @@ -273,7 +271,7 @@ func (bl *BeeLogger) Warning(format string, v ...interface{}) { return } msg := fmt.Sprintf("[W] "+format, v...) - bl.writerMsg(LevelWarning, msg) + bl.writeMsg(LevelWarning, msg) } // Notice Log NOTICE level message. @@ -282,7 +280,7 @@ func (bl *BeeLogger) Notice(format string, v ...interface{}) { return } msg := fmt.Sprintf("[N] "+format, v...) - bl.writerMsg(LevelNotice, msg) + bl.writeMsg(LevelNotice, msg) } // Informational Log INFORMATIONAL level message. @@ -291,7 +289,7 @@ func (bl *BeeLogger) Informational(format string, v ...interface{}) { return } msg := fmt.Sprintf("[I] "+format, v...) - bl.writerMsg(LevelInformational, msg) + bl.writeMsg(LevelInformational, msg) } // Debug Log DEBUG level message. @@ -300,7 +298,7 @@ func (bl *BeeLogger) Debug(format string, v ...interface{}) { return } msg := fmt.Sprintf("[D] "+format, v...) - bl.writerMsg(LevelDebug, msg) + bl.writeMsg(LevelDebug, msg) } // Warn Log WARN level message. @@ -310,7 +308,7 @@ func (bl *BeeLogger) Warn(format string, v ...interface{}) { return } msg := fmt.Sprintf("[W] "+format, v...) - bl.writerMsg(LevelWarning, msg) + bl.writeMsg(LevelWarning, msg) } // Info Log INFO level message. @@ -320,7 +318,7 @@ func (bl *BeeLogger) Info(format string, v ...interface{}) { return } msg := fmt.Sprintf("[I] "+format, v...) - bl.writerMsg(LevelInformational, msg) + bl.writeMsg(LevelInformational, msg) } // Trace Log TRACE level message. @@ -330,7 +328,7 @@ func (bl *BeeLogger) Trace(format string, v ...interface{}) { return } msg := fmt.Sprintf("[D] "+format, v...) - bl.writerMsg(LevelDebug, msg) + bl.writeMsg(LevelDebug, msg) } // Flush flush all chan data. @@ -345,12 +343,7 @@ func (bl *BeeLogger) Close() { for { if len(bl.msg) > 0 { bm := <-bl.msg - for _, l := range bl.outputs { - err := l.WriteMsg(bm.msg, bm.level) - if err != nil { - fmt.Println("ERROR, unable to WriteMsg (while closing logger):", err) - } - } + bl.writeToLoggers(bm.msg, bm.level) continue } break From 6660720ce6dd1f09a21d58e87a509330f3367edf Mon Sep 17 00:00:00 2001 From: astaxie Date: Tue, 12 Jan 2016 21:55:02 +0800 Subject: [PATCH 405/436] update some config name --- admin.go | 6 +++--- app.go | 8 ++++---- config.go | 30 +++++++++++++++--------------- hooks.go | 4 ++-- router.go | 4 ++-- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/admin.go b/admin.go index d143c212..0b45cf8a 100644 --- a/admin.go +++ b/admin.go @@ -104,15 +104,15 @@ func listConf(rw http.ResponseWriter, r *http.Request) { m["BConfig.Listen.Graceful"] = BConfig.Listen.Graceful m["BConfig.Listen.ServerTimeOut"] = BConfig.Listen.ServerTimeOut m["BConfig.Listen.ListenTCP4"] = BConfig.Listen.ListenTCP4 - m["BConfig.Listen.HTTPEnable"] = BConfig.Listen.HTTPEnable + m["BConfig.Listen.EnableHTTP"] = BConfig.Listen.EnableHTTP m["BConfig.Listen.HTTPAddr"] = BConfig.Listen.HTTPAddr m["BConfig.Listen.HTTPPort"] = BConfig.Listen.HTTPPort - m["BConfig.Listen.HTTPSEnable"] = BConfig.Listen.HTTPSEnable + m["BConfig.Listen.EnableHTTPS"] = BConfig.Listen.EnableHTTPS m["BConfig.Listen.HTTPSAddr"] = BConfig.Listen.HTTPSAddr m["BConfig.Listen.HTTPSPort"] = BConfig.Listen.HTTPSPort m["BConfig.Listen.HTTPSCertFile"] = BConfig.Listen.HTTPSCertFile m["BConfig.Listen.HTTPSKeyFile"] = BConfig.Listen.HTTPSKeyFile - m["BConfig.Listen.AdminEnable"] = BConfig.Listen.AdminEnable + m["BConfig.Listen.EnableAdmin"] = BConfig.Listen.EnableAdmin m["BConfig.Listen.AdminAddr"] = BConfig.Listen.AdminAddr m["BConfig.Listen.AdminPort"] = BConfig.Listen.AdminPort m["BConfig.Listen.EnableFcgi"] = BConfig.Listen.EnableFcgi diff --git a/app.go b/app.go index 548bff66..af54ea4b 100644 --- a/app.go +++ b/app.go @@ -100,7 +100,7 @@ func (app *App) Run() { if BConfig.Listen.Graceful { httpsAddr := BConfig.Listen.HTTPSAddr app.Server.Addr = httpsAddr - if BConfig.Listen.HTTPSEnable { + if BConfig.Listen.EnableHTTPS { go func() { time.Sleep(20 * time.Microsecond) if BConfig.Listen.HTTPSPort != 0 { @@ -117,7 +117,7 @@ func (app *App) Run() { } }() } - if BConfig.Listen.HTTPEnable { + if BConfig.Listen.EnableHTTP { go func() { server := grace.NewServer(addr, app.Handlers) server.Server.ReadTimeout = app.Server.ReadTimeout @@ -138,7 +138,7 @@ func (app *App) Run() { // run normal mode app.Server.Addr = addr - if BConfig.Listen.HTTPSEnable { + if BConfig.Listen.EnableHTTPS { go func() { time.Sleep(20 * time.Microsecond) if BConfig.Listen.HTTPSPort != 0 { @@ -152,7 +152,7 @@ func (app *App) Run() { } }() } - if BConfig.Listen.HTTPEnable { + if BConfig.Listen.EnableHTTP { go func() { app.Server.Addr = addr BeeLogger.Info("http server Running on %s", app.Server.Addr) diff --git a/config.go b/config.go index a5229c85..66702872 100644 --- a/config.go +++ b/config.go @@ -44,15 +44,15 @@ type Listen struct { Graceful bool // Graceful means use graceful module to start the server ServerTimeOut int64 ListenTCP4 bool - HTTPEnable bool + EnableHTTP bool HTTPAddr string HTTPPort int - HTTPSEnable bool + EnableHTTPS bool HTTPSAddr string HTTPSPort int HTTPSCertFile string HTTPSKeyFile string - AdminEnable bool + EnableAdmin bool AdminAddr string AdminPort int EnableFcgi bool @@ -123,15 +123,15 @@ func init() { Graceful: false, ServerTimeOut: 0, ListenTCP4: false, - HTTPEnable: true, + EnableHTTP: true, HTTPAddr: "", HTTPPort: 8080, - HTTPSEnable: false, + EnableHTTPS: false, HTTPSAddr: "", HTTPSPort: 10443, HTTPSCertFile: "", HTTPSKeyFile: "", - AdminEnable: false, + EnableAdmin: false, AdminAddr: "", AdminPort: 8088, EnableFcgi: false, @@ -196,7 +196,7 @@ func ParseConfig() (err error) { BConfig.AppName = AppConfig.DefaultString("AppName", BConfig.AppName) BConfig.RecoverPanic = AppConfig.DefaultBool("RecoverPanic", BConfig.RecoverPanic) BConfig.RouterCaseSensitive = AppConfig.DefaultBool("RouterCaseSensitive", BConfig.RouterCaseSensitive) - BConfig.ServerName = AppConfig.DefaultString("BeegoServerName", BConfig.ServerName) + BConfig.ServerName = AppConfig.DefaultString("ServerName", BConfig.ServerName) BConfig.EnableGzip = AppConfig.DefaultBool("EnableGzip", BConfig.EnableGzip) BConfig.EnableErrorsShow = AppConfig.DefaultBool("EnableErrorsShow", BConfig.EnableErrorsShow) BConfig.CopyRequestBody = AppConfig.DefaultBool("CopyRequestBody", BConfig.CopyRequestBody) @@ -205,18 +205,18 @@ func ParseConfig() (err error) { BConfig.Listen.HTTPAddr = AppConfig.String("HTTPAddr") BConfig.Listen.HTTPPort = AppConfig.DefaultInt("HTTPPort", BConfig.Listen.HTTPPort) BConfig.Listen.ListenTCP4 = AppConfig.DefaultBool("ListenTCP4", BConfig.Listen.ListenTCP4) - BConfig.Listen.HTTPEnable = AppConfig.DefaultBool("EnableHTTPListen", BConfig.Listen.HTTPEnable) - BConfig.Listen.HTTPSEnable = AppConfig.DefaultBool("EnableHTTPTLS", BConfig.Listen.HTTPSEnable) + BConfig.Listen.EnableHTTP = AppConfig.DefaultBool("EnableHTTP", BConfig.Listen.EnableHTTP) + BConfig.Listen.EnableHTTPS = AppConfig.DefaultBool("EnableHTTPS", BConfig.Listen.EnableHTTPS) BConfig.Listen.HTTPSAddr = AppConfig.DefaultString("HTTPSAddr", BConfig.Listen.HTTPSAddr) BConfig.Listen.HTTPSPort = AppConfig.DefaultInt("HTTPSPort", BConfig.Listen.HTTPSPort) - BConfig.Listen.HTTPSCertFile = AppConfig.DefaultString("HTTPCertFile", BConfig.Listen.HTTPSCertFile) - BConfig.Listen.HTTPSKeyFile = AppConfig.DefaultString("HTTPKeyFile", BConfig.Listen.HTTPSKeyFile) - BConfig.Listen.AdminEnable = AppConfig.DefaultBool("EnableAdmin", BConfig.Listen.AdminEnable) - BConfig.Listen.AdminAddr = AppConfig.DefaultString("AdminHTTPAddr", BConfig.Listen.AdminAddr) - BConfig.Listen.AdminPort = AppConfig.DefaultInt("AdminHTTPPort", BConfig.Listen.AdminPort) + BConfig.Listen.HTTPSCertFile = AppConfig.DefaultString("HTTPSCertFile", BConfig.Listen.HTTPSCertFile) + BConfig.Listen.HTTPSKeyFile = AppConfig.DefaultString("HTTPSKeyFile", BConfig.Listen.HTTPSKeyFile) + BConfig.Listen.EnableAdmin = AppConfig.DefaultBool("EnableAdmin", BConfig.Listen.EnableAdmin) + BConfig.Listen.AdminAddr = AppConfig.DefaultString("AdminAddr", BConfig.Listen.AdminAddr) + BConfig.Listen.AdminPort = AppConfig.DefaultInt("AdminPort", BConfig.Listen.AdminPort) BConfig.Listen.EnableFcgi = AppConfig.DefaultBool("EnableFcgi", BConfig.Listen.EnableFcgi) BConfig.Listen.EnableStdIo = AppConfig.DefaultBool("EnableStdIo", BConfig.Listen.EnableStdIo) - BConfig.Listen.ServerTimeOut = AppConfig.DefaultInt64("HTTPServerTimeOut", BConfig.Listen.ServerTimeOut) + BConfig.Listen.ServerTimeOut = AppConfig.DefaultInt64("ServerTimeOut", BConfig.Listen.ServerTimeOut) BConfig.WebConfig.AutoRender = AppConfig.DefaultBool("AutoRender", BConfig.WebConfig.AutoRender) BConfig.WebConfig.ViewsPath = AppConfig.DefaultString("ViewsPath", BConfig.WebConfig.ViewsPath) BConfig.WebConfig.DirectoryIndex = AppConfig.DefaultBool("DirectoryIndex", BConfig.WebConfig.DirectoryIndex) diff --git a/hooks.go b/hooks.go index 53b298a0..78abf8ef 100644 --- a/hooks.go +++ b/hooks.go @@ -48,7 +48,7 @@ func registerSession() error { "cookieName": BConfig.WebConfig.Session.SessionName, "gclifetime": BConfig.WebConfig.Session.SessionGCMaxLifetime, "providerConfig": filepath.ToSlash(BConfig.WebConfig.Session.SessionProviderConfig), - "secure": BConfig.Listen.HTTPSEnable, + "secure": BConfig.Listen.EnableHTTPS, "enableSetCookie": BConfig.WebConfig.Session.SessionAutoSetCookie, "domain": BConfig.WebConfig.Session.SessionDomain, "cookieLifeTime": BConfig.WebConfig.Session.SessionCookieLifeTime, @@ -88,7 +88,7 @@ func registerDocs() error { } func registerAdmin() error { - if BConfig.Listen.AdminEnable { + if BConfig.Listen.EnableAdmin { go beeAdminApp.Run() } return nil diff --git a/router.go b/router.go index 671b6151..9d8cd2e6 100644 --- a/router.go +++ b/router.go @@ -609,7 +609,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) defer p.pool.Put(context) defer p.recoverPanic(context) - context.Output.EnableGzip=BConfig.EnableGzip + context.Output.EnableGzip = BConfig.EnableGzip if BConfig.RunMode == DEV { context.Output.Header("Server", BConfig.ServerName) @@ -800,7 +800,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) Admin: timeDur := time.Since(startTime) //admin module record QPS - if BConfig.Listen.AdminEnable { + if BConfig.Listen.EnableAdmin { if FilterMonitorFunc(r.Method, r.URL.Path, timeDur) { if runRouter != nil { go toolbox.StatisticsMap.AddStatistics(r.Method, r.URL.Path, runRouter.Name(), timeDur) From bd0f3c29fabfca168f998df2e5f9c82241b7337b Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 12 Jan 2016 22:32:20 +0800 Subject: [PATCH 406/436] decr malloc new object --- logs/log.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/logs/log.go b/logs/log.go index 295b0811..f68202f4 100644 --- a/logs/log.go +++ b/logs/log.go @@ -174,9 +174,7 @@ func (bl *BeeLogger) writeToLoggers(msg string, level int) { } } -func (bl *BeeLogger) writeMsg(loglevel int, msg string) error { - lm := new(logMsg) - lm.level = loglevel +func (bl *BeeLogger) writeMsg(logLevel int, msg string) error { if bl.enableFuncCallDepth { _, file, line, ok := runtime.Caller(bl.loggerFuncCallDepth) if !ok { @@ -184,14 +182,17 @@ func (bl *BeeLogger) writeMsg(loglevel int, msg string) error { line = 0 } _, filename := path.Split(file) - lm.msg = fmt.Sprintf("[%s:%d] %s", filename, line, msg) + msg = fmt.Sprintf("[%s:%d] %s", filename, line, msg) } else { - lm.msg = msg + msg = msg } if bl.asynchronous { + lm := new(logMsg) + lm.level = logLevel + lm.msg = msg bl.msg <- lm } else { - bl.writeToLoggers(msg, loglevel) + bl.writeToLoggers(msg, logLevel) } return nil } From 2b9d7ff714f0b7d6cd12534ed0cd7fba5ebaceac Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 12 Jan 2016 22:32:36 +0800 Subject: [PATCH 407/436] remove log package --- logs/file.go | 52 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 10 deletions(-) diff --git a/logs/file.go b/logs/file.go index 16c23de5..9ee7f694 100644 --- a/logs/file.go +++ b/logs/file.go @@ -20,7 +20,6 @@ import ( "errors" "fmt" "io" - "log" "os" "path/filepath" "strings" @@ -31,7 +30,6 @@ import ( // fileLogWriter implements LoggerInterface. // It writes messages by lines limit, file size limit, or time frequency. type fileLogWriter struct { - *log.Logger *MuxWriter // The opened file Filename string `json:"filename"` @@ -91,8 +89,6 @@ func newFileWriter() Logger { Perm: 0660, MuxWriter: new(MuxWriter), } - // set MuxWriter as Logger's io.Writer - w.Logger = log.New(w, "", log.Ldate|log.Ltime) return w } @@ -137,8 +133,6 @@ func (w *fileLogWriter) doCheck(size int) { (w.Daily && time.Now().Day() != w.dailyOpenDate) { if err := w.DoRotate(); err != nil { fmt.Fprintf(os.Stderr, "FileLogWriter(%q): %s\n", w.Filename, err) - w.startLock.Unlock() - return } } } @@ -152,9 +146,47 @@ func (w *fileLogWriter) WriteMsg(msg string, level int) error { if level > w.Level { return nil } - n := 24 + len(msg) // 24 stand for the length "2013/06/23 21:00:22 [T] " - w.doCheck(n) - w.Logger.Println(msg) + //2016/01/12 21:34:33 + now := time.Now() + y, mo, d := now.Date() + h, mi, s := now.Clock() + //len(2006/01/02 15:03:04)==19 + var buf [19]byte + t := 3 + for y >= 10 { + p := y / 10 + buf[t] = byte('0' + y - p*10) + y = p + t-- + } + buf[0] = byte('0' + y) + buf[4] = '/' + if mo > 9 { + buf[5] = '1' + buf[6] = byte('0' + mo - 9) + } else { + buf[5] = '0' + buf[6] = byte('0' + mo) + } + buf[7] = '/' + t = d / 10 + buf[8] = byte('0' + t) + buf[9] = byte('0' + d - t*10) + buf[10] = ' ' + t = h / 10 + buf[11] = byte('0' + t) + buf[12] = byte('0' + h - t*10) + buf[13] = ':' + t = mi / 10 + buf[14] = byte('0' + t) + buf[15] = byte('0' + mi - t*10) + buf[16] = ':' + t = s / 10 + buf[17] = byte('0' + t) + buf[18] = byte('0' + s - t*10) + msg = string(buf[0:]) + msg + "\n" + w.doCheck(len(msg)) + w.fd.Write([]byte(msg)) return nil } @@ -264,7 +296,7 @@ func (w *fileLogWriter) deleteOldLog() { filepath.Walk(dir, func(path string, info os.FileInfo, err error) (returnErr error) { defer func() { if r := recover(); r != nil { - fmt.Fprintf(os.Stderr, "Unable to delete old log '%s', error: %+v", path, r) + fmt.Fprintf(os.Stderr, "Unable to delete old log '%s', error: %v\n", path, r) } }() From 164366ae0da801fd310de432fdcabe0fd4ac9aab Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 12 Jan 2016 22:33:52 +0800 Subject: [PATCH 408/436] return error --- logs/file.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/logs/file.go b/logs/file.go index 9ee7f694..b9336a2c 100644 --- a/logs/file.go +++ b/logs/file.go @@ -185,9 +185,10 @@ func (w *fileLogWriter) WriteMsg(msg string, level int) error { buf[17] = byte('0' + t) buf[18] = byte('0' + s - t*10) msg = string(buf[0:]) + msg + "\n" + w.doCheck(len(msg)) - w.fd.Write([]byte(msg)) - return nil + _, err := w.fd.Write([]byte(msg)) + return err } func (w *fileLogWriter) createLogFile() (*os.File, error) { From 69804afc1b00558337c4d1f4119ca4046ac6073d Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 12 Jan 2016 22:39:40 +0800 Subject: [PATCH 409/436] use pool to logMsg --- logs/log.go | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/logs/log.go b/logs/log.go index f68202f4..0a099dfe 100644 --- a/logs/log.go +++ b/logs/log.go @@ -95,7 +95,7 @@ type BeeLogger struct { enableFuncCallDepth bool loggerFuncCallDepth int asynchronous bool - msg chan *logMsg + msgChan chan *logMsg outputs []*nameLogger } @@ -109,6 +109,8 @@ type logMsg struct { msg string } +var logMsgPool *sync.Pool + // NewLogger returns a new BeeLogger. // channelLen means the number of messages in chan(used where asynchronous is true). // if the buffering chan is full, logger adapters write to file or other way. @@ -116,13 +118,18 @@ func NewLogger(channelLen int64) *BeeLogger { bl := new(BeeLogger) bl.level = LevelDebug bl.loggerFuncCallDepth = 2 - bl.msg = make(chan *logMsg, channelLen) + bl.msgChan = make(chan *logMsg, channelLen) return bl } // Async set the log to asynchronous and start the goroutine func (bl *BeeLogger) Async() *BeeLogger { bl.asynchronous = true + logMsgPool = &sync.Pool{ + New: func() interface{} { + return &logMsg{} + }, + } go bl.startLogger() return bl } @@ -187,10 +194,10 @@ func (bl *BeeLogger) writeMsg(logLevel int, msg string) error { msg = msg } if bl.asynchronous { - lm := new(logMsg) + lm := logMsgPool.Get().(*logMsg) lm.level = logLevel lm.msg = msg - bl.msg <- lm + bl.msgChan <- lm } else { bl.writeToLoggers(msg, logLevel) } @@ -224,8 +231,9 @@ func (bl *BeeLogger) EnableFuncCallDepth(b bool) { func (bl *BeeLogger) startLogger() { for { select { - case bm := <-bl.msg: + case bm := <-bl.msgChan: bl.writeToLoggers(bm.msg, bm.level) + logMsgPool.Put(bm) } } } @@ -342,9 +350,10 @@ func (bl *BeeLogger) Flush() { // Close close logger, flush all chan data and destroy all adapters in BeeLogger. func (bl *BeeLogger) Close() { for { - if len(bl.msg) > 0 { - bm := <-bl.msg + if len(bl.msgChan) > 0 { + bm := <-bl.msgChan bl.writeToLoggers(bm.msg, bm.level) + logMsgPool.Put(bm) continue } break From c535dc386e323ef3f92db52728dcca8b60c2a065 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Tue, 12 Jan 2016 22:54:39 +0800 Subject: [PATCH 410/436] fast format --- logs/log.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/logs/log.go b/logs/log.go index 0a099dfe..12f7f2e7 100644 --- a/logs/log.go +++ b/logs/log.go @@ -38,6 +38,7 @@ import ( "os" "path" "runtime" + "strconv" "sync" ) @@ -189,7 +190,7 @@ func (bl *BeeLogger) writeMsg(logLevel int, msg string) error { line = 0 } _, filename := path.Split(file) - msg = fmt.Sprintf("[%s:%d] %s", filename, line, msg) + msg = "[" + filename + ":" + strconv.FormatInt(int64(line), 10) + "]" + msg } else { msg = msg } From e1b73b33d09674e0c1fa2d5807a0e498ca4923b3 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Wed, 13 Jan 2016 08:21:44 +0800 Subject: [PATCH 411/436] improve code --- logs/file.go | 40 +++++++++++++++++++++------------------- logs/log.go | 2 -- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/logs/file.go b/logs/file.go index b9336a2c..a5f1dd2f 100644 --- a/logs/file.go +++ b/logs/file.go @@ -48,7 +48,7 @@ type fileLogWriter struct { Rotate bool `json:"rotate"` - startLock sync.Mutex // Only one log can write to the file + startLock sync.Mutex // atomic incr maxLinesCurLines and maxSizeCurSize Level int `json:"level"` @@ -58,22 +58,23 @@ type fileLogWriter struct { // MuxWriter is an *os.File writer with locker,lock write when rotate type MuxWriter struct { sync.Mutex - fd *os.File + fileWriter *os.File } // Write to os.File. -func (l *MuxWriter) Write(b []byte) (int, error) { - l.Lock() - defer l.Unlock() - return l.fd.Write(b) +func (mw *MuxWriter) Write(b []byte) (int, error) { + mw.Lock() + n, e := mw.fileWriter.Write(b) + mw.Unlock() + return n, e } -// SetFd set os.File in writer. -func (l *MuxWriter) SetFd(fd *os.File) { - if l.fd != nil { - l.fd.Close() +// SetFileWriter set os.File in writer. +func (mw *MuxWriter) SetFileWriter(fd *os.File) { + if mw.fileWriter != nil { + mw.fileWriter.Close() } - l.fd = fd + mw.fileWriter = fd } // NewFileWriter create a FileLogWriter returning as LoggerInterface. @@ -117,11 +118,11 @@ func (w *fileLogWriter) Init(jsonConfig string) error { // start file logger. create log file and set to locker-inside file writer. func (w *fileLogWriter) startLogger() error { - fd, err := w.createLogFile() + file, err := w.createLogFile() if err != nil { return err } - w.SetFd(fd) + w.SetFileWriter(file) return w.initFd() } @@ -151,7 +152,7 @@ func (w *fileLogWriter) WriteMsg(msg string, level int) error { y, mo, d := now.Date() h, mi, s := now.Clock() //len(2006/01/02 15:03:04)==19 - var buf [19]byte + var buf [20]byte t := 3 for y >= 10 { p := y / 10 @@ -184,10 +185,11 @@ func (w *fileLogWriter) WriteMsg(msg string, level int) error { t = s / 10 buf[17] = byte('0' + t) buf[18] = byte('0' + s - t*10) + buf[18] = ' ' msg = string(buf[0:]) + msg + "\n" w.doCheck(len(msg)) - _, err := w.fd.Write([]byte(msg)) + _, err := w.Write([]byte(msg)) return err } @@ -198,7 +200,7 @@ func (w *fileLogWriter) createLogFile() (*os.File, error) { } func (w *fileLogWriter) initFd() error { - fd := w.fd + fd := w.fileWriter fInfo, err := fd.Stat() if err != nil { return fmt.Errorf("get stat err: %s\n", err) @@ -270,7 +272,7 @@ func (w *fileLogWriter) DoRotate() error { w.Lock() defer w.Unlock() - fd := w.fd + fd := w.fileWriter fd.Close() // close fd before rename @@ -312,14 +314,14 @@ func (w *fileLogWriter) deleteOldLog() { // Destroy close the file description, close file writer. func (w *fileLogWriter) Destroy() { - w.fd.Close() + w.fileWriter.Close() } // Flush flush file logger. // there are no buffering messages in file logger in memory. // flush file means sync file from disk. func (w *fileLogWriter) Flush() { - w.fd.Sync() + w.fileWriter.Sync() } func init() { diff --git a/logs/log.go b/logs/log.go index 12f7f2e7..ccaaa3ad 100644 --- a/logs/log.go +++ b/logs/log.go @@ -191,8 +191,6 @@ func (bl *BeeLogger) writeMsg(logLevel int, msg string) error { } _, filename := path.Split(file) msg = "[" + filename + ":" + strconv.FormatInt(int64(line), 10) + "]" + msg - } else { - msg = msg } if bl.asynchronous { lm := logMsgPool.Get().(*logMsg) From 58730e3528ccdb30fc69ccb34ff54a11ff06c10b Mon Sep 17 00:00:00 2001 From: JessonChan Date: Wed, 13 Jan 2016 09:21:32 +0800 Subject: [PATCH 412/436] test file modify --- logs/file_test.go | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/logs/file_test.go b/logs/file_test.go index d03d3ca5..f9b54c26 100644 --- a/logs/file_test.go +++ b/logs/file_test.go @@ -23,7 +23,7 @@ import ( "time" ) -func TestFile(t *testing.T) { +func TestFile1(t *testing.T) { log := NewLogger(10000) log.SetLogger("file", `{"filename":"test.log"}`) log.Debug("debug") @@ -34,25 +34,24 @@ func TestFile(t *testing.T) { log.Alert("alert") log.Critical("critical") log.Emergency("emergency") - time.Sleep(time.Second * 4) f, err := os.Open("test.log") if err != nil { t.Fatal(err) } b := bufio.NewReader(f) - linenum := 0 + lineNum := 0 for { line, _, err := b.ReadLine() if err != nil { break } if len(line) > 0 { - linenum++ + lineNum++ } } var expected = LevelDebug + 1 - if linenum != expected { - t.Fatal(linenum, "not "+strconv.Itoa(expected)+" lines") + if lineNum != expected { + t.Fatal(lineNum, "not "+strconv.Itoa(expected)+" lines") } os.Remove("test.log") } @@ -68,25 +67,24 @@ func TestFile2(t *testing.T) { log.Alert("alert") log.Critical("critical") log.Emergency("emergency") - time.Sleep(time.Second * 4) f, err := os.Open("test2.log") if err != nil { t.Fatal(err) } b := bufio.NewReader(f) - linenum := 0 + lineNum := 0 for { line, _, err := b.ReadLine() if err != nil { break } if len(line) > 0 { - linenum++ + lineNum++ } } var expected = LevelError + 1 - if linenum != expected { - t.Fatal(linenum, "not "+strconv.Itoa(expected)+" lines") + if lineNum != expected { + t.Fatal(lineNum, "not "+strconv.Itoa(expected)+" lines") } os.Remove("test2.log") } @@ -102,13 +100,13 @@ func TestFileRotate(t *testing.T) { log.Alert("alert") log.Critical("critical") log.Emergency("emergency") - time.Sleep(time.Second * 4) - rotatename := "test3" + fmt.Sprintf(".%s.%03d", time.Now().Format("2006-01-02"), 1) + ".log" - b, err := exists(rotatename) + rotateName := "test3" + fmt.Sprintf(".%s.%03d", time.Now().Format("2006-01-02"), 1) + ".log" + b, err := exists(rotateName) if !b || err != nil { + os.Remove("test3.log") t.Fatal("rotate not generated") } - os.Remove(rotatename) + os.Remove(rotateName) os.Remove("test3.log") } @@ -132,7 +130,8 @@ func BenchmarkFile(b *testing.B) { os.Remove("test4.log") } -func BenchmarkAsynchronousFile(b *testing.B) { + +func BenchmarkFileAsynchronous(b *testing.B) { log := NewLogger(100000) log.SetLogger("file", `{"filename":"test4.log"}`) log.Async() @@ -142,7 +141,7 @@ func BenchmarkAsynchronousFile(b *testing.B) { os.Remove("test4.log") } -func BenchmarkCallDepthFile(b *testing.B) { +func BenchmarkFileCallDepth(b *testing.B) { log := NewLogger(100000) log.SetLogger("file", `{"filename":"test4.log"}`) log.EnableFuncCallDepth(true) @@ -153,7 +152,7 @@ func BenchmarkCallDepthFile(b *testing.B) { os.Remove("test4.log") } -func BenchmarkAsynchronousCallDepthFile(b *testing.B) { +func BenchmarkFileAsynchronousCallDepth(b *testing.B) { log := NewLogger(100000) log.SetLogger("file", `{"filename":"test4.log"}`) log.EnableFuncCallDepth(true) @@ -164,3 +163,12 @@ func BenchmarkAsynchronousCallDepthFile(b *testing.B) { } os.Remove("test4.log") } + +func BenchmarkFileOnGoroutine(b *testing.B) { + log := NewLogger(100000) + log.SetLogger("file", `{"filename":"test4.log"}`) + for i := 0; i < b.N; i++ { + go log.Debug("debug") + } + os.Remove("test4.log") +} From 7663d50c9719ec941399874c7179e075b0b8e5e1 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Wed, 13 Jan 2016 09:21:55 +0800 Subject: [PATCH 413/436] remove the lock writer --- logs/file.go | 126 ++++++++++++++++++++++----------------------------- 1 file changed, 55 insertions(+), 71 deletions(-) diff --git a/logs/file.go b/logs/file.go index a5f1dd2f..6d5f89ba 100644 --- a/logs/file.go +++ b/logs/file.go @@ -30,10 +30,12 @@ import ( // fileLogWriter implements LoggerInterface. // It writes messages by lines limit, file size limit, or time frequency. type fileLogWriter struct { - *MuxWriter + sync.Mutex // write log order by order and atomic incr maxLinesCurLines and maxSizeCurSize // The opened file - Filename string `json:"filename"` + Filename string `json:"filename"` + fileWriter *os.File + // Rotate at line MaxLines int `json:"maxlines"` maxLinesCurLines int @@ -48,47 +50,22 @@ type fileLogWriter struct { Rotate bool `json:"rotate"` - startLock sync.Mutex // atomic incr maxLinesCurLines and maxSizeCurSize - Level int `json:"level"` Perm os.FileMode `json:"perm"` } -// MuxWriter is an *os.File writer with locker,lock write when rotate -type MuxWriter struct { - sync.Mutex - fileWriter *os.File -} - -// Write to os.File. -func (mw *MuxWriter) Write(b []byte) (int, error) { - mw.Lock() - n, e := mw.fileWriter.Write(b) - mw.Unlock() - return n, e -} - -// SetFileWriter set os.File in writer. -func (mw *MuxWriter) SetFileWriter(fd *os.File) { - if mw.fileWriter != nil { - mw.fileWriter.Close() - } - mw.fileWriter = fd -} - // NewFileWriter create a FileLogWriter returning as LoggerInterface. func newFileWriter() Logger { w := &fileLogWriter{ - Filename: "", - MaxLines: 1000000, - MaxSize: 1 << 28, //256 MB - Daily: true, - MaxDays: 7, - Rotate: true, - Level: LevelTrace, - Perm: 0660, - MuxWriter: new(MuxWriter), + Filename: "", + MaxLines: 1000000, + MaxSize: 1 << 28, //256 MB + Daily: true, + MaxDays: 7, + Rotate: true, + Level: LevelTrace, + Perm: 0660, } return w } @@ -122,24 +99,18 @@ func (w *fileLogWriter) startLogger() error { if err != nil { return err } - w.SetFileWriter(file) + if w.fileWriter != nil { + w.fileWriter.Close() + } + w.fileWriter = file return w.initFd() } -func (w *fileLogWriter) doCheck(size int) { - w.startLock.Lock() - if w.Rotate { - if (w.MaxLines > 0 && w.maxLinesCurLines >= w.MaxLines) || - (w.MaxSize > 0 && w.maxSizeCurSize >= w.MaxSize) || - (w.Daily && time.Now().Day() != w.dailyOpenDate) { - if err := w.DoRotate(); err != nil { - fmt.Fprintf(os.Stderr, "FileLogWriter(%q): %s\n", w.Filename, err) - } - } - } - w.maxLinesCurLines++ - w.maxSizeCurSize += size - w.startLock.Unlock() +func (w *fileLogWriter) needRotate(size int, day int) bool { + return (w.MaxLines > 0 && w.maxLinesCurLines >= w.MaxLines) || + (w.MaxSize > 0 && w.maxSizeCurSize >= w.MaxSize) || + (w.Daily && day != w.dailyOpenDate) + } // WriteMsg write logger message into file. @@ -185,11 +156,29 @@ func (w *fileLogWriter) WriteMsg(msg string, level int) error { t = s / 10 buf[17] = byte('0' + t) buf[18] = byte('0' + s - t*10) - buf[18] = ' ' + buf[19] = ' ' msg = string(buf[0:]) + msg + "\n" - w.doCheck(len(msg)) - _, err := w.Write([]byte(msg)) + if w.Rotate { + if w.needRotate(len(msg), d) { + w.Lock() + if w.needRotate(len(msg), d) { + if err := w.doRotate(); err != nil { + fmt.Fprintf(os.Stderr, "FileLogWriter(%q): %s\n", w.Filename, err) + } + + } + w.Unlock() + } + } + + w.Lock() + _, err := w.fileWriter.Write([]byte(msg)) + if err == nil { + w.maxLinesCurLines++ + w.maxSizeCurSize += len(msg) + } + w.Unlock() return err } @@ -247,7 +236,7 @@ func (w *fileLogWriter) lines() (int, error) { // DoRotate means it need to write file in new file. // new file name like xx.2013-01-01.2.log -func (w *fileLogWriter) DoRotate() error { +func (w *fileLogWriter) doRotate() error { _, err := os.Lstat(w.Filename) if err == nil { // file exists @@ -268,27 +257,22 @@ func (w *fileLogWriter) DoRotate() error { return fmt.Errorf("Rotate: Cannot find free log number to rename %s\n", w.Filename) } - // block Logger's io.Writer - w.Lock() - defer w.Unlock() + // close fileWriter before rename + w.fileWriter.Close() - fd := w.fileWriter - fd.Close() - - // close fd before rename // Rename the file to its new found name - err = os.Rename(w.Filename, fName) - if err != nil { - return fmt.Errorf("Rotate: %s\n", err) - } - + // even if occurs error,we MUST guarantee to restart new logger + renameErr := os.Rename(w.Filename, fName) // re-start logger - err = w.startLogger() - if err != nil { - return fmt.Errorf("Rotate StartLogger: %s\n", err) - } - + startLoggerErr := w.startLogger() go w.deleteOldLog() + + if startLoggerErr != nil { + return fmt.Errorf("Rotate StartLogger: %s\n", startLoggerErr) + } + if renameErr != nil { + return fmt.Errorf("Rotate: %s\n", renameErr) + } } return nil From fb5b04506abe3826bde67399add19259808e3f5f Mon Sep 17 00:00:00 2001 From: JessonChan Date: Wed, 13 Jan 2016 09:24:27 +0800 Subject: [PATCH 414/436] code refactor and format --- logs/file.go | 69 ++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/logs/file.go b/logs/file.go index 6d5f89ba..0eae734a 100644 --- a/logs/file.go +++ b/logs/file.go @@ -238,44 +238,45 @@ func (w *fileLogWriter) lines() (int, error) { // new file name like xx.2013-01-01.2.log func (w *fileLogWriter) doRotate() error { _, err := os.Lstat(w.Filename) + if err != nil { + return err + } + // file exists + // Find the next available number + num := 1 + fName := "" + suffix := filepath.Ext(w.Filename) + filenameOnly := strings.TrimSuffix(w.Filename, suffix) + if suffix == "" { + suffix = ".log" + } + for ; err == nil && num <= 999; num++ { + fName = filenameOnly + fmt.Sprintf(".%s.%03d%s", time.Now().Format("2006-01-02"), num, suffix) + _, err = os.Lstat(fName) + } + // return error if the last file checked still existed if err == nil { - // file exists - // Find the next available number - num := 1 - fName := "" - suffix := filepath.Ext(w.Filename) - filenameOnly := strings.TrimSuffix(w.Filename, suffix) - if suffix == "" { - suffix = ".log" - } - for ; err == nil && num <= 999; num++ { - fName = filenameOnly + fmt.Sprintf(".%s.%03d%s", time.Now().Format("2006-01-02"), num, suffix) - _, err = os.Lstat(fName) - } - // return error if the last file checked still existed - if err == nil { - return fmt.Errorf("Rotate: Cannot find free log number to rename %s\n", w.Filename) - } - - // close fileWriter before rename - w.fileWriter.Close() - - // Rename the file to its new found name - // even if occurs error,we MUST guarantee to restart new logger - renameErr := os.Rename(w.Filename, fName) - // re-start logger - startLoggerErr := w.startLogger() - go w.deleteOldLog() - - if startLoggerErr != nil { - return fmt.Errorf("Rotate StartLogger: %s\n", startLoggerErr) - } - if renameErr != nil { - return fmt.Errorf("Rotate: %s\n", renameErr) - } + return fmt.Errorf("Rotate: Cannot find free log number to rename %s\n", w.Filename) } + // close fileWriter before rename + w.fileWriter.Close() + + // Rename the file to its new found name + // even if occurs error,we MUST guarantee to restart new logger + renameErr := os.Rename(w.Filename, fName) + // re-start logger + startLoggerErr := w.startLogger() + go w.deleteOldLog() + + if startLoggerErr != nil { + return fmt.Errorf("Rotate StartLogger: %s\n", startLoggerErr) + } + if renameErr != nil { + return fmt.Errorf("Rotate: %s\n", renameErr) + } return nil + } func (w *fileLogWriter) deleteOldLog() { From 6976c0f51d5bb46318cb0e2dcdbbf50ca88c975b Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 13 Jan 2016 22:02:36 +0800 Subject: [PATCH 415/436] add CONTRIBUTING.md --- CONTRIBUTING.md | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..9d511616 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,52 @@ +# Contributing to beego + +beego is an open source project. + +It is the work of hundreds of contributors. We appreciate your help! + +Here are instructions to get you started. They are probably not perfect, +please let us know if anything feels wrong or incomplete. + +## Contribution guidelines + +### Pull requests + +First of all. beego follow the gitflow. So please send you pull request +to **develop** branch. We will close the pull request to master branch. + +We are always happy to receive pull requests, and do our best to +review them as fast as possible. Not sure if that typo is worth a pull +request? Do it! We will appreciate it. + +If your pull request is not accepted on the first try, don't be +discouraged! Sometimes we can make a mistake, please do more explaining +for us. We will appreciate it. + +We're trying very hard to keep beego simple and fast. We don't want it +to do everything for everybody. This means that we might decide against +incorporating a new feature. But we will give you some advice on how to +do it in other way. + +### Create issues + +Any significant improvement should be documented as [a GitHub +issue](https://github.com/astaxie/beego/issues) before anybody +starts working on it. + +Also when filing an issue, make sure to answer these five questions: + +- What version of beego are you using (bee version)? +- What operating system and processor architecture are you using? +- What did you do? +- What did you expect to see? +- What did you see instead? + +### but check existing issues and docs first! + +Please take a moment to check that an issue doesn't already exist +documenting your bug report or improvement proposal. If it does, it +never hurts to add a quick "+1" or "I have this problem too". This will +help prioritize the most common problems and requests. + +Also if you don't know how to use it. please make sure you have read though +the docs in http://beego.me/docs \ No newline at end of file From 9c559859152a3b58b7ee994e865601b6f4a5f467 Mon Sep 17 00:00:00 2001 From: astaxie Date: Wed, 13 Jan 2016 22:20:34 +0800 Subject: [PATCH 416/436] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3c8f3b8d..1fef8305 100644 --- a/README.md +++ b/README.md @@ -56,5 +56,5 @@ Please see [Documentation](http://beego.me/docs) for more. ## LICENSE -beego is licensed under the Apache Licence, Version 2.0 +beego source code is licensed under the Apache Licence, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.html). From 4375ca84d153a185c5162cc27e03666593aceb53 Mon Sep 17 00:00:00 2001 From: astaxie Date: Thu, 14 Jan 2016 23:49:28 +0800 Subject: [PATCH 417/436] fix the sqlite m2m --- orm/orm_querym2m.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/orm/orm_querym2m.go b/orm/orm_querym2m.go index 36c5e95f..60c77cdf 100644 --- a/orm/orm_querym2m.go +++ b/orm/orm_querym2m.go @@ -14,9 +14,7 @@ package orm -import ( - "reflect" -) +import "reflect" // model to model struct type queryM2M struct { @@ -48,7 +46,8 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) { var other_names []string for _, colname := range mi.fields.dbcols { - if colname != mfi.column && colname != rfi.column && colname != fi.mi.fields.pk.column { + if colname != mfi.column && colname != rfi.column && colname != fi.mi.fields.pk.column && + mi.fields.columns[colname] != mi.fields.pk { other_names = append(other_names, colname) } } From 7dbeb2c39a7889fc8dd7e06583e3982852945785 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 15 Jan 2016 08:43:02 +0800 Subject: [PATCH 418/436] fix the default value --- orm/cmd_utils.go | 7 +++++-- orm/orm_test.go | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/orm/cmd_utils.go b/orm/cmd_utils.go index c2c4cfe4..da0ee8ab 100644 --- a/orm/cmd_utils.go +++ b/orm/cmd_utils.go @@ -264,15 +264,18 @@ func getColumnDefault(fi *fieldInfo) string { // These defaults will be useful if there no config value orm:"default" and NOT NULL is on switch fi.fieldType { - case TypeDateField, TypeDateTimeField: + case TypeDateField, TypeDateTimeField, TypeTextField: return v - case TypeBooleanField, TypeBitField, TypeSmallIntegerField, TypeIntegerField, + case TypeBitField, TypeSmallIntegerField, TypeIntegerField, TypeBigIntegerField, TypePositiveBitField, TypePositiveSmallIntegerField, TypePositiveIntegerField, TypePositiveBigIntegerField, TypeFloatField, TypeDecimalField: t = " DEFAULT %s " d = "0" + case TypeBooleanField: + t = " DEFAULT %s " + d = "FALSE" } if fi.colDefault { diff --git a/orm/orm_test.go b/orm/orm_test.go index eb872426..94f8b741 100644 --- a/orm/orm_test.go +++ b/orm/orm_test.go @@ -188,7 +188,7 @@ func TestSyncDb(t *testing.T) { RegisterModel(new(Permission)) RegisterModel(new(GroupPermissions)) - err := RunSyncdb("default", true, false) + err := RunSyncdb("default", true, Debug) throwFail(t, err) modelCache.clean() @@ -681,9 +681,9 @@ The program—and web server—godoc processes Go source files to extract docume } for _, group := range groups { - id, err := dORM.Insert(group) + _, err := dORM.Insert(group) throwFail(t, err) - throwFail(t, AssertIs(id > 0, true)) + //throwFail(t, AssertIs(id > 0, true)) num := len(group.Permissions) if num > 0 { From a069c73b3acb8e4a7931e270c4144c37b59f3196 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 15 Jan 2016 14:02:08 +0800 Subject: [PATCH 419/436] test case bool default value is true --- orm/models_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orm/models_test.go b/orm/models_test.go index 1ad8c601..8f1ebe77 100644 --- a/orm/models_test.go +++ b/orm/models_test.go @@ -230,7 +230,7 @@ type User struct { Password string `orm:"size(100)"` Status int16 `orm:"column(Status)"` IsStaff bool - IsActive bool `orm:"default(1)"` + IsActive bool `orm:"default(true)"` Created time.Time `orm:"auto_now_add;type(date)"` Updated time.Time `orm:"auto_now"` Profile *Profile `orm:"null;rel(one);on_delete(set_null)"` From 52083de720bdb828e71ff94b278fd1f7bc5f830a Mon Sep 17 00:00:00 2001 From: JessonChan Date: Fri, 15 Jan 2016 14:07:37 +0800 Subject: [PATCH 420/436] typo fixed seperator => separator --- admin.go | 4 ++-- config.go | 12 ++++++------ config/config.go | 28 ++++++++++++++-------------- config_test.go | 2 +- controller.go | 2 +- flash.go | 4 ++-- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/admin.go b/admin.go index 0b45cf8a..3effc582 100644 --- a/admin.go +++ b/admin.go @@ -120,7 +120,7 @@ func listConf(rw http.ResponseWriter, r *http.Request) { m["BConfig.WebConfig.AutoRender"] = BConfig.WebConfig.AutoRender m["BConfig.WebConfig.EnableDocs"] = BConfig.WebConfig.EnableDocs m["BConfig.WebConfig.FlashName"] = BConfig.WebConfig.FlashName - m["BConfig.WebConfig.FlashSeperator"] = BConfig.WebConfig.FlashSeperator + m["BConfig.WebConfig.FlashSeparator"] = BConfig.WebConfig.FlashSeparator m["BConfig.WebConfig.DirectoryIndex"] = BConfig.WebConfig.DirectoryIndex m["BConfig.WebConfig.StaticDir"] = BConfig.WebConfig.StaticDir m["BConfig.WebConfig.StaticExtensionsToGzip"] = BConfig.WebConfig.StaticExtensionsToGzip @@ -128,7 +128,7 @@ func listConf(rw http.ResponseWriter, r *http.Request) { m["BConfig.WebConfig.TemplateRight"] = BConfig.WebConfig.TemplateRight m["BConfig.WebConfig.ViewsPath"] = BConfig.WebConfig.ViewsPath m["BConfig.WebConfig.EnableXSRF"] = BConfig.WebConfig.EnableXSRF - m["BConfig.WebConfig.XSRFKEY"] = BConfig.WebConfig.XSRFKEY + m["BConfig.WebConfig.XSRFKEY"] = BConfig.WebConfig.XSRFKey m["BConfig.WebConfig.XSRFExpire"] = BConfig.WebConfig.XSRFExpire m["BConfig.WebConfig.Session.SessionOn"] = BConfig.WebConfig.Session.SessionOn m["BConfig.WebConfig.Session.SessionProvider"] = BConfig.WebConfig.Session.SessionProvider diff --git a/config.go b/config.go index 66702872..cffb7c2b 100644 --- a/config.go +++ b/config.go @@ -63,7 +63,7 @@ type WebConfig struct { AutoRender bool EnableDocs bool FlashName string - FlashSeperator string + FlashSeparator string DirectoryIndex bool StaticDir map[string]string StaticExtensionsToGzip []string @@ -71,7 +71,7 @@ type WebConfig struct { TemplateRight string ViewsPath string EnableXSRF bool - XSRFKEY string + XSRFKey string XSRFExpire int Session SessionConfig } @@ -141,7 +141,7 @@ func init() { AutoRender: true, EnableDocs: false, FlashName: "BEEGO_FLASH", - FlashSeperator: "BEEGOFLASH", + FlashSeparator: "BEEGOFLASH", DirectoryIndex: false, StaticDir: map[string]string{"/static": "static"}, StaticExtensionsToGzip: []string{".css", ".js"}, @@ -149,7 +149,7 @@ func init() { TemplateRight: "}}", ViewsPath: "views", EnableXSRF: false, - XSRFKEY: "beegoxsrf", + XSRFKey: "beegoxsrf", XSRFExpire: 0, Session: SessionConfig{ SessionOn: false, @@ -221,9 +221,9 @@ func ParseConfig() (err error) { BConfig.WebConfig.ViewsPath = AppConfig.DefaultString("ViewsPath", BConfig.WebConfig.ViewsPath) BConfig.WebConfig.DirectoryIndex = AppConfig.DefaultBool("DirectoryIndex", BConfig.WebConfig.DirectoryIndex) BConfig.WebConfig.FlashName = AppConfig.DefaultString("FlashName", BConfig.WebConfig.FlashName) - BConfig.WebConfig.FlashSeperator = AppConfig.DefaultString("FlashSeperator", BConfig.WebConfig.FlashSeperator) + BConfig.WebConfig.FlashSeparator = AppConfig.DefaultString("FlashSeparator", BConfig.WebConfig.FlashSeparator) BConfig.WebConfig.EnableDocs = AppConfig.DefaultBool("EnableDocs", BConfig.WebConfig.EnableDocs) - BConfig.WebConfig.XSRFKEY = AppConfig.DefaultString("XSRFKEY", BConfig.WebConfig.XSRFKEY) + BConfig.WebConfig.XSRFKey = AppConfig.DefaultString("XSRFKEY", BConfig.WebConfig.XSRFKey) BConfig.WebConfig.EnableXSRF = AppConfig.DefaultBool("EnableXSRF", BConfig.WebConfig.EnableXSRF) BConfig.WebConfig.XSRFExpire = AppConfig.DefaultInt("XSRFExpire", BConfig.WebConfig.XSRFExpire) BConfig.WebConfig.TemplateLeft = AppConfig.DefaultString("TemplateLeft", BConfig.WebConfig.TemplateLeft) diff --git a/config/config.go b/config/config.go index d0236003..da5d358b 100644 --- a/config/config.go +++ b/config/config.go @@ -29,12 +29,12 @@ // cnf.Int64(key string) (int64, error) // cnf.Bool(key string) (bool, error) // cnf.Float(key string) (float64, error) -// cnf.DefaultString(key string, defaultval string) string -// cnf.DefaultStrings(key string, defaultval []string) []string -// cnf.DefaultInt(key string, defaultval int) int -// cnf.DefaultInt64(key string, defaultval int64) int64 -// cnf.DefaultBool(key string, defaultval bool) bool -// cnf.DefaultFloat(key string, defaultval float64) float64 +// cnf.DefaultString(key string, defaultVal string) string +// cnf.DefaultStrings(key string, defaultVal []string) []string +// cnf.DefaultInt(key string, defaultVal int) int +// cnf.DefaultInt64(key string, defaultVal int64) int64 +// cnf.DefaultBool(key string, defaultVal bool) bool +// cnf.DefaultFloat(key string, defaultVal float64) float64 // cnf.DIY(key string) (interface{}, error) // cnf.GetSection(section string) (map[string]string, error) // cnf.SaveConfigFile(filename string) error @@ -48,19 +48,19 @@ import ( // Configer defines how to get and set value from configuration raw data. type Configer interface { - Set(key, val string) error // support section::key type in given key when using ini type. - String(key string) string // support section::key type in key string when using ini and json type; Int,Int64,Bool,Float,DIY are same. + Set(key, val string) error //support section::key type in given key when using ini type. + String(key string) string //support section::key type in key string when using ini and json type; Int,Int64,Bool,Float,DIY are same. Strings(key string) []string //get string slice Int(key string) (int, error) Int64(key string) (int64, error) Bool(key string) (bool, error) Float(key string) (float64, error) - DefaultString(key string, defaultval string) string // support section::key type in key string when using ini and json type; Int,Int64,Bool,Float,DIY are same. - DefaultStrings(key string, defaultval []string) []string //get string slice - DefaultInt(key string, defaultval int) int - DefaultInt64(key string, defaultval int64) int64 - DefaultBool(key string, defaultval bool) bool - DefaultFloat(key string, defaultval float64) float64 + DefaultString(key string, defaultVal string) string // support section::key type in key string when using ini and json type; Int,Int64,Bool,Float,DIY are same. + DefaultStrings(key string, defaultVal []string) []string //get string slice + DefaultInt(key string, defaultVal int) int + DefaultInt64(key string, defaultVal int64) int64 + DefaultBool(key string, defaultVal bool) bool + DefaultFloat(key string, defaultVal float64) float64 DIY(key string) (interface{}, error) GetSection(section string) (map[string]string, error) SaveConfigFile(filename string) error diff --git a/config_test.go b/config_test.go index a74471fc..cf4a781d 100644 --- a/config_test.go +++ b/config_test.go @@ -23,7 +23,7 @@ func TestDefaults(t *testing.T) { t.Errorf("FlashName was not set to default.") } - if BConfig.WebConfig.FlashSeperator != "BEEGOFLASH" { + if BConfig.WebConfig.FlashSeparator != "BEEGOFLASH" { t.Errorf("FlashName was not set to default.") } } diff --git a/controller.go b/controller.go index 3bc871cc..ab261a56 100644 --- a/controller.go +++ b/controller.go @@ -595,7 +595,7 @@ func (c *Controller) XSRFToken() string { if c.XSRFExpire > 0 { expire = int64(c.XSRFExpire) } - c._xsrfToken = c.Ctx.XSRFToken(BConfig.WebConfig.XSRFKEY, expire) + c._xsrfToken = c.Ctx.XSRFToken(BConfig.WebConfig.XSRFKey, expire) } return c._xsrfToken } diff --git a/flash.go b/flash.go index 123bfdc3..a6485a17 100644 --- a/flash.go +++ b/flash.go @@ -83,7 +83,7 @@ func (fd *FlashData) Store(c *Controller) { c.Data["flash"] = fd.Data var flashValue string for key, value := range fd.Data { - flashValue += "\x00" + key + "\x23" + BConfig.WebConfig.FlashSeperator + "\x23" + value + "\x00" + flashValue += "\x00" + key + "\x23" + BConfig.WebConfig.FlashSeparator + "\x23" + value + "\x00" } c.Ctx.SetCookie(BConfig.WebConfig.FlashName, url.QueryEscape(flashValue), 0, "/") } @@ -96,7 +96,7 @@ func ReadFromRequest(c *Controller) *FlashData { vals := strings.Split(v, "\x00") for _, v := range vals { if len(v) > 0 { - kv := strings.Split(v, "\x23"+BConfig.WebConfig.FlashSeperator+"\x23") + kv := strings.Split(v, "\x23"+BConfig.WebConfig.FlashSeparator+"\x23") if len(kv) == 2 { flash.Data[kv[0]] = kv[1] } From 814e4ac031eda0b7aae6b77c600a86a99522e384 Mon Sep 17 00:00:00 2001 From: JessonChan Date: Fri, 15 Jan 2016 14:14:09 +0800 Subject: [PATCH 421/436] rename the docsSepc to docs_spec --- swagger/{docsSpec.go => docs_spec.go} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename swagger/{docsSpec.go => docs_spec.go} (97%) diff --git a/swagger/docsSpec.go b/swagger/docs_spec.go similarity index 97% rename from swagger/docsSpec.go rename to swagger/docs_spec.go index 1874da42..d8402aa5 100644 --- a/swagger/docsSpec.go +++ b/swagger/docs_spec.go @@ -23,8 +23,8 @@ type ResourceListing struct { APIVersion string `json:"apiVersion"` SwaggerVersion string `json:"swaggerVersion"` // e.g 1.2 // BasePath string `json:"basePath"` obsolete in 1.1 - APIs []APIRef `json:"apis"` - Infos Infomation `json:"info"` + APIs []APIRef `json:"apis"` + Info Information `json:"info"` } // APIRef description the api path and description @@ -33,8 +33,8 @@ type APIRef struct { Description string `json:"description"` } -// Infomation show the API Infomation -type Infomation struct { +// Information show the API Information +type Information struct { Title string `json:"title,omitempty"` Description string `json:"description,omitempty"` Contact string `json:"contact,omitempty"` From 797571c85ff8daed8cfd79c97d29a3dd8ba7a33d Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 15 Jan 2016 14:36:45 +0800 Subject: [PATCH 422/436] fix the ORM test case --- orm/models_test.go | 2 +- orm/orm_test.go | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/orm/models_test.go b/orm/models_test.go index 8f1ebe77..ee56e8e8 100644 --- a/orm/models_test.go +++ b/orm/models_test.go @@ -335,7 +335,7 @@ func NewComment() *Comment { } type Group struct { - GID string `orm:"pk;column(gid);size(32);unique"` + ID int `orm:"column(gid);size(32)"` Name string Permissions []*Permission `orm:"reverse(many)" json:"-"` } diff --git a/orm/orm_test.go b/orm/orm_test.go index 94f8b741..d6f6c7a9 100644 --- a/orm/orm_test.go +++ b/orm/orm_test.go @@ -663,12 +663,10 @@ The program—and web server—godoc processes Go source files to extract docume groups := []*Group{ { - GID: "g1", Name: "admins", Permissions: []*Permission{permissions[0], permissions[1], permissions[2]}, }, { - GID: "g2", Name: "users", Permissions: []*Permission{permissions[1], permissions[2]}, }, @@ -683,7 +681,7 @@ The program—and web server—godoc processes Go source files to extract docume for _, group := range groups { _, err := dORM.Insert(group) throwFail(t, err) - //throwFail(t, AssertIs(id > 0, true)) + throwFail(t, AssertIs(id > 0, true)) num := len(group.Permissions) if num > 0 { From 897cf57840b792348b62bd3914d2d7cd4e7deea9 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 15 Jan 2016 14:59:16 +0800 Subject: [PATCH 423/436] use travis-ci.org as build-status --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1fef8305..fec6113f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## Beego -[![Build Status](https://drone.io/github.com/astaxie/beego/status.png)](https://drone.io/github.com/astaxie/beego/latest) +[![Build Status](https://travis-ci.org/astaxie/beego.svg?branch=master)](https://travis-ci.org/astaxie/beego) [![GoDoc](http://godoc.org/github.com/astaxie/beego?status.svg)](http://godoc.org/github.com/astaxie/beego) beego is used for rapid development of RESTful APIs, web apps and backend services in Go. From f70d2cc373b1784c10b5533a3d156cc426b92d54 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 17 Jan 2016 18:24:29 +0800 Subject: [PATCH 424/436] add test case for tidb --- .travis.yml | 4 +++- orm/models_test.go | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c59cef61..a393e475 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,10 @@ services: - postgresql - memcached env: - - ORM_DRIVER=sqlite3 ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db + - ORM_DRIVER=sqlite3 ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db - ORM_DRIVER=mysql ORM_SOURCE="root:@/orm_test?charset=utf8" - ORM_DRIVER=postgres ORM_SOURCE="user=postgres dbname=orm_test sslmode=disable" + - ORM_DRIVER=tidb ORM_SOURCE="memory://test/test" install: - go get github.com/lib/pq - go get github.com/go-sql-driver/mysql @@ -24,6 +25,7 @@ install: - go get github.com/couchbase/go-couchbase - go get github.com/siddontang/ledisdb/config - go get github.com/siddontang/ledisdb/ledis + - go get github.com/pingcap/tidb before_script: - sh -c "if [ '$ORM_DRIVER' = 'postgres' ]; then psql -c 'create database orm_test;' -U postgres; fi" - sh -c "if [ '$ORM_DRIVER' = 'mysql' ]; then mysql -u root -e 'create database orm_test;'; fi" diff --git a/orm/models_test.go b/orm/models_test.go index ee56e8e8..c5397e11 100644 --- a/orm/models_test.go +++ b/orm/models_test.go @@ -25,9 +25,7 @@ import ( _ "github.com/go-sql-driver/mysql" _ "github.com/lib/pq" _ "github.com/mattn/go-sqlite3" - - // As tidb can't use go get, so disable the tidb testing now - // _ "github.com/pingcap/tidb" + _ "github.com/pingcap/tidb" ) // A slice string field. From a304bb9c25d54699afc00143af718010d237bfb2 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 17 Jan 2016 18:35:11 +0800 Subject: [PATCH 425/436] Revert "add test case for tidb" This reverts commit f70d2cc373b1784c10b5533a3d156cc426b92d54. --- .travis.yml | 4 +--- orm/models_test.go | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a393e475..c59cef61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,10 +9,9 @@ services: - postgresql - memcached env: - - ORM_DRIVER=sqlite3 ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db + - ORM_DRIVER=sqlite3 ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db - ORM_DRIVER=mysql ORM_SOURCE="root:@/orm_test?charset=utf8" - ORM_DRIVER=postgres ORM_SOURCE="user=postgres dbname=orm_test sslmode=disable" - - ORM_DRIVER=tidb ORM_SOURCE="memory://test/test" install: - go get github.com/lib/pq - go get github.com/go-sql-driver/mysql @@ -25,7 +24,6 @@ install: - go get github.com/couchbase/go-couchbase - go get github.com/siddontang/ledisdb/config - go get github.com/siddontang/ledisdb/ledis - - go get github.com/pingcap/tidb before_script: - sh -c "if [ '$ORM_DRIVER' = 'postgres' ]; then psql -c 'create database orm_test;' -U postgres; fi" - sh -c "if [ '$ORM_DRIVER' = 'mysql' ]; then mysql -u root -e 'create database orm_test;'; fi" diff --git a/orm/models_test.go b/orm/models_test.go index c5397e11..ee56e8e8 100644 --- a/orm/models_test.go +++ b/orm/models_test.go @@ -25,7 +25,9 @@ import ( _ "github.com/go-sql-driver/mysql" _ "github.com/lib/pq" _ "github.com/mattn/go-sqlite3" - _ "github.com/pingcap/tidb" + + // As tidb can't use go get, so disable the tidb testing now + // _ "github.com/pingcap/tidb" ) // A slice string field. From 566aab4354ab06b35d2fe80fcc13aeb448d4c1f2 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 17 Jan 2016 22:49:02 +0800 Subject: [PATCH 426/436] mail send support Address format --- utils/mail.go | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/mail.go b/utils/mail.go index c8ba3d92..ffaafd4c 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -231,6 +231,7 @@ func (e *Email) Send() error { if err != nil { return err } + e.From = from.String() raw, err := e.Bytes() if err != nil { return err From 9b2597be6842d97756758ffaa48535377d63ab26 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 17 Jan 2016 23:48:09 +0800 Subject: [PATCH 427/436] fix the mail send empty subject --- utils/mail.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/utils/mail.go b/utils/mail.go index ffaafd4c..2270b553 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -96,12 +96,16 @@ func (e *Email) Bytes() ([]byte, error) { e.Headers.Set("Disposition-Notification-To", strings.Join(e.ReadReceipt, ",")) } e.Headers.Set("MIME-Version", "1.0") - e.Headers.Set("Content-Type", fmt.Sprintf("multipart/mixed;\r\n boundary=%s\r\n", w.Boundary())) // Write the envelope headers (including any custom headers) if err := headerToBytes(buff, e.Headers); err != nil { return nil, fmt.Errorf("Failed to render message headers: %s", err) } + + e.Headers.Set("Content-Type", fmt.Sprintf("multipart/mixed;\r\n boundary=%s\r\n", w.Boundary())) + fmt.Fprintf(w, "%s:", "Content-Type") + fmt.Fprintf(w, " %s\r\n", fmt.Sprintf("multipart/mixed;\r\n boundary=%s\r\n", w.Boundary())) + // Start the multipart/mixed part fmt.Fprintf(buff, "--%s\r\n", w.Boundary()) header := textproto.MIMEHeader{} From 90d1349665028c617db620644e31f8a999f42ed7 Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 17 Jan 2016 23:48:17 +0800 Subject: [PATCH 428/436] fix typo --- config/json.go | 2 +- doc.go | 2 +- orm/orm_conds.go | 2 +- orm/qb_mysql.go | 2 +- plugins/apiauth/apiauth.go | 2 +- session/sess_cookie_test.go | 4 ++-- template.go | 2 +- templatefunc.go | 2 +- utils/captcha/captcha.go | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/json.go b/config/json.go index 6929baad..65b4ac48 100644 --- a/config/json.go +++ b/config/json.go @@ -164,7 +164,7 @@ func (c *JSONConfigContainer) String(key string) string { // DefaultString returns the string value for a given key. // if err != nil return defaltval func (c *JSONConfigContainer) DefaultString(key string, defaultval string) string { - // TODO FIXME should not use "" to replace non existance + // TODO FIXME should not use "" to replace non existence if v := c.String(key); v != "" { return v } diff --git a/doc.go b/doc.go index 4be305b3..8825bd29 100644 --- a/doc.go +++ b/doc.go @@ -12,6 +12,6 @@ beego is inspired by Tornado, Sinatra and Flask with the added benefit of some G beego.Run() } -more infomation: http://beego.me +more information: http://beego.me */ package beego diff --git a/orm/orm_conds.go b/orm/orm_conds.go index b2eae418..e56d6fbb 100644 --- a/orm/orm_conds.go +++ b/orm/orm_conds.go @@ -19,7 +19,7 @@ import ( "strings" ) -// ExprSep define the expression seperation +// ExprSep define the expression separation const ( ExprSep = "__" ) diff --git a/orm/qb_mysql.go b/orm/qb_mysql.go index f6d1e185..886bc50e 100644 --- a/orm/qb_mysql.go +++ b/orm/qb_mysql.go @@ -20,7 +20,7 @@ import ( "strings" ) -// CommaSpace is the seperation +// CommaSpace is the separation const CommaSpace = ", " // MySQLQueryBuilder is the SQL build diff --git a/plugins/apiauth/apiauth.go b/plugins/apiauth/apiauth.go index 3091c698..8af08088 100644 --- a/plugins/apiauth/apiauth.go +++ b/plugins/apiauth/apiauth.go @@ -41,7 +41,7 @@ // // 1. appid // -// appid is asigned to the application +// appid is assigned to the application // // 2. signature // diff --git a/session/sess_cookie_test.go b/session/sess_cookie_test.go index b5982260..209e501c 100644 --- a/session/sess_cookie_test.go +++ b/session/sess_cookie_test.go @@ -80,7 +80,7 @@ func TestDestorySessionCookie(t *testing.T) { t.Fatal("get cookie session id is not the same again.") } - // After destory session , will get a new session id . + // After destroy session , will get a new session id . globalSessions.SessionDestroy(w, r1) r2, _ := http.NewRequest("GET", "/", nil) r2.Header.Set("Cookie", w.Header().Get("Set-Cookie")) @@ -91,6 +91,6 @@ func TestDestorySessionCookie(t *testing.T) { t.Fatal("session start error") } if newSession.SessionID() == session.SessionID() { - t.Fatal("after destory session and reqeust again ,get cookie session id is same.") + t.Fatal("after destroy session and reqeust again ,get cookie session id is same.") } } diff --git a/template.go b/template.go index 9aac3ea2..0ff2eea0 100644 --- a/template.go +++ b/template.go @@ -31,7 +31,7 @@ var ( beegoTplFuncMap = make(template.FuncMap) // BeeTemplates caching map and supported template file extensions. BeeTemplates = make(map[string]*template.Template) - // BeeTemplateExt stores the template extention which will build + // BeeTemplateExt stores the template extension which will build BeeTemplateExt = []string{"tpl", "html"} ) diff --git a/templatefunc.go b/templatefunc.go index e944bc73..bc265321 100644 --- a/templatefunc.go +++ b/templatefunc.go @@ -670,7 +670,7 @@ func MapGet(arg1 interface{}, arg2 ...interface{}) (interface{}, error) { if arg1Type.Kind() == reflect.Map && len(arg2) > 0 { // check whether arg2[0] type equals to arg1 key type - // if they are different, make convertion + // if they are different, make conversion arg2Val := reflect.ValueOf(arg2[0]) arg2Type := reflect.TypeOf(arg2[0]) if arg2Type.Kind() != arg1Type.Key().Kind() { diff --git a/utils/captcha/captcha.go b/utils/captcha/captcha.go index 4ac5c9f9..31098f9a 100644 --- a/utils/captcha/captcha.go +++ b/utils/captcha/captcha.go @@ -158,7 +158,7 @@ func (c *Captcha) Handler(ctx *context.Context) { } } -// CreateCaptchaHTML tempalte func for output html +// CreateCaptchaHTML template func for output html func (c *Captcha) CreateCaptchaHTML() template.HTML { value, err := c.CreateCaptcha() if err != nil { @@ -255,7 +255,7 @@ func NewCaptcha(urlPrefix string, store cache.Cache) *Captcha { } // NewWithFilter create a new captcha.Captcha and auto AddFilter for serve captacha image -// and add a tempalte func for output html +// and add a template func for output html func NewWithFilter(urlPrefix string, store cache.Cache) *Captcha { cpt := NewCaptcha(urlPrefix, store) From 9adf20d72ea1c6db2adbe2fcd64cb4ff4219272f Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 17 Jan 2016 23:57:07 +0800 Subject: [PATCH 429/436] gofmt -s --- cache/file.go | 8 ++++---- cache/memcache/memcache.go | 5 +++-- cache/memory.go | 6 +++--- context/acceptencoder_test.go | 15 +++++++-------- grace/grace.go | 16 ++++++++-------- logs/console_test.go | 1 - logs/file_test.go | 3 +-- swagger/docs_spec.go | 4 ++-- tree.go | 4 ++-- 9 files changed, 30 insertions(+), 32 deletions(-) diff --git a/cache/file.go b/cache/file.go index 3a7aa8b0..e2ba70e3 100644 --- a/cache/file.go +++ b/cache/file.go @@ -39,10 +39,10 @@ type FileCacheItem struct { // FileCache Config var ( - FileCachePath = "cache" // cache directory - FileCacheFileSuffix = ".bin" // cache file suffix - FileCacheDirectoryLevel = 2 // cache file deep level if auto generated cache files. - FileCacheEmbedExpiry time.Duration = 0 // cache expire time, default is no expire forever. + FileCachePath = "cache" // cache directory + FileCacheFileSuffix = ".bin" // cache file suffix + FileCacheDirectoryLevel = 2 // cache file deep level if auto generated cache files. + FileCacheEmbedExpiry time.Duration = 0 // cache expire time, default is no expire forever. ) // FileCache is cache adapter for file storage. diff --git a/cache/memcache/memcache.go b/cache/memcache/memcache.go index 15ea5d3e..3f0fe411 100644 --- a/cache/memcache/memcache.go +++ b/cache/memcache/memcache.go @@ -36,8 +36,9 @@ import ( "github.com/bradfitz/gomemcache/memcache" - "github.com/astaxie/beego/cache" "time" + + "github.com/astaxie/beego/cache" ) // Cache Memcache adapter. @@ -100,7 +101,7 @@ func (rc *Cache) Put(key string, val interface{}, timeout time.Duration) error { if !ok { return errors.New("val must string") } - item := memcache.Item{Key: key, Value: []byte(v), Expiration: int32(timeout/time.Second)} + item := memcache.Item{Key: key, Value: []byte(v), Expiration: int32(timeout / time.Second)} return rc.conn.Set(&item) } diff --git a/cache/memory.go b/cache/memory.go index d928afdb..fff2ebbb 100644 --- a/cache/memory.go +++ b/cache/memory.go @@ -86,9 +86,9 @@ func (bc *MemoryCache) Put(name string, value interface{}, lifespan time.Duratio bc.Lock() defer bc.Unlock() bc.items[name] = &MemoryItem{ - val: value, + val: value, createdTime: time.Now(), - lifespan: lifespan, + lifespan: lifespan, } return nil } @@ -200,7 +200,7 @@ func (bc *MemoryCache) StartAndGC(config string) error { cf = make(map[string]int) cf["interval"] = DefaultEvery } - dur := time.Duration(cf["interval"]) * time.Second + dur := time.Duration(cf["interval"]) * time.Second bc.Every = cf["interval"] bc.dur = dur go bc.vaccuum() diff --git a/context/acceptencoder_test.go b/context/acceptencoder_test.go index 147313c5..3afff679 100644 --- a/context/acceptencoder_test.go +++ b/context/acceptencoder_test.go @@ -20,26 +20,25 @@ import ( ) func Test_ExtractEncoding(t *testing.T) { - if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"gzip,deflate"}}}) != "gzip" { + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": {"gzip,deflate"}}}) != "gzip" { t.Fail() } - if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"deflate,gzip"}}}) != "deflate" { + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": {"deflate,gzip"}}}) != "deflate" { t.Fail() } - if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"gzip;q=.5,deflate"}}}) != "deflate" { + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": {"gzip;q=.5,deflate"}}}) != "deflate" { t.Fail() } - if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"gzip;q=.5,deflate;q=0.3"}}}) != "gzip" { + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": {"gzip;q=.5,deflate;q=0.3"}}}) != "gzip" { t.Fail() } - - if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"gzip;q=0,deflate"}}}) != "deflate" { + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": {"gzip;q=0,deflate"}}}) != "deflate" { t.Fail() } - if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"deflate;q=0.5,gzip;q=0.5,identity"}}}) != "" { + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": {"deflate;q=0.5,gzip;q=0.5,identity"}}}) != "" { t.Fail() } - if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": []string{"*"}}}) != "gzip" { + if parseEncoding(&http.Request{Header: map[string][]string{"Accept-Encoding": {"*"}}}) != "gzip" { t.Fail() } } diff --git a/grace/grace.go b/grace/grace.go index af530d50..af4e9068 100644 --- a/grace/grace.go +++ b/grace/grace.go @@ -118,15 +118,15 @@ func NewServer(addr string, handler http.Handler) (srv *Server) { sigChan: make(chan os.Signal), isChild: isChild, SignalHooks: map[int]map[os.Signal][]func(){ - PreSignal: map[os.Signal][]func(){ - syscall.SIGHUP: []func(){}, - syscall.SIGINT: []func(){}, - syscall.SIGTERM: []func(){}, + PreSignal: { + syscall.SIGHUP: {}, + syscall.SIGINT: {}, + syscall.SIGTERM: {}, }, - PostSignal: map[os.Signal][]func(){ - syscall.SIGHUP: []func(){}, - syscall.SIGINT: []func(){}, - syscall.SIGTERM: []func(){}, + PostSignal: { + syscall.SIGHUP: {}, + syscall.SIGINT: {}, + syscall.SIGTERM: {}, }, }, state: StateInit, diff --git a/logs/console_test.go b/logs/console_test.go index c4bb1da2..ce8937d4 100644 --- a/logs/console_test.go +++ b/logs/console_test.go @@ -42,4 +42,3 @@ func TestConsole(t *testing.T) { log2.SetLogger("console", `{"level":3}`) testConsoleCalls(log2) } - diff --git a/logs/file_test.go b/logs/file_test.go index f9b54c26..1fa6cdaa 100644 --- a/logs/file_test.go +++ b/logs/file_test.go @@ -130,7 +130,6 @@ func BenchmarkFile(b *testing.B) { os.Remove("test4.log") } - func BenchmarkFileAsynchronous(b *testing.B) { log := NewLogger(100000) log.SetLogger("file", `{"filename":"test4.log"}`) @@ -168,7 +167,7 @@ func BenchmarkFileOnGoroutine(b *testing.B) { log := NewLogger(100000) log.SetLogger("file", `{"filename":"test4.log"}`) for i := 0; i < b.N; i++ { - go log.Debug("debug") + go log.Debug("debug") } os.Remove("test4.log") } diff --git a/swagger/docs_spec.go b/swagger/docs_spec.go index d8402aa5..680324dc 100644 --- a/swagger/docs_spec.go +++ b/swagger/docs_spec.go @@ -23,8 +23,8 @@ type ResourceListing struct { APIVersion string `json:"apiVersion"` SwaggerVersion string `json:"swaggerVersion"` // e.g 1.2 // BasePath string `json:"basePath"` obsolete in 1.1 - APIs []APIRef `json:"apis"` - Info Information `json:"info"` + APIs []APIRef `json:"apis"` + Info Information `json:"info"` } // APIRef description the api path and description diff --git a/tree.go b/tree.go index 70321d67..a6ffe062 100644 --- a/tree.go +++ b/tree.go @@ -141,7 +141,7 @@ func (t *Tree) addtree(segments []string, tree *Tree, wildcards []string, reg st regexpStr = "([^.]+).(.+)" params = params[1:] } else { - for _ = range params { + for range params { regexpStr = "([^/]+)/" + regexpStr } } @@ -254,7 +254,7 @@ func (t *Tree) addseg(segments []string, route interface{}, wildcards []string, regexpStr = "/([^.]+).(.+)" params = params[1:] } else { - for _ = range params { + for range params { regexpStr = "/([^/]+)" + regexpStr } } From da36d1d0e79404e84a8e1e2cb0b713f5bda6deb2 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 18 Jan 2016 00:03:39 +0800 Subject: [PATCH 430/436] fix the wrong io.Writer --- utils/mail.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/mail.go b/utils/mail.go index 2270b553..1d80a039 100644 --- a/utils/mail.go +++ b/utils/mail.go @@ -103,8 +103,8 @@ func (e *Email) Bytes() ([]byte, error) { } e.Headers.Set("Content-Type", fmt.Sprintf("multipart/mixed;\r\n boundary=%s\r\n", w.Boundary())) - fmt.Fprintf(w, "%s:", "Content-Type") - fmt.Fprintf(w, " %s\r\n", fmt.Sprintf("multipart/mixed;\r\n boundary=%s\r\n", w.Boundary())) + fmt.Fprintf(buff, "%s:", "Content-Type") + fmt.Fprintf(buff, " %s\r\n", fmt.Sprintf("multipart/mixed;\r\n boundary=%s\r\n", w.Boundary())) // Start the multipart/mixed part fmt.Fprintf(buff, "--%s\r\n", w.Boundary()) From f925bb90589de3f5522b0f23060a34aefced0af5 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 18 Jan 2016 00:18:21 +0800 Subject: [PATCH 431/436] golint all the files --- cache/cache.go | 7 ++++--- cache/file.go | 8 ++++---- config.go | 11 ++++++++--- context/acceptencoder.go | 3 +-- controller.go | 6 ++---- error.go | 2 +- orm/orm_querym2m.go | 12 ++++++------ router.go | 12 ++++++------ session/redis/sess_redis.go | 2 +- staticfile.go | 10 ++++------ template.go | 2 +- templatefunc.go | 4 ++-- toolbox/healthcheck.go | 2 +- toolbox/statistics.go | 2 +- validation/util.go | 3 ++- validation/validators.go | 2 +- 16 files changed, 45 insertions(+), 43 deletions(-) diff --git a/cache/cache.go b/cache/cache.go index 2008402e..f7158741 100644 --- a/cache/cache.go +++ b/cache/cache.go @@ -67,14 +67,15 @@ type Cache interface { StartAndGC(config string) error } -type CacheInstance func() Cache +// Instance is a function create a new Cache Instance +type Instance func() Cache -var adapters = make(map[string]CacheInstance) +var adapters = make(map[string]Instance) // Register makes a cache adapter available by the adapter name. // If Register is called twice with the same name or if driver is nil, // it panics. -func Register(name string, adapter CacheInstance) { +func Register(name string, adapter Instance) { if adapter == nil { panic("cache: Register adapter is nil") } diff --git a/cache/file.go b/cache/file.go index e2ba70e3..4b030980 100644 --- a/cache/file.go +++ b/cache/file.go @@ -39,10 +39,10 @@ type FileCacheItem struct { // FileCache Config var ( - FileCachePath = "cache" // cache directory - FileCacheFileSuffix = ".bin" // cache file suffix - FileCacheDirectoryLevel = 2 // cache file deep level if auto generated cache files. - FileCacheEmbedExpiry time.Duration = 0 // cache expire time, default is no expire forever. + FileCachePath = "cache" // cache directory + FileCacheFileSuffix = ".bin" // cache file suffix + FileCacheDirectoryLevel = 2 // cache file deep level if auto generated cache files. + FileCacheEmbedExpiry time.Duration // cache expire time, default is no expire forever. ) // FileCache is cache adapter for file storage. diff --git a/config.go b/config.go index cffb7c2b..bc5ac640 100644 --- a/config.go +++ b/config.go @@ -25,7 +25,8 @@ import ( "github.com/astaxie/beego/utils" ) -type BeegoConfig struct { +// BeegoConfig is the main struct for BConfig +type Config struct { AppName string //Application name RunMode string //Running Mode: dev | prod RouterCaseSensitive bool @@ -40,6 +41,7 @@ type BeegoConfig struct { Log LogConfig } +// Listen holds for http and https related config type Listen struct { Graceful bool // Graceful means use graceful module to start the server ServerTimeOut int64 @@ -59,6 +61,7 @@ type Listen struct { EnableStdIo bool // EnableStdIo works with EnableFcgi Use FCGI via standard I/O } +// WebConfig holds web related config type WebConfig struct { AutoRender bool EnableDocs bool @@ -76,6 +79,7 @@ type WebConfig struct { Session SessionConfig } +// SessionConfig holds session related config type SessionConfig struct { SessionOn bool SessionProvider string @@ -87,6 +91,7 @@ type SessionConfig struct { SessionDomain string } +// LogConfig holds Log related config type LogConfig struct { AccessLogs bool FileLineNum bool @@ -95,7 +100,7 @@ type LogConfig struct { var ( // BConfig is the default config for Application - BConfig *BeegoConfig + BConfig *Config // AppConfig is the instance of Config, store the config information from file AppConfig *beegoAppConfig // AppConfigPath is the path to the config files @@ -109,7 +114,7 @@ var ( ) func init() { - BConfig = &BeegoConfig{ + BConfig = &Config{ AppName: "beego", RunMode: DEV, RouterCaseSensitive: true, diff --git a/context/acceptencoder.go b/context/acceptencoder.go index 07c5cb0b..033d9ca8 100644 --- a/context/acceptencoder.go +++ b/context/acceptencoder.go @@ -192,7 +192,6 @@ func parseEncoding(r *http.Request) string { } if cf, ok := encoderMap[lastQ.name]; ok { return cf.name - } else { - return "" } + return "" } diff --git a/controller.go b/controller.go index ab261a56..624e574a 100644 --- a/controller.go +++ b/controller.go @@ -393,10 +393,8 @@ func (c *Controller) GetStrings(key string, def ...[]string) []string { if f := c.Input(); f == nil { return defv - } else { - if vs := f[key]; len(vs) > 0 { - return vs - } + } else if vs := f[key]; len(vs) > 0 { + return vs } return defv diff --git a/error.go b/error.go index af57b7c7..94151dd8 100644 --- a/error.go +++ b/error.go @@ -204,7 +204,7 @@ type errorInfo struct { errorType int } -// map of http handlers for each error string. +// ErrorMaps holds map of http handlers for each error string. // there is 10 kinds default error(40x and 50x) var ErrorMaps = make(map[string]*errorInfo, 10) diff --git a/orm/orm_querym2m.go b/orm/orm_querym2m.go index 60c77cdf..b220bda6 100644 --- a/orm/orm_querym2m.go +++ b/orm/orm_querym2m.go @@ -42,18 +42,18 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) { dbase := orm.alias.DbBaser var models []interface{} - var other_values []interface{} - var other_names []string + var otherValues []interface{} + var otherNames []string for _, colname := range mi.fields.dbcols { if colname != mfi.column && colname != rfi.column && colname != fi.mi.fields.pk.column && mi.fields.columns[colname] != mi.fields.pk { - other_names = append(other_names, colname) + otherNames = append(otherNames, colname) } } for i, md := range mds { if reflect.Indirect(reflect.ValueOf(md)).Kind() != reflect.Struct && i > 0 { - other_values = append(other_values, md) + otherValues = append(otherValues, md) mds = append(mds[:i], mds[i+1:]...) } } @@ -94,8 +94,8 @@ func (o *queryM2M) Add(mds ...interface{}) (int64, error) { values = append(values, v1, v2) } - names = append(names, other_names...) - values = append(values, other_values...) + names = append(names, otherNames...) + values = append(values, otherValues...) return dbase.InsertValue(orm.db, mi, true, names, values) } diff --git a/router.go b/router.go index 9d8cd2e6..b3935c27 100644 --- a/router.go +++ b/router.go @@ -504,12 +504,12 @@ func (p *ControllerRegister) geturl(t *Tree, url, controllName, methodName strin if find { if l.regexps == nil { if len(l.wildcards) == 0 { - return true, strings.Replace(url, "/"+urlPlaceholder, "", 1) + toUrl(params) + return true, strings.Replace(url, "/"+urlPlaceholder, "", 1) + toURL(params) } if len(l.wildcards) == 1 { if v, ok := params[l.wildcards[0]]; ok { delete(params, l.wildcards[0]) - return true, strings.Replace(url, urlPlaceholder, v, 1) + toUrl(params) + return true, strings.Replace(url, urlPlaceholder, v, 1) + toURL(params) } return false, "" } @@ -518,7 +518,7 @@ func (p *ControllerRegister) geturl(t *Tree, url, controllName, methodName strin if e, isok := params[":ext"]; isok { delete(params, ":path") delete(params, ":ext") - return true, strings.Replace(url, urlPlaceholder, p+"."+e, -1) + toUrl(params) + return true, strings.Replace(url, urlPlaceholder, p+"."+e, -1) + toURL(params) } } } @@ -539,7 +539,7 @@ func (p *ControllerRegister) geturl(t *Tree, url, controllName, methodName strin return false, "" } } - return true, url + toUrl(params) + return true, url + toURL(params) } var i int var startreg bool @@ -566,7 +566,7 @@ func (p *ControllerRegister) geturl(t *Tree, url, controllName, methodName strin for _, p := range ps { url = strings.Replace(url, urlPlaceholder, p, 1) } - return true, url + toUrl(params) + return true, url + toURL(params) } } } @@ -864,7 +864,7 @@ func (p *ControllerRegister) recoverPanic(context *beecontext.Context) { } } -func toUrl(params map[string]string) string { +func toURL(params map[string]string) string { if len(params) == 0 { return "" } diff --git a/session/redis/sess_redis.go b/session/redis/sess_redis.go index 99a672d5..5107a8d1 100644 --- a/session/redis/sess_redis.go +++ b/session/redis/sess_redis.go @@ -45,7 +45,7 @@ import ( var redispder = &Provider{} -// redis max pool size +// MaxPoolSize redis max pool size var MaxPoolSize = 100 // SessionStore redis session store diff --git a/staticfile.go b/staticfile.go index f9f3dc3e..9534ce91 100644 --- a/staticfile.go +++ b/staticfile.go @@ -16,6 +16,7 @@ package beego import ( "bytes" + "errors" "net/http" "os" "path" @@ -23,15 +24,12 @@ import ( "strconv" "strings" "sync" - - "errors" - "time" "github.com/astaxie/beego/context" ) -var notStaticRequestErr = errors.New("request not a static file request") +var errNotStaticRequest = errors.New("request not a static file request") func serverStaticRouter(ctx *context.Context) { if ctx.Input.Method() != "GET" && ctx.Input.Method() != "HEAD" { @@ -39,7 +37,7 @@ func serverStaticRouter(ctx *context.Context) { } forbidden, filePath, fileInfo, err := lookupFile(ctx) - if err == notStaticRequestErr { + if err == errNotStaticRequest { return } @@ -175,7 +173,7 @@ func searchFile(ctx *context.Context) (string, os.FileInfo, error) { return filePath, fi, err } } - return "", nil, notStaticRequestErr + return "", nil, errNotStaticRequest } // lookupFile find the file to serve diff --git a/template.go b/template.go index 0ff2eea0..363c6754 100644 --- a/template.go +++ b/template.go @@ -50,7 +50,7 @@ func init() { beegoTplFuncMap["renderform"] = RenderForm beegoTplFuncMap["assets_js"] = AssetsJs beegoTplFuncMap["assets_css"] = AssetsCSS - beegoTplFuncMap["config"] = Config + beegoTplFuncMap["config"] = GetConfig beegoTplFuncMap["map_get"] = MapGet // go1.2 added template funcs diff --git a/templatefunc.go b/templatefunc.go index bc265321..8558733f 100644 --- a/templatefunc.go +++ b/templatefunc.go @@ -149,8 +149,8 @@ func NotNil(a interface{}) (isNil bool) { return CompareNot(a, nil) } -// Config get the Appconfig -func Config(returnType, key string, defaultVal interface{}) (value interface{}, err error) { +// GetConfig get the Appconfig +func GetConfig(returnType, key string, defaultVal interface{}) (value interface{}, err error) { switch returnType { case "String": value = AppConfig.String(key) diff --git a/toolbox/healthcheck.go b/toolbox/healthcheck.go index 46251eda..e3544b3a 100644 --- a/toolbox/healthcheck.go +++ b/toolbox/healthcheck.go @@ -30,7 +30,7 @@ // more docs: http://beego.me/docs/module/toolbox.md package toolbox -// health checker map +// AdminCheckList holds health checker map var AdminCheckList map[string]HealthChecker // HealthChecker health checker interface diff --git a/toolbox/statistics.go b/toolbox/statistics.go index 59c0ba0f..32eb7e23 100644 --- a/toolbox/statistics.go +++ b/toolbox/statistics.go @@ -133,7 +133,7 @@ func (m *URLMap) GetMapData() []map[string]interface{} { return resultLists } -// global statistics data map +// StatisticsMap hosld global statistics data map var StatisticsMap *URLMap func init() { diff --git a/validation/util.go b/validation/util.go index 7c3fd20c..9e7460a6 100644 --- a/validation/util.go +++ b/validation/util.go @@ -56,9 +56,10 @@ func init() { } } +// CustomFunc is for custom validate function type CustomFunc func(v *Validation, obj interface{}, key string) -// Add a custom function to validation +// AddCustomFunc Add a custom function to validation // The name can not be: // Clear // HasErrors diff --git a/validation/validators.go b/validation/validators.go index 9d9df467..ebff2191 100644 --- a/validation/validators.go +++ b/validation/validators.go @@ -46,7 +46,7 @@ var MessageTmpls = map[string]string{ "ZipCode": "Must be valid zipcode", } -// set default messages +// SetDefaultMessage set default messages // if not set, the default messages are // "Required": "Can not be empty", // "Min": "Minimum is %d", From 6f786e1dea82b940c81f11a7ca8b4dfe6426b225 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 18 Jan 2016 00:22:11 +0800 Subject: [PATCH 432/436] golint config.go --- config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.go b/config.go index bc5ac640..8cf21530 100644 --- a/config.go +++ b/config.go @@ -25,7 +25,7 @@ import ( "github.com/astaxie/beego/utils" ) -// BeegoConfig is the main struct for BConfig +// Config is the main struct for BConfig type Config struct { AppName string //Application name RunMode string //Running Mode: dev | prod From 089242eda050e0a298d3b5e9cae5eced74bcefa3 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 18 Jan 2016 00:36:05 +0800 Subject: [PATCH 433/436] memcache test mulit return map has no sequence --- cache/memcache/memcache_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cache/memcache/memcache_test.go b/cache/memcache/memcache_test.go index 19629059..8d98c177 100644 --- a/cache/memcache/memcache_test.go +++ b/cache/memcache/memcache_test.go @@ -17,10 +17,11 @@ package memcache import ( _ "github.com/bradfitz/gomemcache/memcache" - "github.com/astaxie/beego/cache" "strconv" "testing" "time" + + "github.com/astaxie/beego/cache" ) func TestMemcacheCache(t *testing.T) { @@ -93,10 +94,10 @@ func TestMemcacheCache(t *testing.T) { if len(vv) != 2 { t.Error("GetMulti ERROR") } - if vv[0].(string) != "author" { + if vv[0].(string) != "author" && vv[0].(string) != "author1" { t.Error("GetMulti ERROR") } - if vv[1].(string) != "author1" { + if vv[1].(string) != "author1" && vv[1].(string) != "author" { t.Error("GetMulti ERROR") } From ac3b013de7c20e578478a9d438477354365c250d Mon Sep 17 00:00:00 2001 From: youngsterxyf Date: Mon, 18 Jan 2016 15:17:42 +0800 Subject: [PATCH 434/436] DRY --- router.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/router.go b/router.go index b3935c27..66e7c9b1 100644 --- a/router.go +++ b/router.go @@ -321,7 +321,8 @@ func (p *ControllerRegister) Any(pattern string, f FilterFunc) { // ctx.Output.Body("hello world") // }) func (p *ControllerRegister) AddMethod(method, pattern string, f FilterFunc) { - if _, ok := HTTPMETHOD[strings.ToUpper(method)]; method != "*" && !ok { + method = strings.ToUpper(method) + if _, ok := HTTPMETHOD[method]; method != "*" && !ok { panic("not support http method: " + method) } route := &controllerInfo{} @@ -334,7 +335,7 @@ func (p *ControllerRegister) AddMethod(method, pattern string, f FilterFunc) { methods[val] = val } } else { - methods[strings.ToUpper(method)] = strings.ToUpper(method) + methods[method] = method } route.methods = methods for k := range methods { From 918b9e510f79254d8b0b90fad75b31dbefaf8052 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 18 Jan 2016 15:27:33 +0800 Subject: [PATCH 435/436] fix the add tempfunc --- utils/captcha/captcha.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/captcha/captcha.go b/utils/captcha/captcha.go index 31098f9a..1a4a6edc 100644 --- a/utils/captcha/captcha.go +++ b/utils/captcha/captcha.go @@ -263,7 +263,7 @@ func NewWithFilter(urlPrefix string, store cache.Cache) *Captcha { beego.InsertFilter(cpt.URLPrefix+"*", beego.BeforeRouter, cpt.Handler) // add to template func map - beego.AddFuncMap("create_captcha", cpt.CreateCaptchaHTML()) + beego.AddFuncMap("create_captcha", cpt.CreateCaptchaHTML) return cpt } From fa8f6e5a53bb229e1cf2b6b14d2719f4ab9ead49 Mon Sep 17 00:00:00 2001 From: astaxie Date: Mon, 18 Jan 2016 16:11:27 +0800 Subject: [PATCH 436/436] session destroy --- controller.go | 1 + router.go | 4 +- session/redis/sess_redis.go | 7 +--- session/redis/sess_redis_test.go | 64 -------------------------------- 4 files changed, 5 insertions(+), 71 deletions(-) delete mode 100644 session/redis/sess_redis_test.go diff --git a/controller.go b/controller.go index 624e574a..a2943d42 100644 --- a/controller.go +++ b/controller.go @@ -568,6 +568,7 @@ func (c *Controller) SessionRegenerateID() { // DestroySession cleans session data and session cookie. func (c *Controller) DestroySession() { c.Ctx.Input.CruSession.Flush() + c.Ctx.Input.CruSession = nil GlobalSessions.SessionDestroy(c.Ctx.ResponseWriter, c.Ctx.Request) } diff --git a/router.go b/router.go index 66e7c9b1..0e1d1d32 100644 --- a/router.go +++ b/router.go @@ -650,7 +650,9 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request) return } defer func() { - context.Input.CruSession.SessionRelease(rw) + if context.Input.CruSession != nil { + context.Input.CruSession.SessionRelease(rw) + } }() } diff --git a/session/redis/sess_redis.go b/session/redis/sess_redis.go index 5107a8d1..c46fa7cd 100644 --- a/session/redis/sess_redis.go +++ b/session/redis/sess_redis.go @@ -98,18 +98,13 @@ func (rs *SessionStore) SessionID() string { // SessionRelease save session values to redis func (rs *SessionStore) SessionRelease(w http.ResponseWriter) { - b, err := session.EncodeGob(rs.values) if err != nil { return } - c := rs.p.Get() defer c.Close() - // Update session value if exists or error. - if existed, err := redis.Bool(c.Do("EXISTS", rs.sid)); existed || err != nil { - c.Do("SETEX", rs.sid, rs.maxlifetime, string(b)) - } + c.Do("SETEX", rs.sid, rs.maxlifetime, string(b)) } // Provider redis session provider diff --git a/session/redis/sess_redis_test.go b/session/redis/sess_redis_test.go deleted file mode 100644 index 0c634428..00000000 --- a/session/redis/sess_redis_test.go +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright 2016 beego Author. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package redis - -import ( - "testing" -) - -func TestSessionRelease(t *testing.T) { - - provider := Provider{} - if err := provider.SessionInit(3, "127.0.0.1:6379"); err != nil { - t.Fatal("init session err,", err) - } - - sessionID := "beegosessionid_00001" - - session, err := provider.SessionRegenerate("", sessionID) - if err != nil { - t.Fatal("new session error,", err) - } - - // set item. - session.Set("k1", "v1") - // update. - session.SessionRelease(nil) - - session, err = provider.SessionRead(sessionID) - if err != nil { - t.Fatal("read session error,", err) - } - if v1 := session.Get("k1"); v1 == nil { - t.Fatal("want v1 got nil") - } else if v, _ := v1.(string); v != "v1" { - t.Fatalf("want v1 got %s", v) - } - - // delete - provider.SessionDestroy(sessionID) - session.Set("k2", "v2") - - session.SessionRelease(nil) - - session, err = provider.SessionRead(sessionID) - if err != nil { - t.Fatal("read session error,", err) - } - if session.Get("k1") != nil || session.Get("k2") != nil { - t.Fatalf("want emtpy session value,got %s,%s", session.Get("k1"), session.Get("k2")) - } - -}