vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-30 07:59:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

recording utils improvements and init.d fixes

Browse source
This commit is contained in:
Alfredo Cardigliano 2018-10-13 20:51:15 +02:00
parent 0dfab5aeeb
commit d0134c731e
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/lua/modules/recording_utils.lua
View file

@ -9,6 +9,7 @@ require "prefs_utils"
prefs = ntop.getPrefs()
local n2disk_ctl = "/usr/local/bin/n2diskctl"
local ntopng_config_tool = "/usr/bin/ntopng-utils-manage-config"
local n2disk_ctl_cmd = "sudo "..n2disk_ctl
local recording_utils = {}
@ -27,7 +28,8 @@ end
function recording_utils.isAvailable()
if isAdministrator() and
isLocalPacketdumpEnabled() and
not ntop.isWindows() and
not ntop.isWindows() and
ntop.exists(ntopng_config_tool) and
ntop.exists(n2disk_ctl) then
return true
end
@ -153,6 +155,7 @@ function recording_utils.createConfig(ifname, params)
local min_n2disk_mem = 128
if defaults.buffer_size + min_sys_mem > mem_total_mb then
if mem_total_mb < min_sys_mem then
traceError(TRACE_ERROR, TRACE_CONSOLE, "Not enough memory available for n2disk ("..mem_total_mb.."MB, required "..min_sys_mem.."MB)")
return false
end
defaults.buffer_size = mem_total_mb - min_sys_mem
@ -235,6 +238,9 @@ function recording_utils.createConfig(ifname, params)
f:write("--zmq="..config.zmq_endpoint.."\n")
f:write("--zmq-export-flows\n")
end
-- Ignored by systemd, required by init.d
f:write("--daemon\n")
f:write("-P=/var/run/n2disk-"..ifname..".pid\n")
f:close()