vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-01 00:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixes deadlocks upon failing flows table walks

Browse source
This commit is contained in:
Simone Mainardi 2018-10-25 17:21:12 +02:00
parent e0d3401ab2
commit 4520c3e00e
3 changed files with 51 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

32
scripts/lua/get_user_info.lua
View file

@ -2,7 +2,7 @@
-- (C) 2014-15-15 - ntop.org
--
dirs = ntop.getDirs()
local dirs = ntop.getDirs()
package.path = dirs.installdir .. "/scripts/lua/modules/?.lua;" .. package.path
require "lua_utils"
@ -12,29 +12,36 @@ sendHTTPContentTypeHeader('text/html')
ntop.dumpFile(dirs.installdir .. "/httpdocs/inc/header.inc")
page = _GET["page"]
local page = _GET["page"]
if(page == nil) then page = "UserApps" end
dofile(dirs.installdir .. "/scripts/lua/inc/menu.lua")
user_key = _GET["username"]
host_key = _GET["host"]
application = _GET["application"]
local user_key = _GET["username"]
local host_key = _GET["host"]
local application = _GET["application"]
local name
if(user_key == nil) then
print("<div class=\"alert alert-danger\"><img src=".. ntop.getHttpPrefix() .. "/img/warning.png> "..i18n("user_info.missing_user_name_message").."</div>")
else
if(host_key ~= nil) then
name = getResolvedAddress(hostkey2hostinfo(host_key))
if (name == nil) then
name = host_key
end
if host_key then
name = getResolvedAddress(hostkey2hostinfo(host_key))
if (name == nil) then
name = host_key
end
end
print [[
<nav class="navbar navbar-default" role="navigation">
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a href="#"><i class="fa fa-user fa-lg"></i> ]] print(user_key) if(host_key ~= nil) then print(' - <i class="fa fa-building fa-lg"></i> '..name) end print [[ </a></li>
]]
<li><a href="#"><i class="fa fa-linux fa-lg"></i> ]] print(user_key)
if host_key then
print(string.format(" [%s: %s]", i18n("host_details.host"), name))
end
print [[ </a></li>]]
if(page == "UserApps") then active=' class="active"' else active = "" end
@ -50,6 +57,7 @@ print('<li'..active..'><a href="?username='.. user_key) if(host_key ~= nil) then
print('</ul>\n\t</div>\n\t\t</nav>\n')
if(page == "UserApps") then
print [[
<table class="table table-bordered table-striped">