Migrate CommandWebhook.Get to sync by default (#11594)
Этот коммит содержится в:
коммит произвёл
Harrison Healey
родитель
0d5ef4a1ff
Коммит
0ec609d159
@@ -53,20 +53,20 @@ func (s SqlCommandWebhookStore) Save(webhook *model.CommandWebhook) (*model.Comm
|
||||
return webhook, nil
|
||||
}
|
||||
|
||||
func (s SqlCommandWebhookStore) Get(id string) store.StoreChannel {
|
||||
return store.Do(func(result *store.StoreResult) {
|
||||
var webhook model.CommandWebhook
|
||||
func (s SqlCommandWebhookStore) Get(id string) (*model.CommandWebhook, *model.AppError) {
|
||||
var webhook model.CommandWebhook
|
||||
|
||||
exptime := model.GetMillis() - model.COMMAND_WEBHOOK_LIFETIME
|
||||
if err := s.GetReplica().SelectOne(&webhook, "SELECT * FROM CommandWebhooks WHERE Id = :Id AND CreateAt > :ExpTime", map[string]interface{}{"Id": id, "ExpTime": exptime}); err != nil {
|
||||
result.Err = model.NewAppError("SqlCommandWebhookStore.Get", "store.sql_command_webhooks.get.app_error", nil, "id="+id+", err="+err.Error(), http.StatusInternalServerError)
|
||||
if err == sql.ErrNoRows {
|
||||
result.Err.StatusCode = http.StatusNotFound
|
||||
}
|
||||
exptime := model.GetMillis() - model.COMMAND_WEBHOOK_LIFETIME
|
||||
var appErr *model.AppError
|
||||
if err := s.GetReplica().SelectOne(&webhook, "SELECT * FROM CommandWebhooks WHERE Id = :Id AND CreateAt > :ExpTime", map[string]interface{}{"Id": id, "ExpTime": exptime}); err != nil {
|
||||
appErr = model.NewAppError("SqlCommandWebhookStore.Get", "store.sql_command_webhooks.get.app_error", nil, "id="+id+", err="+err.Error(), http.StatusInternalServerError)
|
||||
if err == sql.ErrNoRows {
|
||||
appErr.StatusCode = http.StatusNotFound
|
||||
}
|
||||
return nil, appErr
|
||||
}
|
||||
|
||||
result.Data = &webhook
|
||||
})
|
||||
return &webhook, nil
|
||||
}
|
||||
|
||||
func (s SqlCommandWebhookStore) TryUse(id string, limit int) store.StoreChannel {
|
||||
|
||||
Ссылка в новой задаче
Block a user