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

[weathermon.git] / bin / weathermon

diff --git a/bin/weathermon b/bin/weathermon
index d2b53746f65ace65e7a4610bc42b0515633768f1..c789bea38b9fe09aed645bcfc8a69d6d49829e88 100755 (executable)
--- a/bin/weathermon
+++ b/bin/weathermon
@@ -89,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)


@@ -106,20 +114,27 @@ function submitValue(type,id,param,val)
     if code ~= 200 and backlogdb then
       printLog("writing record to backlog...")
       local backlog_con = assert(env:connect(backlogdb))
     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('COMMIT')
+      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()
       backlog_con:close()

+      
+      if err == "LuaSQL: database is locked" then
+        unlock_db(backlogdb);
+      end
+      

     end
 
   end
   
   if logdb then
     end
 
   end
   
   if logdb then

+    print(logdb)

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

+
+    if err == "LuaSQL: database is locked" then
+      unlock_db(logdb);
+    end
+

   end
 
 end
   end
 
 end


@@ -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


@@ -418,6 +433,6 @@ while 1 do
         io.close(f)
       end)  
     end
         io.close(f)
       end)  
     end

-  end)
+--  end)

     
 end
     
 end