From noreply at github.com  Thu Aug  1 11:21:02 2024
From: noreply at github.com (GitHub)
Date: Thu,  1 Aug 2024 11:21:02 +0000 (UTC)
Subject: commit fe39a25: Merge pull request #5086 from
 rspamd/vstakhov-redis-better-errors
Message-ID: <20240801112102.2C102EB4@lists.rspamd.com>

Author: Vsevolod Stakhov
Date: 2024-08-01 17:15:12 +0600
URL: https://github.com/rspamd/rspamd/commit/fe39a258a3e2518a7f1314ef2cbc04e1a33fff2e (HEAD -> master)

Merge pull request #5086 from rspamd/vstakhov-redis-better-errors
[Minor] Improve errors reporting for lua_redis

 src/lua/lua_redis.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

From noreply at github.com  Thu Aug  1 12:21:04 2024
From: noreply at github.com (GitHub)
Date: Thu,  1 Aug 2024 12:21:04 +0000 (UTC)
Subject: commit 9265435: Merge pull request #5084 from
 rspamd/vstakhov-negative-group-limits
Message-ID: <20240801122104.7383EEB8@lists.rspamd.com>

Author: Vsevolod Stakhov
Date: 2024-08-01 18:17:39 +0600
URL: https://github.com/rspamd/rspamd/commit/9265435a9b7fdd132c00767331c85b60dedd7ecf (HEAD -> master)

Merge pull request #5084 from rspamd/vstakhov-negative-group-limits
[Feature] Allow to set negative group score limit via `min_score`

 src/libmime/scan_result.c                      | 48 ++++++++++++++------------
 src/libserver/cfg_file.h                       |  1 +
 src/libserver/cfg_rcl.cxx                      | 18 ++++++++++
 src/libserver/cfg_utils.cxx                    |  2 ++
 src/lua/lua_config.c                           |  2 ++
 src/plugins/fuzzy_check.c                      |  2 ++
 src/rspamadm/configdump.c                      |  5 ++-
 test/functional/cases/001_merged/101_lua.robot | 46 +++++++++++++++++++++++-
 test/functional/configs/merged-local.conf      | 39 +++++++++++++++++++++
 test/functional/configs/merged.conf            |  1 +
 test/functional/lua/deps.lua                   |  2 +-
 test/functional/lua/limits.lua                 | 22 ++++++++++++
 12 files changed, 162 insertions(+), 26 deletions(-)