mirror of
https://github.com/ntop/ntopng.git
synced 2026-04-29 23:49:33 +00:00
Reworked notifications and fixed a bug that caused them to be fetched too often putting pressure on the blog feed
This commit is contained in:
Luca
parent
014d23f5d1
commit
3449593087
8 changed files with 143 additions and 123 deletions
|
|
@ -7,171 +7,195 @@ local json = require("dkjson")
|
|||
local MAX_POSTS = 3
|
||||
local blog_utils = {}
|
||||
|
||||
local BLOG_FEED_KEY = "ntopng.cache.blog_feed"
|
||||
local BLOG_NEXT_FEED_UPDATE = "ntopng.prefs.next_feed_update"
|
||||
local JSON_FEED = "https://www.ntop.org/blog/feed/json"
|
||||
|
||||
-- Parse the date string, following this pattern: yyyy-mm-ddTH:M:S+00:00
|
||||
-- Return 0 if the date string is empty, otherwise it returns the right epoch
|
||||
function blog_utils.parseDate(date)
|
||||
|
||||
if (isEmptyString(date)) then return 0 end
|
||||
if (isEmptyString(date)) then return 0 end
|
||||
|
||||
local pattern = "(%d+)-(%d+)-(%d+)T(%d+):(%d+):(%d+)+(%d+):(%d+)"
|
||||
local year, month, day, hour, minutes = date:match(pattern)
|
||||
local pattern = "(%d+)-(%d+)-(%d+)T(%d+):(%d+):(%d+)+(%d+):(%d+)"
|
||||
local year, month, day, hour, minutes = date:match(pattern)
|
||||
|
||||
local epoch = os.time({year=year, month=month, day=day, hour=hour, min=minutes})
|
||||
return epoch
|
||||
local epoch = os.time({year=year, month=month, day=day, hour=hour, min=minutes})
|
||||
return epoch
|
||||
end
|
||||
|
||||
function blog_utils.intersectPosts(s1, s2)
|
||||
|
||||
-- if there aren't any old post then return the new ones
|
||||
if (s1[1] == nil) then return s2 end
|
||||
-- do integrity check on old set
|
||||
if (s1[1].epoch == nil) then return s2 end
|
||||
-- if there aren't any new post then return the old ones
|
||||
if (s2[1] == nil) then return s1 end
|
||||
-- if there aren't any old post then return the new ones
|
||||
if (s1[1] == nil) then return s2 end
|
||||
-- do integrity check on old set
|
||||
if (s1[1].epoch == nil) then return s2 end
|
||||
-- if there aren't any new post then return the old ones
|
||||
if (s2[1] == nil) then return s1 end
|
||||
|
||||
local intersected = {}
|
||||
local j = 1
|
||||
local intersected = {}
|
||||
local j = 1
|
||||
|
||||
-- insert the new posts
|
||||
for i = 1, MAX_POSTS do
|
||||
if (s2[i].epoch > s1[1].epoch) then
|
||||
intersected[i] = s2[i]
|
||||
j = j + 1
|
||||
end
|
||||
end
|
||||
-- insert the new posts
|
||||
for i = 1, MAX_POSTS do
|
||||
if (s2[i].epoch > s1[1].epoch) then
|
||||
intersected[i] = s2[i]
|
||||
j = j + 1
|
||||
end
|
||||
end
|
||||
|
||||
-- insert the olds posts if the array is not full
|
||||
local k = 1
|
||||
for i = j, MAX_POSTS do
|
||||
intersected[i] = s1[k]
|
||||
k = k + 1
|
||||
end
|
||||
-- insert the olds posts if the array is not full
|
||||
local k = 1
|
||||
for i = j, MAX_POSTS do
|
||||
intersected[i] = s1[k]
|
||||
k = k + 1
|
||||
end
|
||||
|
||||
return (intersected)
|
||||
return (intersected)
|
||||
|
||||
end
|
||||
|
||||
function blog_utils.updatePostState(blogNotificationId, username)
|
||||
|
||||
if (blogNotificationId == nil) then return false end
|
||||
if (isEmptyString(username)) then return false end
|
||||
if (blogNotificationId == nil) then return false end
|
||||
if (isEmptyString(username)) then return false end
|
||||
|
||||
local postsJSON = ntop.getPref("ntopng.prefs.blog_feed")
|
||||
local posts = {}
|
||||
local postsJSON = ntop.getPref(BLOG_FEED_KEY)
|
||||
local posts = {}
|
||||
|
||||
if (not isEmptyString(postsJSON)) then
|
||||
posts = json.decode(postsJSON)
|
||||
end
|
||||
if (not isEmptyString(postsJSON)) then
|
||||
posts = json.decode(postsJSON)
|
||||
end
|
||||
|
||||
local success = false
|
||||
local success = false
|
||||
|
||||
for _, p in pairs(posts) do
|
||||
if (p.id == blogNotificationId) then
|
||||
if (p.users_read == nil) then p.users_read = {} end
|
||||
p.users_read[username] = true
|
||||
success = true
|
||||
end
|
||||
end
|
||||
for _, p in pairs(posts) do
|
||||
if (p.id == blogNotificationId) then
|
||||
if (p.users_read == nil) then p.users_read = {} end
|
||||
p.users_read[username] = true
|
||||
success = true
|
||||
end
|
||||
end
|
||||
|
||||
ntop.setPref("ntopng.prefs.blog_feed", json.encode(posts))
|
||||
ntop.setPref(BLOG_FEED_KEY, json.encode(posts))
|
||||
|
||||
return (success)
|
||||
return (success)
|
||||
end
|
||||
|
||||
function blog_utils.updateRedis(newPosts)
|
||||
|
||||
-- decode older posts from updateRedis
|
||||
local oldPostsJSON = ntop.getPref("ntopng.prefs.blog_feed")
|
||||
local oldPosts = {}
|
||||
if (not isEmptyString(oldPostsJSON)) then
|
||||
oldPosts = json.decode(oldPostsJSON)
|
||||
end
|
||||
-- decode older posts from updateRedis
|
||||
local oldPostsJSON = ntop.getPref(BLOG_FEED_KEY)
|
||||
local oldPosts = {}
|
||||
if (not isEmptyString(oldPostsJSON)) then
|
||||
oldPosts = json.decode(oldPostsJSON)
|
||||
end
|
||||
|
||||
-- intersect two notifications sets and marks the new
|
||||
local intersected = blog_utils.intersectPosts(oldPosts, newPosts)
|
||||
|
||||
-- save the posts inside redis
|
||||
ntop.setPref("ntopng.prefs.blog_feed", json.encode(intersected))
|
||||
-- intersect two notifications sets and marks the new
|
||||
local intersected = blog_utils.intersectPosts(oldPosts, newPosts)
|
||||
|
||||
-- save the posts inside redis
|
||||
ntop.setPref(BLOG_FEED_KEY, json.encode(intersected))
|
||||
|
||||
end
|
||||
|
||||
function blog_utils.fetchLatestPosts()
|
||||
function blog_utils.fetchLatestPosts()
|
||||
local response
|
||||
local now = os.time()
|
||||
local next_fetch = ntop.getPref(BLOG_NEXT_FEED_UPDATE)
|
||||
local debug = false
|
||||
|
||||
if(debug) then traceError(TRACE_NORMAL, TRACE_CONSOLE, "blog_utils.fetchLatestPosts()") end
|
||||
|
||||
if((next_fetch ~= nil) and (next_fetch ~= "")) then
|
||||
next_fetch = tonumber(next_fetch)
|
||||
|
||||
local JSON_FEED = "https://www.ntop.org/blog/feed/json"
|
||||
local response = ntop.httpGet(JSON_FEED)
|
||||
if(next_fetch > now) then
|
||||
if(debug) then tprint("Not yet time to refresh blog [".. (now-next_fetch) .." src]") end
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
if ((response == nil) or (response["CONTENT"] == nil)) then
|
||||
return (false)
|
||||
end
|
||||
if(debug) then traceError(TRACE_NORMAL, TRACE_CONSOLE, "Refreshing ntop blog feed...") end
|
||||
response = ntop.httpGet(JSON_FEED)
|
||||
|
||||
local jsonFeed = json.decode(response["CONTENT"])
|
||||
if(debug) then tprint(response["CONTENT"]) end
|
||||
|
||||
if ((response == nil) or (response["CONTENT"] == nil)) then
|
||||
ntop.setPref(BLOG_NEXT_FEED_UPDATE, now+300) -- Try again not less than 5 mins
|
||||
return (false)
|
||||
end
|
||||
|
||||
local jsonFeed = json.decode(response["CONTENT"])
|
||||
|
||||
if ((jsonFeed == nil) or table.empty(jsonFeed["items"])) then
|
||||
return (false)
|
||||
end
|
||||
if ((jsonFeed == nil) or table.empty(jsonFeed["items"])) then
|
||||
ntop.setPref(BLOG_NEXT_FEED_UPDATE, now+300) -- Try again not less than 5 mins
|
||||
return (false)
|
||||
end
|
||||
|
||||
local posts = jsonFeed["items"]
|
||||
if(debug) then tprint("Update next feed time (in 12 hours)") end
|
||||
ntop.setPref(BLOG_NEXT_FEED_UPDATE, now+43200) -- Try again not less than 12 hours
|
||||
|
||||
local posts = jsonFeed["items"]
|
||||
|
||||
local latest3Posts = {posts[1], posts[2], posts[3]}
|
||||
local formattedPosts = {}
|
||||
local latest3Posts = {posts[1], posts[2], posts[3]}
|
||||
local formattedPosts = {}
|
||||
|
||||
for i, post in ipairs(latest3Posts) do
|
||||
for i, post in ipairs(latest3Posts) do
|
||||
if (post ~= nil) then
|
||||
|
||||
if (post ~= nil) then
|
||||
local splittedLink = split(post.id, "?p=")
|
||||
local postId = tonumber(splittedLink[2])
|
||||
local postTitle = post.title
|
||||
local postURL = post.url
|
||||
local postShortDesc = string.sub(post.content_text, 1, 48) .. '...'
|
||||
local postEpoch = blog_utils.parseDate(post.date_published)
|
||||
|
||||
local splittedLink = split(post.id, "?p=")
|
||||
local postId = tonumber(splittedLink[2])
|
||||
local postTitle = post.title
|
||||
local postURL = post.url
|
||||
local postShortDesc = string.sub(post.content_text, 1, 48) .. '...'
|
||||
local postEpoch = blog_utils.parseDate(post.date_published)
|
||||
local post = {
|
||||
id = postId,
|
||||
title = postTitle,
|
||||
link = postURL,
|
||||
shortDesc = postShortDesc,
|
||||
epoch = postEpoch
|
||||
}
|
||||
|
||||
local post = {
|
||||
id = postId,
|
||||
title = postTitle,
|
||||
link = postURL,
|
||||
shortDesc = postShortDesc,
|
||||
epoch = postEpoch
|
||||
}
|
||||
formattedPosts[#formattedPosts + 1] = post
|
||||
end
|
||||
end
|
||||
|
||||
formattedPosts[#formattedPosts + 1] = post
|
||||
end
|
||||
end
|
||||
-- updates redis
|
||||
blog_utils.updateRedis(formattedPosts)
|
||||
|
||||
-- updates redis
|
||||
blog_utils.updateRedis(formattedPosts)
|
||||
|
||||
return (true)
|
||||
return (true)
|
||||
end
|
||||
|
||||
function blog_utils.readPostsFromRedis(username)
|
||||
if (username == nil) then return {} end
|
||||
if (isEmptyString(username)) then return {} end
|
||||
|
||||
if (username == nil) then return {} end
|
||||
if (isEmptyString(username)) then return {} end
|
||||
local postsJSON = ntop.getPref(BLOG_FEED_KEY)
|
||||
local posts = {}
|
||||
|
||||
local postsJSON = ntop.getPref("ntopng.prefs.blog_feed")
|
||||
local posts = {}
|
||||
if (not isEmptyString(postsJSON)) then
|
||||
posts = json.decode(postsJSON)
|
||||
end
|
||||
|
||||
if (not isEmptyString(postsJSON)) then
|
||||
posts = json.decode(postsJSON)
|
||||
end
|
||||
local newPostCounter = 0
|
||||
|
||||
local newPostCounter = 0
|
||||
-- post.users_read is an array which contains
|
||||
-- the users who read the notification
|
||||
for _, post in pairs(posts) do
|
||||
if (post.users_read == nil) then
|
||||
post.users_read = {}
|
||||
newPostCounter = newPostCounter + 1
|
||||
else
|
||||
if (not post.users_read[username]) then
|
||||
newPostCounter = newPostCounter + 1
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- post.users_read is an array which contains
|
||||
-- the users who read the notification
|
||||
for _, post in pairs(posts) do
|
||||
if (post.users_read == nil) then
|
||||
post.users_read = {}
|
||||
newPostCounter = newPostCounter + 1
|
||||
else
|
||||
if (not post.users_read[username]) then
|
||||
newPostCounter = newPostCounter + 1
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return posts, newPostCounter
|
||||
return posts, newPostCounter
|
||||
end
|
||||
|
||||
return blog_utils
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue