diff options
| author | Debanshu Kundu <debanshu.kundu@joshtechnologygroup.com> | 2017-02-12 22:01:49 +0530 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-02-12 11:31:49 -0500 |
| commit | eab15da32122ec421d22dbfb3ee2cd1844d07b5c (patch) | |
| tree | 8d0f26e8c48db93ce0c9407c22c554a6fb4784dd /api | |
| parent | 37222ec1b3364e1bd57ce268416edd1832be368c (diff) | |
| download | chat-eab15da32122ec421d22dbfb3ee2cd1844d07b5c.tar.gz chat-eab15da32122ec421d22dbfb3ee2cd1844d07b5c.tar.bz2 chat-eab15da32122ec421d22dbfb3ee2cd1844d07b5c.zip | |
PLT-5455 Added caching for OG metadata of link preview. (#5361)
Diffstat (limited to 'api')
| -rw-r--r-- | api/post.go | 18 | ||||
| -rw-r--r-- | api/post_test.go | 32 |
2 files changed, 43 insertions, 7 deletions
diff --git a/api/post.go b/api/post.go index d9531b09a..76d813940 100644 --- a/api/post.go +++ b/api/post.go @@ -14,6 +14,10 @@ import ( "github.com/mattermost/platform/utils" ) +const OPEN_GRAPH_METADATA_CACHE_SIZE = 10000 + +var openGraphDataCache = utils.NewLru(OPEN_GRAPH_METADATA_CACHE_SIZE) + func InitPost() { l4g.Debug(utils.T("api.post.init.debug")) @@ -432,8 +436,14 @@ func getFileInfosForPost(c *Context, w http.ResponseWriter, r *http.Request) { func getOpenGraphMetadata(c *Context, w http.ResponseWriter, r *http.Request) { props := model.StringInterfaceFromJson(r.Body) + ogJSONGeneric, ok := openGraphDataCache.Get(props["url"]) + if ok { + w.Write(ogJSONGeneric.([]byte)) + return + } + url := "" - ok := false + ok = false if url, ok = props["url"].(string); len(url) == 0 || !ok { c.SetInvalidParam("getOpenGraphMetadata", "url") return @@ -441,10 +451,12 @@ func getOpenGraphMetadata(c *Context, w http.ResponseWriter, r *http.Request) { og := app.GetOpenGraphMetadata(url) - ogJson, err := og.ToJSON() + ogJSON, err := og.ToJSON() if err != nil { w.Write([]byte(`{"url": ""}`)) return } - w.Write(ogJson) + + openGraphDataCache.AddWithExpiresInSecs(props["url"], ogJSON, 3600) // Cache would expire after 1 houre + w.Write(ogJSON) } diff --git a/api/post_test.go b/api/post_test.go index c97da6f68..6556bb3b9 100644 --- a/api/post_test.go +++ b/api/post_test.go @@ -1306,7 +1306,11 @@ func TestGetOpenGraphMetadata(t *testing.T) { th := Setup().InitBasic() Client := th.BasicClient + ogDataCacheMissCount := 0 + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + ogDataCacheMissCount++ + if r.URL.Path == "/og-data/" { fmt.Fprintln(w, ` <html><head><meta property="og:type" content="article" /> @@ -1319,15 +1323,35 @@ func TestGetOpenGraphMetadata(t *testing.T) { } })) - for _, data := range [](map[string]string){{"path": "/og-data/", "title": "Test Title"}, {"path": "/no-og-data/", "title": ""}} { - res, err := Client.DoApiPost("/get_opengraph_metadata", fmt.Sprintf("{\"url\":\"%s\"}", ts.URL+data["path"])) + for _, data := range [](map[string]interface{}){ + {"path": "/og-data/", "title": "Test Title", "cacheMissCount": 1}, + {"path": "/no-og-data/", "title": "", "cacheMissCount": 2}, + + // Data should be cached for following + {"path": "/og-data/", "title": "Test Title", "cacheMissCount": 2}, + {"path": "/no-og-data/", "title": "", "cacheMissCount": 2}, + } { + res, err := Client.DoApiPost( + "/get_opengraph_metadata", + fmt.Sprintf("{\"url\":\"%s\"}", ts.URL+data["path"].(string)), + ) if err != nil { t.Fatal(err) } ogData := model.StringInterfaceFromJson(res.Body) - if strings.Compare(ogData["title"].(string), data["title"]) != 0 { - t.Fatal(fmt.Sprintf("OG data title mismatch for path \"%s\". Expected title: \"%s\". Actual title: \"%s\"", data["path"], data["title"], ogData["title"])) + if strings.Compare(ogData["title"].(string), data["title"].(string)) != 0 { + t.Fatal(fmt.Sprintf( + "OG data title mismatch for path \"%s\". Expected title: \"%s\". Actual title: \"%s\"", + data["path"].(string), data["title"].(string), ogData["title"].(string), + )) + } + + if ogDataCacheMissCount != data["cacheMissCount"].(int) { + t.Fatal(fmt.Sprintf( + "Cache miss count didn't match. Expected value %d. Actual value %d.", + data["cacheMissCount"].(int), ogDataCacheMissCount, + )) } } } |