commit b37385f: Merge pull request #2968 from moisseev/patch-1

[GitHub]

Author: Vsevolod Stakhov
Date: 2019-07-10 11:27:49 +0100
URL: https://github.com/rspamd/rspamd/commit/b37385f7ed4da7ef168ae0ebf9a0733870650c9f (HEAD -> master)

Merge pull request #2968 from moisseev/patch-1
[Minor] Fix missed spaces in log messages

 src/plugins/lua/neural.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --combined src/plugins/lua/neural.lua
index f23730ec3,1816e18b5..3939bebcd
--- a/src/plugins/lua/neural.lua
+++ b/src/plugins/lua/neural.lua
@@@ -867,14 -867,14 +867,14 @@@ local function process_existing_ann(_, 
          -- Same ANN, check version
          if set.ann.version < sel_elt.version then
            -- Load new ann
-           rspamd_logger.infox(rspamd_config, 'ann %s is changed,' ..
+           rspamd_logger.infox(rspamd_config, 'ann %s is changed, ' ..
                'our version = %s, remote version = %s',
                rule.prefix .. ':' .. set.name,
                set.ann.version,
                sel_elt.version)
            load_new_ann(rule, ev_base, set, sel_elt, min_diff)
          else
-           lua_util.debugm(N, rspamd_config, 'ann %s is not changed,' ..
+           lua_util.debugm(N, rspamd_config, 'ann %s is not changed, ' ..
                'our version = %s, remote version = %s',
                rule.prefix .. ':' .. set.name,
                set.ann.version,
@@@ -884,14 -884,14 +884,14 @@@
          -- We have some different ANN, so we need to compare distance
          if set.ann.distance > min_diff then
            -- Load more specific ANN
-           rspamd_logger.infox(rspamd_config, 'more specific ann is available for %s,' ..
+           rspamd_logger.infox(rspamd_config, 'more specific ann is available for %s, ' ..
                'our distance = %s, remote distance = %s',
                rule.prefix .. ':' .. set.name,
                set.ann.distance,
                min_diff)
            load_new_ann(rule, ev_base, set, sel_elt, min_diff)
          else
-           lua_util.debugm(N, rspamd_config, 'ann %s is not changed or less specific,' ..
+           lua_util.debugm(N, rspamd_config, 'ann %s is not changed or less specific, ' ..
                'our distance = %s, remote distance = %s',
                rule.prefix .. ':' .. set.name,
                set.ann.distance,
@@@ -1072,8 -1072,6 +1072,8 @@@ local function ann_push_vector(task
    if verdict == 'passthrough' then
      lua_util.debugm(N, task, 'ignore task as its verdict is %s(%s)',
          verdict, score)
 +
 +    return
    end
  
    for _,rule in pairs(settings.rules) do