Пример конфигурации для LCDd

[weathermon.git] / bin / weathermon

diff --git a/bin/weathermon b/bin/weathermon
index cc58def4232fd28424b8699c89b7e8a2c24d3629..bd9ca80200d5e226cddfce4c1c212d98463f8aa8 100755 (executable)
--- a/bin/weathermon
+++ b/bin/weathermon
@@ -1,6 +1,7 @@
 #!/usr/bin/lua
 
 local json = require("json")
+local signal = require("posix.signal")
 
 require "wm_util"
 
@@ -100,12 +101,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...")
@@ -161,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)
@@ -189,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
@@ -252,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
@@ -293,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
@@ -312,6 +311,19 @@ end
 
 getConfig(arg[1])
 
+signal.signal(signal.SIGTERM, function(signum)
+
+  printLog("Terminating...")
+  local pids = get_children()
+  for k,v in pairs(pids) do
+    printLog("Terminating subprocess "..tostring(v).."...")
+    signal.kill(v,signal.SIGTERM)
+  end
+  printLog("Exiting...")
+  os.exit(0)
+
+end)
+
 if backlogdb or logdb then
   local dbdriver = require "luasql.sqlite3"
   env = assert(dbdriver.sqlite3())
@@ -336,7 +348,7 @@ end
 
 if web_url then
   http = require("socket.http")
-  socket = require("socket")
+  http.TIMEOUT = web_timeout
 end
 
 if mqtt_host then
@@ -396,6 +408,7 @@ while 1 do
         io.close(f)
       end)  
     end
+
   end)
     
 end