From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 27 Apr 2016 14:09:53 +0000 (+0100)
Subject: [Feature] Lock ANN file when loading
X-Git-Tag: 1.3.0~613
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=627cf5036cabead89f5c6162d3db23ae552c9694;p=thirdparty%2Frspamd.git

[Feature] Lock ANN file when loading
---

diff --git a/src/plugins/lua/fann_scores.lua b/src/plugins/lua/fann_scores.lua
index ea82974a10..e72c1d4d66 100644
--- a/src/plugins/lua/fann_scores.lua
+++ b/src/plugins/lua/fann_scores.lua
@@ -75,7 +75,9 @@ local function load_fann(id)
     return false
   end
 
+  local fd = rspamd_util.lock_file(fname)
   data[id].fann = rspamd_fann.load(fname)
+  rspamd_util.unlock_file(fd) -- closes fd
 
   if data[id].fann then
     local n = rspamd_config:get_symbols_count()
@@ -182,7 +184,22 @@ local function fann_train_callback(score, required_score,results, cf, id, opts)
 
   if data[id].ntrains > max_trains then
     -- Store fann on disk
-    local res = data[id].fann_train:save(fname)
+    local res = false
+
+    if not rspamd_util.stat(fname) then
+      local fd,err = rspamd_util.create_file(fname)
+      if not fd then
+        rspamd_logger.errx(cf, 'cannot save fann in %s: %s', fname, err)
+      else
+        rspamd_util.lock_file(fname, fd)
+        res = data[id].fann_train:save(fname)
+        rspamd_util.unlock_file(fd) -- Closes fd as well
+      end
+    else
+      local fd = rspamd_util.lock_file(fname)
+      res = data[id].fann_train:save(fname)
+      rspamd_util.unlock_file(fd) -- Closes fd as well
+    end
 
     if not res then
       rspamd_logger.errx(cf, 'cannot save fann in %s', fname)