Штатный способ работы с таймаутами работает стабильнее традиционного с функцией откры...

[weathermon.git] / bin / weathermon

diff --git a/bin/weathermon b/bin/weathermon
index 804ba255a87eef42963134328191f2b52502aea5..2314e1a4122cf8fe02f5e1950b0d8ff6397592ad 100755 (executable)
--- a/bin/weathermon
+++ b/bin/weathermon
@@ -100,12 +100,7 @@ function submitValue(type,id,param,val)
       url = url:gsub("//","//"..web_user..":"..web_pass.."@",1)
     end
 
       url = url:gsub("//","//"..web_user..":"..web_pass.."@",1)
     end
 

-    local result,code = http.request ({
-      url=url, create=function()
-        local req_sock = socket.tcp()
-        req_sock:settimeout(web_timeout)
-        return req_sock
-      end})
+    local result,code = http.request (url)

 
     if code ~= 200 and backlog_con then
       printLog("writing record to backlog...")
 
     if code ~= 200 and backlog_con then
       printLog("writing record to backlog...")


@@ -189,7 +184,7 @@ function processJson(str)
         if not mqtt_client:socket() then
           mqtt_client:reconnect()
         end  
         if not mqtt_client:socket() then
           mqtt_client:reconnect()
         end  

-        mqtt_client:publish(mqtt_path,v)
+        mqtt_client:publish(mqtt_path,v,0,0)

         mqtt_client:loop()
       end  
     end
         mqtt_client:loop()
       end  
     end


@@ -252,7 +247,7 @@ function processLine(str)
                 return '{'..name..'}'
               end      
             end)
                 return '{'..name..'}'
               end      
             end)

-          mqtt_client:publish(mqtt_path,v)
+          mqtt_client:publish(mqtt_path,v,0,0)

           mqtt_client:loop()
         end  
       end
           mqtt_client:loop()
         end  
       end


@@ -293,7 +288,7 @@ function processLine(str)
               return '{'..name..'}'
             end      
           end)
               return '{'..name..'}'
             end      
           end)

-        mqtt_client:publish(mqtt_path,msg_body)
+        mqtt_client:publish(mqtt_path,msg_body,0,0)

         mqtt_client:loop()
       end
       if alarm_exec then
         mqtt_client:loop()
       end
       if alarm_exec then


@@ -336,7 +331,7 @@ end
 
 if web_url then
   http = require("socket.http")
 
 if web_url then
   http = require("socket.http")

-  socket = require("socket")
+  http.TIMEOUT = web_timeout

 end
 
 if mqtt_host then
 end
 
 if mqtt_host then