Основной цикл отображения - в защищенный вызов на случай неурядиц.

[weathermon.git] / bin / weathermon

diff --git a/bin/weathermon b/bin/weathermon
index 8da469650890303c2483c028df13c797f1104b7c..bd9ca80200d5e226cddfce4c1c212d98463f8aa8 100755 (executable)
--- 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