commit 0ce6780: Merge pull request #2969 from moisseev/patch-2

[GitHub]

Author: Vsevolod Stakhov
Date: 2019-07-10 11:28:00 +0100
URL: https://github.com/rspamd/rspamd/commit/0ce67807336fd2b8bdc6a553263e3309c4199fa9 (HEAD -> master)

Merge pull request #2969 from moisseev/patch-2
[Minor] Fix inequality sign in log message

 src/plugins/lua/neural.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --combined src/plugins/lua/neural.lua
index 3939bebcd,c6dfa074a..af3e4465b
--- a/src/plugins/lua/neural.lua
+++ b/src/plugins/lua/neural.lua
@@@ -375,7 -375,7 +375,7 @@@ local function ann_push_task_result(rul
      if train_opts.ham_score then
        learn_ham = score <= train_opts.ham_score
        if not learn_ham then
-         skip_reason = string.format('score > ham_score: %f < %f',
+         skip_reason = string.format('score > ham_score: %f > %f',
              score, train_opts.ham_score)
        end
      else
@@@ -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