allow cache to be forcibly reset
Modify updateTimelineCache to allow a boolean to indicate that the cache should be forcibly reset
This commit is contained in:
parent
5ba0ea2b04
commit
3aa621ee36
28
read.go
28
read.go
|
@ -128,7 +128,7 @@ func (app *App) FetchPublicPosts() (interface{}, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func viewLocalTimelineAPI(app *App, w http.ResponseWriter, r *http.Request) error {
|
func viewLocalTimelineAPI(app *App, w http.ResponseWriter, r *http.Request) error {
|
||||||
updateTimelineCache(app.timeline)
|
updateTimelineCache(app.timeline, false)
|
||||||
|
|
||||||
skip, _ := strconv.Atoi(r.FormValue("skip"))
|
skip, _ := strconv.Atoi(r.FormValue("skip"))
|
||||||
|
|
||||||
|
@ -156,24 +156,30 @@ func viewLocalTimeline(app *App, w http.ResponseWriter, r *http.Request) error {
|
||||||
return showLocalTimeline(app, w, r, page, vars["author"], vars["tag"])
|
return showLocalTimeline(app, w, r, page, vars["author"], vars["tag"])
|
||||||
}
|
}
|
||||||
|
|
||||||
func updateTimelineCache(tl *localTimeline) {
|
// updateTimelineCache will reset and update the cache if it is stale or
|
||||||
// Fetch posts if enough time has passed since last cache
|
// the boolean passed in is true.
|
||||||
if tl.posts == nil || tl.m.Invalidate() {
|
func updateTimelineCache(tl *localTimeline, reset bool) {
|
||||||
|
if reset {
|
||||||
|
tl.Reset()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fetch posts if the cache is empty, has been reset or enough time has
|
||||||
|
// passed since last cache.
|
||||||
|
if tl.posts == nil || reset || tl.m.Invalidate() {
|
||||||
log.Info("[READ] Updating post cache")
|
log.Info("[READ] Updating post cache")
|
||||||
var err error
|
|
||||||
var postsInterfaces interface{}
|
postsInterfaces, err := tl.m.Get()
|
||||||
postsInterfaces, err = tl.m.Get()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error("[READ] Unable to cache posts: %v", err)
|
log.Error("[READ] Unable to cache posts: %v", err)
|
||||||
} else {
|
}
|
||||||
|
|
||||||
castPosts := postsInterfaces.([]PublicPost)
|
castPosts := postsInterfaces.([]PublicPost)
|
||||||
tl.posts = &castPosts
|
tl.posts = &castPosts
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
func showLocalTimeline(app *App, w http.ResponseWriter, r *http.Request, page int, author, tag string) error {
|
func showLocalTimeline(app *App, w http.ResponseWriter, r *http.Request, page int, author, tag string) error {
|
||||||
updateTimelineCache(app.timeline)
|
updateTimelineCache(app.timeline, false)
|
||||||
|
|
||||||
pl := len(*(app.timeline.posts))
|
pl := len(*(app.timeline.posts))
|
||||||
ttlPages := int(math.Ceil(float64(pl) / float64(app.timeline.postsPerPage)))
|
ttlPages := int(math.Ceil(float64(pl) / float64(app.timeline.postsPerPage)))
|
||||||
|
@ -286,7 +292,7 @@ func viewLocalTimelineFeed(app *App, w http.ResponseWriter, req *http.Request) e
|
||||||
return impart.HTTPError{http.StatusNotFound, "Page doesn't exist."}
|
return impart.HTTPError{http.StatusNotFound, "Page doesn't exist."}
|
||||||
}
|
}
|
||||||
|
|
||||||
updateTimelineCache(app.timeline)
|
updateTimelineCache(app.timeline, false)
|
||||||
|
|
||||||
feed := &Feed{
|
feed := &Feed{
|
||||||
Title: app.cfg.App.SiteName + " Reader",
|
Title: app.cfg.App.SiteName + " Reader",
|
||||||
|
|
Loading…
Reference in New Issue