diff options
| author | Corey Hulen <corey@hulen.com> | 2017-02-09 13:39:15 -0800 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-02-09 21:39:15 +0000 |
| commit | 1359f7f3918befd2463103379d17bd2eb846654d (patch) | |
| tree | f8fe7cbfd7b8a59da7a655f7ac7bbc9233a70258 /store/sql_store.go | |
| parent | 432dc9239fdd27063adcee944675d066fb35cde6 (diff) | |
| download | chat-1359f7f3918befd2463103379d17bd2eb846654d.tar.gz chat-1359f7f3918befd2463103379d17bd2eb846654d.tar.bz2 chat-1359f7f3918befd2463103379d17bd2eb846654d.zip | |
Adding go vet from hack-a-thon (#5328)
* Adding go vet to the api package
* Adding go vet to app package
* Adding go vet to manualtesting package
* Adding go vet to the model package
* Adding go vet to the store dir
* Adding go vet to utils package
* Adding missing dirs with go files
* Fixing up makefile
* Fixing up makefile
* Removing root dir
Diffstat (limited to 'store/sql_store.go')
| -rw-r--r-- | store/sql_store.go | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/store/sql_store.go b/store/sql_store.go index 214bce720..03867cc44 100644 --- a/store/sql_store.go +++ b/store/sql_store.go @@ -220,16 +220,14 @@ func (ss *SqlStore) TotalReadDbConnections() int { if len(utils.Cfg.SqlSettings.DataSourceReplicas) == 0 { return 0 - } else { - count := 0 - for _, db := range ss.replicas { - count = count + db.Db.Stats().OpenConnections - } + } - return count + count := 0 + for _, db := range ss.replicas { + count = count + db.Db.Stats().OpenConnections } - return 0 + return count } func (ss *SqlStore) GetCurrentSchemaVersion() string { @@ -722,7 +720,7 @@ func (me mattermConverter) FromDb(target interface{}) (gorp.CustomScanner, bool) b := []byte(*s) return json.Unmarshal(b, target) } - return gorp.CustomScanner{new(string), target, binder}, true + return gorp.CustomScanner{Holder: new(string), Target: target, Binder: binder}, true case *model.StringArray: binder := func(holder, target interface{}) error { s, ok := holder.(*string) @@ -732,7 +730,7 @@ func (me mattermConverter) FromDb(target interface{}) (gorp.CustomScanner, bool) b := []byte(*s) return json.Unmarshal(b, target) } - return gorp.CustomScanner{new(string), target, binder}, true + return gorp.CustomScanner{Holder: new(string), Target: target, Binder: binder}, true case *model.EncryptStringMap: binder := func(holder, target interface{}) error { s, ok := holder.(*string) @@ -748,7 +746,7 @@ func (me mattermConverter) FromDb(target interface{}) (gorp.CustomScanner, bool) b := []byte(ue) return json.Unmarshal(b, target) } - return gorp.CustomScanner{new(string), target, binder}, true + return gorp.CustomScanner{Holder: new(string), Target: target, Binder: binder}, true case *model.StringInterface: binder := func(holder, target interface{}) error { s, ok := holder.(*string) @@ -758,7 +756,7 @@ func (me mattermConverter) FromDb(target interface{}) (gorp.CustomScanner, bool) b := []byte(*s) return json.Unmarshal(b, target) } - return gorp.CustomScanner{new(string), target, binder}, true + return gorp.CustomScanner{Holder: new(string), Target: target, Binder: binder}, true } return gorp.CustomScanner{}, false |