diff options
author | Corey Hulen <corey@hulen.com> | 2016-01-20 13:36:16 -0600 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-01-20 13:36:16 -0600 |
commit | aefbb541d0d5bdd9919fef44fbf1a1fbfeaeb58b (patch) | |
tree | d87809ff2a306e5428b0ab6973d05509baa21abd /store/sql_store.go | |
parent | 0b1aff3b24b4ac2df8e963c83d6e52b127c603f9 (diff) | |
download | chat-aefbb541d0d5bdd9919fef44fbf1a1fbfeaeb58b.tar.gz chat-aefbb541d0d5bdd9919fef44fbf1a1fbfeaeb58b.tar.bz2 chat-aefbb541d0d5bdd9919fef44fbf1a1fbfeaeb58b.zip |
Revert " PLT-7 adding loc for db calls"
Diffstat (limited to 'store/sql_store.go')
-rw-r--r-- | store/sql_store.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/store/sql_store.go b/store/sql_store.go index 40d9c7f5a..d0471fa1e 100644 --- a/store/sql_store.go +++ b/store/sql_store.go @@ -15,6 +15,7 @@ import ( "encoding/json" "errors" "fmt" + l4g "github.com/alecthomas/log4go" "io" sqltrace "log" "math/rand" @@ -22,7 +23,6 @@ import ( "strings" "time" - l4g "github.com/alecthomas/log4go" "github.com/go-gorp/gorp" _ "github.com/go-sql-driver/mysql" _ "github.com/lib/pq" @@ -148,15 +148,15 @@ func NewSqlStore() Store { sqlStore.webhook.(*SqlWebhookStore).CreateIndexesIfNotExists() sqlStore.preference.(*SqlPreferenceStore).CreateIndexesIfNotExists() - sqlStore.preference.(*SqlPreferenceStore).DeleteUnusedFeatures(utils.T) + sqlStore.preference.(*SqlPreferenceStore).DeleteUnusedFeatures() if model.IsPreviousVersion(schemaVersion) || isSchemaVersion07 || isSchemaVersion10 { - sqlStore.system.Update(utils.T, &model.System{Name: "Version", Value: model.CurrentVersion}) + sqlStore.system.Update(&model.System{Name: "Version", Value: model.CurrentVersion}) l4g.Warn("The database schema has been upgraded to version " + model.CurrentVersion) } if schemaVersion == "" { - sqlStore.system.Save(utils.T, &model.System{Name: "Version", Value: model.CurrentVersion}) + sqlStore.system.Save(&model.System{Name: "Version", Value: model.CurrentVersion}) l4g.Info("The database schema has been set to version " + model.CurrentVersion) } @@ -210,12 +210,12 @@ func (ss SqlStore) GetCurrentSchemaVersion() string { } func (ss SqlStore) MarkSystemRanUnitTests() { - if result := <-ss.System().Get(utils.T); result.Err == nil { + if result := <-ss.System().Get(); result.Err == nil { props := result.Data.(model.StringMap) unitTests := props[model.SYSTEM_RAN_UNIT_TESTS] if len(unitTests) == 0 { systemTests := &model.System{Name: model.SYSTEM_RAN_UNIT_TESTS, Value: "1"} - <-ss.System().Save(utils.T, systemTests) + <-ss.System().Save(systemTests) } } } |