From 9f19574ae0ae6d4881c83245d487b42251ff9528 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 29 Oct 2008 01:12:49 +0000 Subject: [PATCH] * luci/app/statistics: fix syntax of collectd Exec plugin config --- applications/luci-statistics/root/usr/bin/stat-genconfig | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/applications/luci-statistics/root/usr/bin/stat-genconfig b/applications/luci-statistics/root/usr/bin/stat-genconfig index 7f0a05f5f..b62005ce1 100755 --- a/applications/luci-statistics/root/usr/bin/stat-genconfig +++ b/applications/luci-statistics/root/usr/bin/stat-genconfig @@ -94,11 +94,17 @@ function config_exec( c ) for key, type in pairs({ Exec="collectd_exec_input", NotificationExec="collectd_exec_notify" }) do if sections[s][".type"] == type then - cmd = sections[s].cmdline - user = sections[s].cmduser or "nobody" - group = sections[s].cmdgroup or "nogroup" + cmd = sections[s].cmdline - str = str .. "\t" .. key .. " " .. user .. ":" .. group .. ' "' .. cmd .. "\"\n" + if cmd then + cmd = cmd:gsub("^%s+", ""):gsub("%s+$", "") + user = sections[s].cmduser or "nobody" + group = sections[s].cmdgroup + + str = str .. "\t" .. key .. ' "' .. + user .. ( group and ":" .. group or "" ) .. '" "' .. + cmd:gsub('%s+', '" "') .. '"\n' + end end end end -- 2.11.0