Merge remote-tracking branch 'refs/remotes/origin/master'

[weathermon.git] / bin / weathermon

diff --git a/bin/weathermon b/bin/weathermon
index 2c5419c218453ed67d908cbe12da39dcb647c918..c789bea38b9fe09aed645bcfc8a69d6d49829e88 100755 (executable)
--- a/bin/weathermon
+++ b/bin/weathermon
@@ -114,9 +114,7 @@ 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))
-      local n,err = backlog_con:execute('COMMIT TRANSACTION')
+      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
       backlog_con:close()
       
       if err == "LuaSQL: database is locked" then


@@ -130,13 +128,9 @@ function submitValue(type,id,param,val)
   if logdb then
     print(logdb)
     local log_con = assert(env:connect(logdb))
   if logdb then
     print(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))
-    local n,err = log_con:execute('COMMIT TRANSACTION')
+    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()
 

-    print(n,err)
-

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