Переход на короткоживущие соединения с sqlite - на MT7688 возникают блокировки.

[weathermon.git] / bin / weathermon

diff --git a/bin/weathermon b/bin/weathermon
index 6980cc835dfc8e2aa6caa9794e282ce3c8ec7443..d2b53746f65ace65e7a4610bc42b0515633768f1 100755 (executable)
--- a/bin/weathermon
+++ b/bin/weathermon
@@ -1,9 +1,7 @@
 #!/usr/bin/lua
 
 local json = require("json")
 #!/usr/bin/lua
 
 local json = require("json")

-local socket = require("socket")
-
-local http = require("socket.http")
+local signal = require("posix.signal")

 
 require "wm_util"
 
 
 require "wm_util"
 


@@ -24,37 +22,12 @@ function getConfig(configname)
   web_user = cur.get(config,"web","user")
   web_timeout = cur.get(config,"web","timeout")
   web_pass = cur.get(config,"web","password")
   web_user = cur.get(config,"web","user")
   web_timeout = cur.get(config,"web","timeout")
   web_pass = cur.get(config,"web","password")

-  web_devid = cur.get(config,"web","devid")
-
-  web_iface = cur.get(config,"web","iface")

  
   if not web_timeout then
     web_timeout = 10
   end
 
  
   if not web_timeout then
     web_timeout = 10
   end
 

-  if web_iface then
-  
-    command = '/sbin/ifconfig '..web_iface..' | grep \'\\<inet\\>\' | sed -n \'1p\' | tr -s \' \' | cut -d \' \' -f3 | cut -d \':\' -f2'
-    f=io.popen(command,'r')
-    ip_addr=f:read()
-  
-  end
-
-  if not web_devid then
-  
-    if web_iface then
-      io.input("/sys/class/net/"..web_iface.."/address")
-    else
-      io.input("/sys/class/net/eth0/address")
-    end
-
-    local mac = io.read("*line")
-    mac = mac:gsub(":","")
-    mac = mac:upper()
-
-    web_devid = mac
-
-  end
+  web_devid = get_devid(config)

 
   logging = cur.get(config,"logging","enabled") 
   touch_file = cur.get(config,"logging","touch_file") 
 
   logging = cur.get(config,"logging","enabled") 
   touch_file = cur.get(config,"logging","touch_file") 


@@ -118,7 +91,9 @@ end
 
 function submitValue(type,id,param,val)
 
 
 function submitValue(type,id,param,val)
 

-  if web_url then
+  val = tonumber(val)
+
+  if web_url and val then

 
     local url = web_url.."?stype="..url_encode(type).."&sid="..url_encode(id).."&param="..url_encode(param).."&value="..url_encode(val)
 
 
     local url = web_url.."?stype="..url_encode(type).."&sid="..url_encode(id).."&param="..url_encode(param).."&value="..url_encode(val)
 


@@ -126,28 +101,27 @@ 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 then
-      print("writing record to backlog...")
+    if code ~= 200 and backlogdb then
+      printLog("writing record to backlog...")
+      local backlog_con = assert(env:connect(backlogdb))
+      backlog_con:execute('BEGIN TRANSACTION')

       backlog_con:execute(string.format("INSERT INTO queue(time_stamp,sensor_id,sensor,param,value) VALUES (datetime('now','localtime'),'%s','%s','%s',%f)",id,type,param,val))
       backlog_con:execute(string.format("INSERT INTO queue(time_stamp,sensor_id,sensor,param,value) VALUES (datetime('now','localtime'),'%s','%s','%s',%f)",id,type,param,val))

+      backlog_con:execute('COMMIT')
+      backlog_con:close()

     end
 
   end
   
   if logdb then
     end
 
   end
   
   if logdb then

+    local log_con = assert(env:connect(logdb))
+    log_con:execute('BEGIN TRANSACTION')

     log_con:execute(string.format("INSERT INTO log(time_stamp,sensor_id,sensor,param,value) VALUES (datetime('now','localtime'),'%s','%s','%s',%f)",id,type,param,val))
     log_con:execute(string.format("INSERT INTO log(time_stamp,sensor_id,sensor,param,value) VALUES (datetime('now','localtime'),'%s','%s','%s',%f)",id,type,param,val))

+    log_con:execute('COMMIT')
+    log_con:close()

   end
 
   end
 

-  if touch_file then
-    touch(touch_file)
-  end  
-  

 end
 
 function storeRecord(id,sensor,param,value) 
 end
 
 function storeRecord(id,sensor,param,value) 


@@ -191,14 +165,13 @@ 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)
       printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..k..", Value = \""..v.."\"")
     local record = {}
     for k,v in pairs(sensor) do
       storeRecord(sensor_id,sensor_type,k,v)
       printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..k..", Value = \""..v.."\"")

-      submitValue(sensor_type,sensor_id,k,v)
+      if web_url then
+        submitValue(sensor_type,sensor_id,k,v)
+      end  

       if mqtt_client then
         mqtt_path=string.gsub(mqtt_topic,"{(.-)}", 
           function (name) 
       if mqtt_client then
         mqtt_path=string.gsub(mqtt_topic,"{(.-)}", 
           function (name) 


@@ -214,9 +187,11 @@ function processJson(str)
               return '{'..name..'}'
             end      
           end)
               return '{'..name..'}'
             end      
           end)

-        mqtt_client:connect(mqtt_host,mqtt_port)
-        mqtt_client:publish(mqtt_path,v)
-        mqtt_client:disconnect()
+        if not mqtt_client:socket() then
+          mqtt_client:reconnect()
+        end  
+        mqtt_client:publish(mqtt_path,v,0,false)
+        mqtt_client:loop()

       end  
     end
   else
       end  
     end
   else


@@ -260,7 +235,9 @@ function processLine(str)
       for k,v in pairs(sensor) do
         storeRecord(sensor_id,sensor_type,k,v)
         printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..k..", Value = "..v)
       for k,v in pairs(sensor) do
         storeRecord(sensor_id,sensor_type,k,v)
         printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..k..", Value = "..v)

-        submitValue(sensor_type,sensor_id,k,v)
+        if web_url then 
+          submitValue(sensor_type,sensor_id,k,v)
+        end  

         if mqtt_client then
           mqtt_path=string.gsub(mqtt_topic,"{(.-)}", 
             function (name) 
         if mqtt_client then
           mqtt_path=string.gsub(mqtt_topic,"{(.-)}", 
             function (name) 


@@ -276,9 +253,11 @@ function processLine(str)
                 return '{'..name..'}'
               end      
             end)
                 return '{'..name..'}'
               end      
             end)

-          mqtt_client:connect(mqtt_host,mqtt_port)
-          mqtt_client:publish(mqtt_path,v)
-          mqtt_client:disconnect()
+          if not mqtt_client:socket() then
+            mqtt_client:reconnect()
+          end  
+          mqtt_client:publish(mqtt_path,v,0,false)
+          mqtt_client:loop()

         end  
       end
     else
         end  
       end
     else


@@ -318,9 +297,11 @@ function processLine(str)
               return '{'..name..'}'
             end      
           end)
               return '{'..name..'}'
             end      
           end)

-        mqtt_client:connect(mqtt_host,mqtt_port)
-        mqtt_client:publish(mqtt_path,msg_body)
-        mqtt_client:disconnect()
+        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
         command=alarm_exec..
       end
       if alarm_exec then
         command=alarm_exec..


@@ -338,6 +319,19 @@ end
 
 getConfig(arg[1])
 
 
 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())
 if backlogdb or logdb then
   local dbdriver = require "luasql.sqlite3"
   env = assert(dbdriver.sqlite3())


@@ -346,22 +340,25 @@ end
 if backlogdb then
   if not file_exists(backlogdb) then
     touch(backlogdb)
 if backlogdb then
   if not file_exists(backlogdb) then
     touch(backlogdb)

-    backlog_con = assert(env:connect(backlogdb))
-    backlog_con:execute("CREATE TABLE queue(time_stamp datetime,sensor_id varchar(16),sensor varchar(16),param varchar(16),value float)")
-  else
-    backlog_con = assert(env:connect(backlogdb))
-  end
+  end  
+  local backlog_con = assert(env:connect(backlogdb))
+  backlog_con:execute("CREATE TABLE queue(time_stamp datetime,sensor_id varchar(16),sensor varchar(16),param varchar(16),value float)")
+  backlog_con:close()

 end
 
 if logdb then
   if not file_exists(logdb) then
     touch(logdb)
 end
 
 if logdb then
   if not file_exists(logdb) then
     touch(logdb)

-    log_con = assert(env:connect(logdb))
-    log_con:execute("CREATE TABLE log(time_stamp datetime,sensor_id varchar(16),sensor varchar(16),param varchar(16),value float)")
-    log_con:execute("CREATE INDEX log_idx ON log(sensor_id,sensor,param,time_stamp)")
-  else
-    log_con = assert(env:connect(logdb))
-  end
+  end  
+  local log_con = assert(env:connect(logdb))
+  log_con:execute("CREATE TABLE log(time_stamp datetime,sensor_id varchar(16),sensor varchar(16),param varchar(16),value float)")
+  log_con:execute("CREATE INDEX log_idx ON log(sensor_id,sensor,param,time_stamp)")
+  log_con:close()
+end
+
+if web_url then
+  http = require("socket.http")
+  http.TIMEOUT = web_timeout

 end
 
 if mqtt_host then
 end
 
 if mqtt_host then


@@ -370,6 +367,7 @@ if mqtt_host then
   if mqtt_user then
     mqtt_client:login_set(mqtt_user, mqtt_passwd)
   end
   if mqtt_user then
     mqtt_client:login_set(mqtt_user, mqtt_passwd)
   end

+  mqtt_client:connect(mqtt_host,mqtt_port)

 end
 
 if serial_port then
 end
 
 if serial_port then


@@ -385,6 +383,8 @@ else
   return
 end  
 
   return
 end  
 

+serialin:setvbuf('no')
+

 records = {}
 
 while 1 do
 records = {}
 
 while 1 do


@@ -404,11 +404,19 @@ while 1 do
       processLine(line)
     end
 
       processLine(line)
     end
 

+    if touch_file then
+      pcall(function () 
+        touch(touch_file) 
+      end)
+    end  
+

     if dump_file then
     if dump_file then

-      local f = io.open(dump_file,"w")
-      io.output(f)
-      io.write(json.encode(records))
-      io.close(f)
+      pcall(function ()
+        local f = io.open(dump_file,"w")
+        io.output(f)
+        io.write(json.encode(records))
+        io.close(f)
+      end)  

     end
   end)
     
     end
   end)