diff options
| author | Vsevolod Stakhov <vsevolod@rspamd.com> | 2024-09-24 22:09:51 +0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-24 22:09:51 +0600 |
| commit | f8700e56ec5659f331f0aca0b28eec43a4e7cb33 (patch) | |
| tree | 999c6c7bd2ea52fc5352ed03275f4cef0cfa80c7 /src/fuzzy_storage.c | |
| parent | 3dda59641af8826d50dd07bc82d67c9ffecef403 (diff) | |
| parent | 464045f814b78b2d4f9ca20cc9e0a0a1b323ad8e (diff) | |
| download | rspamd-vstakhov-utf8-mime.tar.gz rspamd-vstakhov-utf8-mime.zip | |
Merge branch 'master' into vstakhov-utf8-mimevstakhov-utf8-mime
Diffstat (limited to 'src/fuzzy_storage.c')
| -rw-r--r-- | src/fuzzy_storage.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/fuzzy_storage.c b/src/fuzzy_storage.c index 841d040b2..f21992a94 100644 --- a/src/fuzzy_storage.c +++ b/src/fuzzy_storage.c @@ -2453,7 +2453,8 @@ rspamd_fuzzy_key_stat_iter(const unsigned char *pk_iter, struct fuzzy_key *fuzzy ucl_object_insert_key(elt, flags_ucl, "flags", 0, false); ucl_object_insert_key(elt, - rspamd_keypair_to_ucl(fuzzy_key->key, RSPAMD_KEYPAIR_DUMP_NO_SECRET | RSPAMD_KEYPAIR_DUMP_FLATTENED), + rspamd_keypair_to_ucl(fuzzy_key->key, RSPAMD_KEYPAIR_ENCODING_DEFAULT, + RSPAMD_KEYPAIR_DUMP_NO_SECRET | RSPAMD_KEYPAIR_DUMP_FLATTENED), "keypair", 0, false); ucl_object_insert_key(keys_obj, elt, keyname, 0, true); } @@ -2474,6 +2475,12 @@ rspamd_fuzzy_stat_to_ucl(struct rspamd_fuzzy_storage_ctx *ctx, gboolean ip_stat) rspamd_fuzzy_key_stat_iter(pk_iter, fuzzy_key, keys_obj, ip_stat); }); + if (ctx->dynamic_keys) { + kh_foreach(ctx->dynamic_keys, pk_iter, fuzzy_key, { + rspamd_fuzzy_key_stat_iter(pk_iter, fuzzy_key, keys_obj, ip_stat); + }); + } + ucl_object_insert_key(obj, keys_obj, "keys", 0, false); /* Now generic stats */ |