From 8535e6a1afa35ae008854c6f494470126da9cd7e Mon Sep 17 00:00:00 2001 From: Roman Bazalevsky Date: Sat, 17 Sep 2016 10:15:11 +0300 Subject: [PATCH 1/1] =?utf8?q?=D0=94=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD?= =?utf8?q?=D0=B0=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D0=B0?= =?utf8?q?=20=D1=81=D0=B1=D0=BE=D0=B9=D0=BD=D1=8B=D1=85=20=D0=B4=D0=B0?= =?utf8?q?=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BD=D0=B0=20=D0=B2=D1=85=D0=BE?= =?utf8?q?=D0=B4=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC?= =?utf8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- weathermon.lua | 91 +++++++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 41 deletions(-) diff --git a/weathermon.lua b/weathermon.lua index d1917c1..f2b584b 100755 --- a/weathermon.lua +++ b/weathermon.lua @@ -166,26 +166,30 @@ function processLine(str) end end end - for k,v in pairs(sensor) do - printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..k..", Value = "..v) - submitValue(sensor_type,sensor_id,k,v) - if mqtt_client then - mqtt_path=string.gsub(mqtt_topic,"{(.-)}", - function (name) - if name=="dev" then - return web_devid - elseif name=="type" then - return sensor_type - elseif name=="id" then - return sensor_id - elseif name=="param" then - return k - else - return '{'..name..'}' - end - end) - mqtt_client:publish(mqtt_path,v) - end + if not (sensor_type==nil or sensor_id==nil or sensor_type=='' or sensor_id=='') then + for k,v in pairs(sensor) do + printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..k..", Value = "..v) + submitValue(sensor_type,sensor_id,k,v) + if mqtt_client then + mqtt_path=string.gsub(mqtt_topic,"{(.-)}", + function (name) + if name=="dev" then + return web_devid + elseif name=="type" then + return sensor_type + elseif name=="id" then + return sensor_id + elseif name=="param" then + return k + else + return '{'..name..'}' + end + end) + mqtt_client:publish(mqtt_path,v) + end + end + else + printLog("Cannot parse sensor input: "..msg_body) end elseif msg_type=="ALARM" then printLog("ALARM: "..msg_body) @@ -207,27 +211,31 @@ function processLine(str) end end end - if mqtt_client then - mqtt_path=string.gsub(mqtt_alarm_topic,"{(.-)}", - function (name) - if name=="dev" then - return web_devid - elseif name=="type" then - return sensor_type - elseif name=="id" then - return sensor_id - else - return '{'..name..'}' - end - end) - mqtt_client:publish(mqtt_path,msg_body) - end - if alarm_exec then - command=alarm_exec.. - " \""..string.gsub(alarm_type,"\"","\\\"").. - "\" \""..string.gsub(alarm_id,"\"","\\\"").. - "\" \""..string.gsub(msg_body,"\"","\\\"").."\"" - os.execute(command) + if not (alarm_type==nil or alarm_id==nil or alarm_type=='' or alarm_id=='') then + if mqtt_client then + mqtt_path=string.gsub(mqtt_alarm_topic,"{(.-)}", + function (name) + if name=="dev" then + return web_devid + elseif name=="type" then + return sensor_type + elseif name=="id" then + return sensor_id + else + return '{'..name..'}' + end + end) + mqtt_client:publish(mqtt_path,msg_body) + end + if alarm_exec then + command=alarm_exec.. + " \""..string.gsub(alarm_type,"\"","\\\"").. + "\" \""..string.gsub(alarm_id,"\"","\\\"").. + "\" \""..string.gsub(msg_body,"\"","\\\"").."\"" + os.execute(command) + end + else + printLog("Cannot parse alarm input: "..msg_body) end end @@ -262,3 +270,4 @@ while 1 do print(line) processLine(line) end + -- 2.34.1