X-Git-Url: https://git.rvb.name/weathermon.git/blobdiff_plain/7580c60d80239c3a880e124c550c2353f8153d82..731aeb86fa110c689081532d0d6058a4581728dd:/bin/weathermon?ds=sidebyside diff --git a/bin/weathermon b/bin/weathermon index 8da4696..bd9ca80 100755 --- a/bin/weathermon +++ b/bin/weathermon @@ -157,9 +157,6 @@ function processJson(str) end if not (sensor_type==nil or sensor_id==nil or sensor_type=='' or sensor_id=='') then - if next(sensor)==nil then - sensor["command"]="alarm" - end local record = {} for k,v in pairs(sensor) do storeRecord(sensor_id,sensor_type,k,v) @@ -185,7 +182,7 @@ function processJson(str) if not mqtt_client:socket() then mqtt_client:reconnect() end - mqtt_client:publish(mqtt_path,v,0,0) + mqtt_client:publish(mqtt_path,v,0,false) mqtt_client:loop() end end @@ -248,7 +245,10 @@ function processLine(str) return '{'..name..'}' end end) - mqtt_client:publish(mqtt_path,v,0,0) + if not mqtt_client:socket() then + mqtt_client:reconnect() + end + mqtt_client:publish(mqtt_path,v,0,false) mqtt_client:loop() end end @@ -289,7 +289,10 @@ function processLine(str) return '{'..name..'}' end end) - mqtt_client:publish(mqtt_path,msg_body,0,0) + if not mqtt_client:socket() then + mqtt_client:reconnect() + end + mqtt_client:publish(mqtt_path,msg_body,0,false) mqtt_client:loop() end if alarm_exec then @@ -405,6 +408,7 @@ while 1 do io.close(f) end) end + end) end