From 8bcf03c6522415e5b0f8b1c73cf03ea276acf9e3 Mon Sep 17 00:00:00 2001 From: astaxie Date: Fri, 11 Apr 2014 16:08:43 +0800 Subject: [PATCH] fix #576 --- admin.go | 2 +- cache/memcache/memcache.go | 1 - config/json.go | 6 ------ controller.go | 4 ---- logs/file.go | 2 +- memzipfile.go | 1 - orm/db.go | 5 ----- orm/db_utils.go | 1 - orm/models_test.go | 3 +-- orm/orm.go | 4 +--- orm/orm_queryset.go | 2 -- orm/orm_test.go | 8 ++++---- orm/utils.go | 1 - reload.go | 3 +-- router.go | 1 - session/couchbase/sess_couchbase.go | 1 - session/mysql/sess_mysql.go | 1 - session/postgres/sess_postgresql.go | 1 - session/redis/sess_redis.go | 1 - session/sess_cookie.go | 1 - session/sess_file.go | 1 - session/sess_mem.go | 3 --- session/sess_utils.go | 2 -- toolbox/profile.go | 2 +- 24 files changed, 10 insertions(+), 47 deletions(-) diff --git a/admin.go b/admin.go index 1cab32e0..3a0d782a 100644 --- a/admin.go +++ b/admin.go @@ -232,7 +232,7 @@ func runTask(rw http.ResponseWriter, req *http.Request) { if err != nil { fmt.Fprintf(rw, "%v", err) } - fmt.Fprintf(rw, "%s run success,Now the Status is %s", t.GetStatus()) + fmt.Fprintf(rw, "%s run success,Now the Status is %s", taskname, t.GetStatus()) } else { fmt.Fprintf(rw, "there's no task which named:%s", taskname) } diff --git a/cache/memcache/memcache.go b/cache/memcache/memcache.go index 130405c4..bd5ab269 100644 --- a/cache/memcache/memcache.go +++ b/cache/memcache/memcache.go @@ -105,7 +105,6 @@ func (rc *MemcacheCache) IsExist(key string) bool { } else { return true } - return true } // clear all cached in memcache. diff --git a/config/json.go b/config/json.go index 24874e8a..3e3d1d35 100644 --- a/config/json.go +++ b/config/json.go @@ -53,7 +53,6 @@ func (c *JsonConfigContainer) Bool(key string) (bool, error) { } else { return false, errors.New("not exist key:" + key) } - return false, nil } // Int returns the integer value for a given key. @@ -68,7 +67,6 @@ func (c *JsonConfigContainer) Int(key string) (int, error) { } else { return 0, errors.New("not exist key:" + key) } - return 0, nil } // Int64 returns the int64 value for a given key. @@ -83,7 +81,6 @@ func (c *JsonConfigContainer) Int64(key string) (int64, error) { } else { return 0, errors.New("not exist key:" + key) } - return 0, nil } // Float returns the float value for a given key. @@ -98,7 +95,6 @@ func (c *JsonConfigContainer) Float(key string) (float64, error) { } else { return 0.0, errors.New("not exist key:" + key) } - return 0.0, nil } // String returns the string value for a given key. @@ -113,7 +109,6 @@ func (c *JsonConfigContainer) String(key string) string { } else { return "" } - return "" } // Strings returns the []string value for a given key. @@ -137,7 +132,6 @@ func (c *JsonConfigContainer) DIY(key string) (v interface{}, err error) { } else { return nil, errors.New("not exist key") } - return nil, nil } // section.key or key diff --git a/controller.go b/controller.go index f2e2fa69..34b7febd 100644 --- a/controller.go +++ b/controller.go @@ -153,7 +153,6 @@ func (c *Controller) RenderBytes() ([]byte, error) { newbytes := bytes.NewBufferString("") if _, ok := BeeTemplates[c.TplNames]; !ok { panic("can't find templatefile in the path:" + c.TplNames) - return []byte{}, errors.New("can't find templatefile in the path:" + c.TplNames) } err := BeeTemplates[c.TplNames].ExecuteTemplate(newbytes, c.TplNames, c.Data) if err != nil { @@ -199,7 +198,6 @@ func (c *Controller) RenderBytes() ([]byte, error) { ibytes := bytes.NewBufferString("") if _, ok := BeeTemplates[c.TplNames]; !ok { panic("can't find templatefile in the path:" + c.TplNames) - return []byte{}, errors.New("can't find templatefile in the path:" + c.TplNames) } err := BeeTemplates[c.TplNames].ExecuteTemplate(ibytes, c.TplNames, c.Data) if err != nil { @@ -209,7 +207,6 @@ func (c *Controller) RenderBytes() ([]byte, error) { icontent, _ := ioutil.ReadAll(ibytes) return icontent, nil } - return []byte{}, nil } // Redirect sends the redirection response to url with status code. @@ -243,7 +240,6 @@ func (c *Controller) UrlFor(endpoint string, values ...string) string { } else { return UrlFor(endpoint, values...) } - return "" } // ServeJson sends a json response with encoding charset. diff --git a/logs/file.go b/logs/file.go index 9400e04d..4c560330 100644 --- a/logs/file.go +++ b/logs/file.go @@ -30,7 +30,7 @@ type FileLogWriter struct { // Rotate daily Daily bool `json:"daily"` - Maxdays int64 `json:"maxdays` + Maxdays int64 `json:"maxdays"` daily_opendate int Rotate bool `json:"rotate"` diff --git a/memzipfile.go b/memzipfile.go index c62e2bc4..50c3205f 100644 --- a/memzipfile.go +++ b/memzipfile.go @@ -195,5 +195,4 @@ func getAcceptEncodingZip(r *http.Request) string { } else { return "" } - return "" } diff --git a/orm/db.go b/orm/db.go index dfb53621..e84062e8 100644 --- a/orm/db.go +++ b/orm/db.go @@ -446,7 +446,6 @@ func (d *dbBase) Update(q dbQuerier, mi *modelInfo, ind reflect.Value, tz *time. } else { return 0, err } - return 0, nil } // execute delete sql dbQuerier with given struct reflect.Value. @@ -489,7 +488,6 @@ func (d *dbBase) Delete(q dbQuerier, mi *modelInfo, ind reflect.Value, tz *time. } else { return 0, err } - return 0, nil } // update table-related record by querySet. @@ -566,7 +564,6 @@ func (d *dbBase) UpdateBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Con } else { return 0, err } - return 0, nil } // delete related records. @@ -671,8 +668,6 @@ func (d *dbBase) DeleteBatch(q dbQuerier, qs *querySet, mi *modelInfo, cond *Con } else { return 0, err } - - return 0, nil } // read related records. diff --git a/orm/db_utils.go b/orm/db_utils.go index 3c8d2d23..da7c9976 100644 --- a/orm/db_utils.go +++ b/orm/db_utils.go @@ -13,7 +13,6 @@ func getDbAlias(name string) *alias { } else { panic(fmt.Errorf("unknown DataBase alias name %s", name)) } - return nil } // get pk column info. diff --git a/orm/models_test.go b/orm/models_test.go index e37e53d9..7f845721 100644 --- a/orm/models_test.go +++ b/orm/models_test.go @@ -83,7 +83,6 @@ func (e *JsonField) SetRaw(value interface{}) error { default: return fmt.Errorf(" unknown value `%v`", value) } - return nil } func (e *JsonField) RawValue() interface{} { @@ -122,7 +121,7 @@ type DataNull struct { Char string `orm:"null;size(50)"` Text string `orm:"null;type(text)"` Date time.Time `orm:"null;type(date)"` - DateTime time.Time `orm:"null;column(datetime)""` + DateTime time.Time `orm:"null;column(datetime)"` Byte byte `orm:"null"` Rune rune `orm:"null"` Int int `orm:"null"` diff --git a/orm/orm.go b/orm/orm.go index 25857fa8..920d7f40 100644 --- a/orm/orm.go +++ b/orm/orm.go @@ -293,7 +293,7 @@ func (o *orm) queryRelated(md interface{}, name string) (*modelInfo, *fieldInfo, } if qs == nil { - panic(fmt.Errorf(" name `%s` for model `%s` is not an available rel/reverse field")) + panic(fmt.Errorf(" name `%s` for model `%s` is not an available rel/reverse field", md, name)) } return mi, fi, ind, qs @@ -441,8 +441,6 @@ func (o *orm) Driver() Driver { func (o *orm) GetDB() dbQuerier { panic(ErrNotImplement) - // not enough - return o.db } // create new orm diff --git a/orm/orm_queryset.go b/orm/orm_queryset.go index d16f8eb5..f21da552 100644 --- a/orm/orm_queryset.go +++ b/orm/orm_queryset.go @@ -209,7 +209,6 @@ func (o *querySet) ValuesFlat(result *ParamsList, expr string) (int64, error) { // } func (o *querySet) RowsToMap(result *Params, keyCol, valueCol string) (int64, error) { panic(ErrNotImplement) - return o.orm.alias.DbBaser.RowsTo(o.orm.db, o, o.mi, o.cond, result, keyCol, valueCol, o.orm.alias.TZ) } // query all rows into struct with specify key and value column name. @@ -224,7 +223,6 @@ func (o *querySet) RowsToMap(result *Params, keyCol, valueCol string) (int64, er // } func (o *querySet) RowsToStruct(ptrStruct interface{}, keyCol, valueCol string) (int64, error) { panic(ErrNotImplement) - return o.orm.alias.DbBaser.RowsTo(o.orm.db, o, o.mi, o.cond, ptrStruct, keyCol, valueCol, o.orm.alias.TZ) } // create new QuerySeter. diff --git a/orm/orm_test.go b/orm/orm_test.go index cfdcc1a7..3ae5bc12 100644 --- a/orm/orm_test.go +++ b/orm/orm_test.go @@ -282,10 +282,10 @@ func TestNullDataTypes(t *testing.T) { d = DataNull{ DateTime: time.Now(), - NullString: sql.NullString{"test", true}, - NullBool: sql.NullBool{true, true}, - NullInt64: sql.NullInt64{42, true}, - NullFloat64: sql.NullFloat64{42.42, true}, + NullString: sql.NullString{String: "test", Valid: true}, + NullBool: sql.NullBool{Bool: true, Valid: true}, + NullInt64: sql.NullInt64{Int64: 42, Valid: true}, + NullFloat64: sql.NullFloat64{Float64: 42.42, Valid: true}, } id, err = dORM.Insert(&d) diff --git a/orm/utils.go b/orm/utils.go index 2e347278..26df5a3f 100644 --- a/orm/utils.go +++ b/orm/utils.go @@ -266,5 +266,4 @@ func indirectType(v reflect.Type) reflect.Type { default: return v } - return v } diff --git a/reload.go b/reload.go index 05a24f86..7a43e0ed 100644 --- a/reload.go +++ b/reload.go @@ -29,7 +29,7 @@ type conn struct { net.Conn wg *sync.WaitGroup isclose bool - lock sync.Mutex + lock *sync.Mutex } // Close current processing connection. @@ -102,7 +102,6 @@ func WaitSignal(l net.Listener) error { return nil } } - return nil // It'll never get here. } // Kill current running os process. diff --git a/router.go b/router.go index aa10de2d..fe749ea5 100644 --- a/router.go +++ b/router.go @@ -216,7 +216,6 @@ func (p *ControllerRegistor) Add(pattern string, c ControllerInterface, mappingM if regexErr != nil { //TODO add error handling here to avoid panic panic(regexErr) - return } //now create the Route diff --git a/session/couchbase/sess_couchbase.go b/session/couchbase/sess_couchbase.go index 29661b1a..cab1c2fe 100644 --- a/session/couchbase/sess_couchbase.go +++ b/session/couchbase/sess_couchbase.go @@ -43,7 +43,6 @@ func (cs *CouchbaseSessionStore) Get(key interface{}) interface{} { } else { return nil } - return nil } func (cs *CouchbaseSessionStore) Delete(key interface{}) error { diff --git a/session/mysql/sess_mysql.go b/session/mysql/sess_mysql.go index 2e88aec3..26c0b647 100644 --- a/session/mysql/sess_mysql.go +++ b/session/mysql/sess_mysql.go @@ -47,7 +47,6 @@ func (st *MysqlSessionStore) Get(key interface{}) interface{} { } else { return nil } - return nil } // delete value in mysql session diff --git a/session/postgres/sess_postgresql.go b/session/postgres/sess_postgresql.go index 2838a80d..68030df2 100644 --- a/session/postgres/sess_postgresql.go +++ b/session/postgres/sess_postgresql.go @@ -68,7 +68,6 @@ func (st *PostgresqlSessionStore) Get(key interface{}) interface{} { } else { return nil } - return nil } // delete value in postgresql session diff --git a/session/redis/sess_redis.go b/session/redis/sess_redis.go index 00ef4a63..a1c0e94f 100644 --- a/session/redis/sess_redis.go +++ b/session/redis/sess_redis.go @@ -44,7 +44,6 @@ func (rs *RedisSessionStore) Get(key interface{}) interface{} { } else { return nil } - return nil } // delete value in redis session diff --git a/session/sess_cookie.go b/session/sess_cookie.go index 0fe7b093..67a0802d 100644 --- a/session/sess_cookie.go +++ b/session/sess_cookie.go @@ -36,7 +36,6 @@ func (st *CookieSessionStore) Get(key interface{}) interface{} { } else { return nil } - return nil } // Delete value in cookie session diff --git a/session/sess_file.go b/session/sess_file.go index 6ac22b24..618ba366 100644 --- a/session/sess_file.go +++ b/session/sess_file.go @@ -43,7 +43,6 @@ func (fs *FileSessionStore) Get(key interface{}) interface{} { } else { return nil } - return nil } // Delete value in file session by given key diff --git a/session/sess_mem.go b/session/sess_mem.go index 33c84717..7a2bd0ad 100644 --- a/session/sess_mem.go +++ b/session/sess_mem.go @@ -35,7 +35,6 @@ func (st *MemSessionStore) Get(key interface{}) interface{} { } else { return nil } - return nil } // delete in memory session by key @@ -94,7 +93,6 @@ func (pder *MemProvider) SessionRead(sid string) (SessionStore, error) { pder.lock.Unlock() return newsess, nil } - return nil, nil } // check session store exist in memory session by sid @@ -129,7 +127,6 @@ func (pder *MemProvider) SessionRegenerate(oldsid, sid string) (SessionStore, er pder.lock.Unlock() return newsess, nil } - return nil, nil } // delete session store in memory session by id diff --git a/session/sess_utils.go b/session/sess_utils.go index bea19dba..bfa17a7f 100644 --- a/session/sess_utils.go +++ b/session/sess_utils.go @@ -164,8 +164,6 @@ func decodeCookie(block cipher.Block, hashKey, name, value string, gcmaxlifetime } else { return dst, nil } - // Done. - return nil, nil } // Encoding ------------------------------------------------------------------- diff --git a/toolbox/profile.go b/toolbox/profile.go index 41721b09..ff8710b6 100644 --- a/toolbox/profile.go +++ b/toolbox/profile.go @@ -48,7 +48,7 @@ func ProcessInput(input string, w io.Writer) { // record memory profile in pprof func MemProf() { if f, err := os.Create("mem-" + strconv.Itoa(pid) + ".memprof"); err != nil { - log.Fatal("record memory profile failed: %v", err) + log.Fatal("record memory profile failed: ", err) } else { runtime.GC() pprof.WriteHeapProfile(f)