Перехват "лишнего" вывода от вызываемых подпроцессов, чтоб не засорять лог.

[weathermon.git] / weathermon.lua

diff --git a/weathermon.lua b/weathermon.lua
index 7a366b04f320e6a709b23ad2d8f7b26e1a5a1bf2..af387297ccd5274478816d74928dd5baf4ae199b 100755 (executable)
--- 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)