Транзакционная работа с БД для избежания блокировок.

diff --git a/bin/dump-yesterday b/bin/dump-yesterday
index d96d3dd6f5a0e3317982560f8b6f0d09d1547b43..c9e1eaf5727c875d83c4a05f7ffbac37f8e6a835 100755 (executable)
--- a/bin/dump-yesterday
+++ b/bin/dump-yesterday
@@ -12,6 +12,6 @@ if [ -f "$logdb" ]; then
 
   /usr/bin/weather-filter $logdb dump-compacted $yesterday $dumpdir
 
 
   /usr/bin/weather-filter $logdb dump-compacted $yesterday $dumpdir
 

-  sqlite3 $logdb "delete from log where time_stamp<date('now','-1 day')"
+  sqlite3 $logdb "delete from log where time_stamp<date('now','-2 day')"

 
 fi
 
 fi

diff --git a/bin/weather-backup b/bin/weather-backup
index fd219f7f5dea94cb8d98e7bea19117e797368f21..7f8009b630ffc7348117301ad04a986d1547b7c0 100755 (executable)
--- a/bin/weather-backup
+++ b/bin/weather-backup
@@ -6,10 +6,10 @@ LOGDB=`uci get weathermon.process.logdb`
 
 if [ ! -z "$BACKLOGDB" ]; then
        BACKLOG_BASE=$(basename "$BACKLOGDB")
 
 if [ ! -z "$BACKLOGDB" ]; then
        BACKLOG_BASE=$(basename "$BACKLOGDB")

-       sqlite3 "$BACKLOGDB" ".backup $BACKUP_DIR/$BACKLOG_BASE" 
+       sqlite3 -readonly "$BACKLOGDB" ".backup $BACKUP_DIR/$BACKLOG_BASE" 

 fi
 
 if [ ! -z "$LOGDB" ]; then
        LOG_BASE=$(basename "$LOGDB")
 fi
 
 if [ ! -z "$LOGDB" ]; then
        LOG_BASE=$(basename "$LOGDB")

-       sqlite3 "$LOGDB" ".backup $BACKUP_DIR/$LOG_BASE" 
+       sqlite3 -readonly "$LOGDB" ".backup $BACKUP_DIR/$LOG_BASE" 

 fi
 fi

diff --git a/bin/weather-filter b/bin/weather-filter
index 84c22653696bb52467dfe2a02a8176f815bf9eab..3acca7b9569222281a6a8470130df146891d5f72 100755 (executable)
--- a/bin/weather-filter
+++ b/bin/weather-filter
@@ -175,7 +175,7 @@ local day = arg[3]
 
 local dbdriver = require "luasql.sqlite3"
 env = assert(dbdriver.sqlite3())
 
 local dbdriver = require "luasql.sqlite3"
 env = assert(dbdriver.sqlite3())

-con = assert(env:connect(logdb))
+con = assert(env:connect(logdb,'READONLY'))

 
 if command == "list" then
 
 
 if command == "list" then
 

diff --git a/bin/weather-watchdog b/bin/weather-watchdog
index 4847477eec1e7f43ec4617626758c68b5ffc344b..48c4bff38ad5eface86b41aca999248811ec8edb 100644 (file)
--- a/bin/weather-watchdog
+++ b/bin/weather-watchdog
@@ -4,7 +4,8 @@ stamp=`date +%s -r $(uci get weathermon.process.dump_file)`
 now=`date +%s`
 delta=$(( $now - $stamp ))
 if [[ $delta -ge 300 ]]; then
 now=`date +%s`
 delta=$(( $now - $stamp ))
 if [[ $delta -ge 300 ]]; then

+  logger weathermon restarting...

   /etc/init.d/weathermon restart
 fi
 
   /etc/init.d/weathermon restart
 fi
 

-pgrep weather-display > /dev/null || /etc/init.d/weather-display restart
+pgrep weather-lcd > /dev/null || /etc/init.d/lcd-weather restart

diff --git a/bin/weathermon b/bin/weathermon
index bd9ca80200d5e226cddfce4c1c212d98463f8aa8..dbffa82d187ae22071ad84b144c48dbc1753ff28 100755 (executable)
--- a/bin/weathermon
+++ b/bin/weathermon
@@ -105,13 +105,17 @@ function submitValue(type,id,param,val)
 
     if code ~= 200 and backlog_con then
       printLog("writing record to backlog...")
 
     if code ~= 200 and backlog_con 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(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')

     end
 
   end
   
   if logdb then
     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(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')

   end
 
 end
   end
 
 end


@@ -408,7 +412,6 @@ while 1 do
         io.close(f)
       end)  
     end
         io.close(f)
       end)  
     end

-

   end)
     
 end
   end)
     
 end