X-Git-Url: https://git.rvb.name/weathermon.git/blobdiff_plain/21260a74f42a65603317d1938fac675d5eef6635..HEAD:/bin/weathermon?ds=inline

diff --git a/bin/weathermon b/bin/weathermon
index dbffa82..c789bea 100755
--- a/bin/weathermon
+++ b/bin/weathermon
@@ -89,6 +89,14 @@ function printLog(str)
   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)
@@ -103,19 +111,30 @@ function submitValue(type,id,param,val)
 
     local result,code = http.request (url)
 
-    if code ~= 200 and backlog_con then
+    if code ~= 200 and backlogdb then
       printLog("writing record to backlog...")
-      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 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
-    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')
+    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
@@ -337,17 +356,19 @@ if backlogdb then
   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:close()
 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:close()
 end
 
 if web_url then
@@ -389,7 +410,7 @@ while 1 do
     break
   end
 
-  pcall(function ()
+--  pcall(function ()
   
     printLog("Received: "..line)
     if startswith(line,'{') then
@@ -412,6 +433,6 @@ while 1 do
         io.close(f)
       end)  
     end
-  end)
+--  end)
     
 end