MM-13923 Fixing pulling from incorect cache. (#10216)

* Fixing pulling from incorect cache.

* Adding caching test.
This commit is contained in:
Christopher Speller
2019-02-01 08:13:51 -08:00
committed by GitHub
parent 0f35c4b24d
commit 4e0840969b
2 changed files with 6 additions and 1 deletions

View File

@@ -489,7 +489,7 @@ func getRedirectLocation(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
if location, ok := openGraphDataCache.Get(url); ok {
if location, ok := redirectLocationDataCache.Get(url); ok {
m["location"] = location.(string)
w.Write([]byte(model.MapToJson(m)))
return

View File

@@ -771,6 +771,11 @@ func TestRedirectLocation(t *testing.T) {
CheckNoError(t, resp)
assert.Equal(t, expected, actual)
// Check cached value
actual, resp = th.SystemAdminClient.GetRedirectLocation(mockBitlyLink, "")
CheckNoError(t, resp)
assert.Equal(t, expected, actual)
*th.App.Config().ServiceSettings.EnableLinkPreviews = false
actual, resp = th.SystemAdminClient.GetRedirectLocation("https://mattermost.com/", "")
CheckNoError(t, resp)