From 9adf20d72ea1c6db2adbe2fcd64cb4ff4219272f Mon Sep 17 00:00:00 2001 From: astaxie Date: Sun, 17 Jan 2016 23:57:07 +0800 Subject: [PATCH] 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 } }