From: Roman Bazalevsky Date: Fri, 21 Oct 2016 14:56:32 +0000 (+0300) Subject: Перехват "лишнего" вывода от вызываемых подпроцессов, чтоб не засорять лог. X-Git-Url: https://git.rvb.name/weathermon.git/commitdiff_plain/817101e336c2e0812345e8583aed2dae3007c5be?ds=sidebyside Перехват "лишнего" вывода от вызываемых подпроцессов, чтоб не засорять лог. --- diff --git a/weathermon.lua b/weathermon.lua index 7a366b0..af38729 100755 --- a/weathermon.lua +++ b/weathermon.lua @@ -21,6 +21,17 @@ function url_encode(str) return str end +function capture(cmd, raw) + local f = assert(io.popen(cmd, 'r')) + local s = assert(f:read('*a')) + f:close() + if raw then return s end + s = string.gsub(s, '^%s+', '') + s = string.gsub(s, '%s+$', '') + s = string.gsub(s, '[\n\r]+', ' ') + return s +end + function mqtt_encode(str) if (str) then str = string.gsub (str, "\n", "") @@ -83,7 +94,7 @@ function getConfig(configname) if serial_port then command = "stty -F "..serial_port.." "..serial_baud - os.capture(command) + capture(command) end @@ -141,7 +152,7 @@ end function printLog(str) if logging=="on" then - os.execute("logger -t weathermon "..str) + capture("logger -t weathermon "..str) else print(str) end @@ -163,7 +174,7 @@ function submitValue(type,id,param,val) command = command.." \""..url.."\"" - os.execute(command) + result = capture(command) end @@ -311,7 +322,7 @@ function processLine(str) " \""..string.gsub(alarm_type,"\"","\\\"").. "\" \""..string.gsub(alarm_id,"\"","\\\"").. "\" \""..string.gsub(msg_body,"\"","\\\"").."\"" - os.execute(command) + capture(command) end else printLog("Cannot parse alarm input: "..msg_body)