X-Git-Url: https://git.rvb.name/weathermon.git/blobdiff_plain/c58ad4fb6f2c4c350a6aae01b100ebb4564ad8e9..2b43b1c28e9ced6c475904604df1c99b78cd8a71:/bin/weathermon

diff --git a/bin/weathermon b/bin/weathermon
index d16f871..2314e1a 100755
--- 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
 
-    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...")
@@ -186,7 +181,10 @@ function processJson(str)
               return '{'..name..'}'
             end      
           end)
-        mqtt_client:publish(mqtt_path,v)
+        if not mqtt_client:socket() then
+          mqtt_client:reconnect()
+        end  
+        mqtt_client:publish(mqtt_path,v,0,0)
         mqtt_client:loop()
       end  
     end
@@ -249,7 +247,7 @@ function processLine(str)
                 return '{'..name..'}'
               end      
             end)
-          mqtt_client:publish(mqtt_path,v)
+          mqtt_client:publish(mqtt_path,v,0,0)
           mqtt_client:loop()
         end  
       end
@@ -290,7 +288,7 @@ function processLine(str)
               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
@@ -333,7 +331,7 @@ end
 
 if web_url then
   http = require("socket.http")
-  socket = require("socket")
+  http.TIMEOUT = web_timeout
 end
 
 if mqtt_host then