Не создаем лишние столбцы диаграммы, чтоб не портить картинку.

[weathermon.git] / bin / weathermon

diff --git a/bin/weathermon b/bin/weathermon
index ade5bfaa3f4cd80a468daaea58cecd6b3e75558a..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
   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)
     local record = {}
     for k,v in pairs(sensor) do
       storeRecord(sensor_id,sensor_type,k,v)


@@ -248,6 +245,9 @@ function processLine(str)
                 return '{'..name..'}'
               end      
             end)
                 return '{'..name..'}'
               end      
             end)

+          if not mqtt_client:socket() then
+            mqtt_client:reconnect()
+          end  

           mqtt_client:publish(mqtt_path,v,0,false)
           mqtt_client:loop()
         end  
           mqtt_client:publish(mqtt_path,v,0,false)
           mqtt_client:loop()
         end  


@@ -289,6 +289,9 @@ function processLine(str)
               return '{'..name..'}'
             end      
           end)
               return '{'..name..'}'
             end      
           end)

+        if not mqtt_client:socket() then
+          mqtt_client:reconnect()
+        end  

         mqtt_client:publish(mqtt_path,msg_body,0,false)
         mqtt_client:loop()
       end
         mqtt_client:publish(mqtt_path,msg_body,0,false)
         mqtt_client:loop()
       end


@@ -405,6 +408,7 @@ while 1 do
         io.close(f)
       end)  
     end
         io.close(f)
       end)  
     end

+

   end)
     
 end
   end)
     
 end