Транзакционность при коротких сессиях с БД не требуется, все в одну операцию.

[weathermon.git] / bin / weathermon

diff --git a/bin/weathermon b/bin/weathermon
index fb431a7485f2ac33534d6dd23e4ce1635d82c565..c789bea38b9fe09aed645bcfc8a69d6d49829e88 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") 


@@ -116,6 +89,14 @@ function printLog(str)
   end 
 end
 
   end 
 end
 

+function unlock_db(file)
+
+  print("Unlocking DB "..file)
+  os.execute("sqlite3 -readonly \""..file.."\" \".backup /tmp/weathermon.db\"")
+  os.execute("mv /tmp/weathermon.db \""..file.."\"")
+
+end
+

 function submitValue(type,id,param,val)
 
   val = tonumber(val)
 function submitValue(type,id,param,val)
 
   val = tonumber(val)


@@ -128,28 +109,34 @@ 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
+    if code ~= 200 and backlogdb then

       printLog("writing record to backlog...")
       printLog("writing record to backlog...")

-      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))
+      local backlog_con = assert(env:connect(backlogdb))
+      local n,err = 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:close()
+      
+      if err == "LuaSQL: database is locked" then
+        unlock_db(backlogdb);
+      end
+      

     end
 
   end
   
   if logdb then
     end
 
   end
   
   if logdb then

-    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))
+    print(logdb)
+    local log_con = assert(env:connect(logdb))
+    local n,err = 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:close()
+
+    if err == "LuaSQL: database is locked" then
+      unlock_db(logdb);
+    end
+

   end
 
   end
 

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

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


@@ -193,14 +180,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) 


@@ -216,9 +202,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


@@ -262,7 +250,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) 


@@ -278,9 +268,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


@@ -320,9 +312,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..


@@ -340,6 +334,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())


@@ -349,17 +356,24 @@ if backlogdb then
   if not file_exists(backlogdb) then
     touch(backlogdb)
   end  
   if not file_exists(backlogdb) then
     touch(backlogdb)
   end  

-  backlog_con = assert(env:connect(backlogdb))
+  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: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  
 end
 
 if logdb then
   if not file_exists(logdb) then
     touch(logdb)
   end  

-  log_con = assert(env:connect(logdb))
+  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: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


@@ -368,6 +382,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


@@ -395,7 +410,7 @@ while 1 do
     break
   end
 
     break
   end
 

-  pcall(function ()
+--  pcall(function ()

   
     printLog("Received: "..line)
     if startswith(line,'{') then
   
     printLog("Received: "..line)
     if startswith(line,'{') then


@@ -404,12 +419,20 @@ 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)

     
 end
     
 end