IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Migrate Plugin.DeleteAllExpired to Sync by default (#11583)

Browse Source
This commit is contained in:
Phillip Ahereza
2019-07-09 18:15:35 +03:00
committed by Jesús Espino
parent 25a2e7e981
commit eb0268f108
5 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
store/sqlstore/plugin_store.go
View File

@@ -144,15 +144,12 @@ func (ps SqlPluginStore) DeleteAllForPlugin(pluginId string) store.StoreChannel
})
}
func (ps SqlPluginStore) DeleteAllExpired() store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
currentTime := model.GetMillis()
if _, err := ps.GetMaster().Exec("DELETE FROM PluginKeyValueStore WHERE ExpireAt != 0 AND ExpireAt < :CurrentTime", map[string]interface{}{"CurrentTime": currentTime}); err != nil {
result.Err = model.NewAppError("SqlPluginStore.Delete", "store.sql_plugin_store.delete.app_error", nil, fmt.Sprintf("current_time=%v, err=%v", currentTime, err.Error()), http.StatusInternalServerError)
} else {
result.Data = true
}
})
func (ps SqlPluginStore) DeleteAllExpired() *model.AppError {
currentTime := model.GetMillis()
if _, err := ps.GetMaster().Exec("DELETE FROM PluginKeyValueStore WHERE ExpireAt != 0 AND ExpireAt < :CurrentTime", map[string]interface{}{"CurrentTime": currentTime}); err != nil {
return model.NewAppError("SqlPluginStore.Delete", "store.sql_plugin_store.delete.app_error", nil, fmt.Sprintf("current_time=%v, err=%v", currentTime, err.Error()), http.StatusInternalServerError)
}
return nil
}
func (ps SqlPluginStore) List(pluginId string, offset int, limit int) ([]string, *model.AppError) {

2
store/store.go
View File

@@ -540,7 +540,7 @@ type PluginStore interface {
Get(pluginId, key string) (*model.PluginKeyValue, *model.AppError)
Delete(pluginId, key string) StoreChannel
DeleteAllForPlugin(PluginId string) StoreChannel
DeleteAllExpired() StoreChannel
DeleteAllExpired() *model.AppError
List(pluginId string, page, perPage int) ([]string, *model.AppError)
}

8
store/storetest/mocks/PluginStore.go
View File

@@ -53,15 +53,15 @@ func (_m *PluginStore) Delete(pluginId string, key string) store.StoreChannel {
}
// DeleteAllExpired provides a mock function with given fields:
func (_m *PluginStore) DeleteAllExpired() store.StoreChannel {
func (_m *PluginStore) DeleteAllExpired() *model.AppError {
ret := _m.Called()
var r0 store.StoreChannel
if rf, ok := ret.Get(0).(func() store.StoreChannel); ok {
var r0 *model.AppError
if rf, ok := ret.Get(0).(func() *model.AppError); ok {
r0 = rf()
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(store.StoreChannel)
r0 = ret.Get(0).(*model.AppError)
}
}

4
store/storetest/plugin_store.go
View File

@@ -168,8 +168,8 @@ func testPluginDeleteExpired(t *testing.T, ss store.Store) {
})
require.Nil(t, err)
if result := <-ss.Plugin().DeleteAllExpired(); result.Err != nil {
t.Fatal(result.Err)
if err := ss.Plugin().DeleteAllExpired(); err != nil {
t.Fatal(err)
}
if _, err := ss.Plugin().Get(pluginId, kv.Key); err == nil {