From 097289f8e473c799ee752aa56e08f605110f5217 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 27 Jan 2017 14:07:34 -0500 Subject: Merge 3.6.2 into master (#5211) * Add webhook cache * Add channel by name cache * Fxing profiles in channels cache * Fix merge --- api/webhook.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'api/webhook.go') diff --git a/api/webhook.go b/api/webhook.go index 5d36409eb..248df6726 100644 --- a/api/webhook.go +++ b/api/webhook.go @@ -109,7 +109,7 @@ func deleteIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) { return } - if result := <-app.Srv.Store.Webhook().GetIncoming(id); result.Err != nil { + if result := <-app.Srv.Store.Webhook().GetIncoming(id, true); result.Err != nil { c.Err = result.Err return } else { @@ -125,6 +125,8 @@ func deleteIncomingHook(c *Context, w http.ResponseWriter, r *http.Request) { return } + app.InvalidateCacheForWebhook(id) + c.LogAudit("success") w.Write([]byte(model.MapToJson(props))) } @@ -352,7 +354,7 @@ func incomingWebhook(c *Context, w http.ResponseWriter, r *http.Request) { params := mux.Vars(r) id := params["id"] - hchan := app.Srv.Store.Webhook().GetIncoming(id) + hchan := app.Srv.Store.Webhook().GetIncoming(id, true) r.ParseForm() @@ -448,7 +450,7 @@ func incomingWebhook(c *Context, w http.ResponseWriter, r *http.Request) { channelName = channelName[1:] } - cchan = app.Srv.Store.Channel().GetByName(hook.TeamId, channelName) + cchan = app.Srv.Store.Channel().GetByName(hook.TeamId, channelName, true) } else { cchan = app.Srv.Store.Channel().Get(hook.ChannelId, true) } -- cgit v1.2.3-1-g7c22