aboutsummaryrefslogtreecommitdiffstats
path: root/src/libstat
diff options
context:
space:
mode:
Diffstat (limited to 'src/libstat')
-rw-r--r--src/libstat/backends/mmaped_file.c6
-rw-r--r--src/libstat/backends/redis_backend.c20
-rw-r--r--src/libstat/backends/sqlite3_backend.c8
-rw-r--r--src/libstat/learn_cache/redis_cache.c10
-rw-r--r--src/libstat/learn_cache/sqlite3_cache.c2
-rw-r--r--src/libstat/stat_config.c4
-rw-r--r--src/libstat/stat_process.c2
-rw-r--r--src/libstat/tokenizers/osb.c10
8 files changed, 31 insertions, 31 deletions
diff --git a/src/libstat/backends/mmaped_file.c b/src/libstat/backends/mmaped_file.c
index d5b466a9a..eba730cab 100644
--- a/src/libstat/backends/mmaped_file.c
+++ b/src/libstat/backends/mmaped_file.c
@@ -799,10 +799,10 @@ rspamd_mmaped_file_init (struct rspamd_stat_ctx *ctx,
const gchar *filename;
gsize size;
- filenameo = ucl_object_find_key (stf->opts, "filename");
+ filenameo = ucl_object_lookup (stf->opts, "filename");
if (filenameo == NULL || ucl_object_type (filenameo) != UCL_STRING) {
- filenameo = ucl_object_find_key (stf->opts, "path");
+ filenameo = ucl_object_lookup (stf->opts, "path");
if (filenameo == NULL || ucl_object_type (filenameo) != UCL_STRING) {
msg_err_config ("statfile %s has no filename defined", stf->symbol);
@@ -812,7 +812,7 @@ rspamd_mmaped_file_init (struct rspamd_stat_ctx *ctx,
filename = ucl_object_tostring (filenameo);
- sizeo = ucl_object_find_key (stf->opts, "size");
+ sizeo = ucl_object_lookup (stf->opts, "size");
if (sizeo == NULL || ucl_object_type (sizeo) != UCL_INT) {
msg_err_config ("statfile %s has no size defined", stf->symbol);
diff --git a/src/libstat/backends/redis_backend.c b/src/libstat/backends/redis_backend.c
index 61644d004..a862ace6d 100644
--- a/src/libstat/backends/redis_backend.c
+++ b/src/libstat/backends/redis_backend.c
@@ -465,7 +465,7 @@ rspamd_redis_stat_learns (redisAsyncContext *c, gpointer r, gpointer priv)
rspamd_strtoul (reply->str, reply->len, &num);
}
- obj = (ucl_object_t *)ucl_object_find_key (cbdata->cur, "revision");
+ obj = (ucl_object_t *)ucl_object_lookup (cbdata->cur, "revision");
if (obj) {
obj->value.iv += num;
}
@@ -500,17 +500,17 @@ rspamd_redis_stat_key (redisAsyncContext *c, gpointer r, gpointer priv)
num = 0;
}
- obj = (ucl_object_t *)ucl_object_find_key (cbdata->cur, "used");
+ obj = (ucl_object_t *)ucl_object_lookup (cbdata->cur, "used");
if (obj) {
obj->value.iv += num;
}
- obj = (ucl_object_t *)ucl_object_find_key (cbdata->cur, "total");
+ obj = (ucl_object_t *)ucl_object_lookup (cbdata->cur, "total");
if (obj) {
obj->value.iv += num;
}
- obj = (ucl_object_t *)ucl_object_find_key (cbdata->cur, "size");
+ obj = (ucl_object_t *)ucl_object_lookup (cbdata->cur, "size");
if (obj) {
/* Size of key + size of int64_t */
obj->value.iv += num * (sizeof (G_STRINGIFY (G_MAXINT64)) +
@@ -856,11 +856,11 @@ rspamd_redis_init (struct rspamd_stat_ctx *ctx,
backend = g_slice_alloc0 (sizeof (*backend));
- elt = ucl_object_find_any_key (stf->opts, "read_servers", "servers", NULL);
+ elt = ucl_object_lookup_any (stf->opts, "read_servers", "servers", NULL);
if (elt == NULL) {
if (st->classifier->cfg->opts) {
- elt = ucl_object_find_any_key (st->classifier->cfg->opts,
+ elt = ucl_object_lookup_any (st->classifier->cfg->opts,
"read_servers", "servers", NULL);
}
@@ -880,7 +880,7 @@ rspamd_redis_init (struct rspamd_stat_ctx *ctx,
return NULL;
}
- elt = ucl_object_find_key (stf->opts, "write_servers");
+ elt = ucl_object_lookup (stf->opts, "write_servers");
if (elt == NULL) {
/* Use read servers as write ones */
g_assert (relt != NULL);
@@ -903,7 +903,7 @@ rspamd_redis_init (struct rspamd_stat_ctx *ctx,
}
}
- elt = ucl_object_find_key (stf->opts, "prefix");
+ elt = ucl_object_lookup (stf->opts, "prefix");
if (elt == NULL || ucl_object_type (elt) != UCL_STRING) {
/* Default non-users statistics */
backend->redis_object = REDIS_DEFAULT_OBJECT;
@@ -911,7 +911,7 @@ rspamd_redis_init (struct rspamd_stat_ctx *ctx,
/*
* Make redis backend compatible with sqlite3 backend in users settings
*/
- users_enabled = ucl_object_find_any_key (stf->clcf->opts, "per_user",
+ users_enabled = ucl_object_lookup_any (stf->clcf->opts, "per_user",
"users_enabled", NULL);
if (users_enabled != NULL) {
@@ -954,7 +954,7 @@ rspamd_redis_init (struct rspamd_stat_ctx *ctx,
backend->redis_object = ucl_object_tostring (elt);
}
- elt = ucl_object_find_key (stf->opts, "timeout");
+ elt = ucl_object_lookup (stf->opts, "timeout");
if (elt) {
backend->timeout = ucl_object_todouble (elt);
}
diff --git a/src/libstat/backends/sqlite3_backend.c b/src/libstat/backends/sqlite3_backend.c
index 0ea172125..9d582e063 100644
--- a/src/libstat/backends/sqlite3_backend.c
+++ b/src/libstat/backends/sqlite3_backend.c
@@ -523,9 +523,9 @@ rspamd_sqlite3_init (struct rspamd_stat_ctx *ctx,
struct rspamd_stat_sqlite3_db *bk;
GError *err = NULL;
- filenameo = ucl_object_find_key (stf->opts, "filename");
+ filenameo = ucl_object_lookup (stf->opts, "filename");
if (filenameo == NULL || ucl_object_type (filenameo) != UCL_STRING) {
- filenameo = ucl_object_find_key (stf->opts, "path");
+ filenameo = ucl_object_lookup (stf->opts, "path");
if (filenameo == NULL || ucl_object_type (filenameo) != UCL_STRING) {
msg_err_config ("statfile %s has no filename defined", stf->symbol);
return NULL;
@@ -543,7 +543,7 @@ rspamd_sqlite3_init (struct rspamd_stat_ctx *ctx,
bk->L = cfg->lua_state;
- users_enabled = ucl_object_find_any_key (clf->opts, "per_user",
+ users_enabled = ucl_object_lookup_any (clf->opts, "per_user",
"users_enabled", NULL);
if (users_enabled != NULL) {
if (ucl_object_type (users_enabled) == UCL_BOOLEAN) {
@@ -576,7 +576,7 @@ rspamd_sqlite3_init (struct rspamd_stat_ctx *ctx,
bk->enable_users = FALSE;
}
- lang_enabled = ucl_object_find_any_key (clf->opts,
+ lang_enabled = ucl_object_lookup_any (clf->opts,
"per_language", "languages_enabled", NULL);
if (lang_enabled != NULL) {
diff --git a/src/libstat/learn_cache/redis_cache.c b/src/libstat/learn_cache/redis_cache.c
index 47bfd89a6..6dc9d5336 100644
--- a/src/libstat/learn_cache/redis_cache.c
+++ b/src/libstat/learn_cache/redis_cache.c
@@ -185,11 +185,11 @@ rspamd_stat_cache_redis_init (struct rspamd_stat_ctx *ctx,
cache_ctx = g_slice_alloc0 (sizeof (*cache_ctx));
- elt = ucl_object_find_any_key (stf->opts, "read_servers", "servers", NULL);
+ elt = ucl_object_lookup_any (stf->opts, "read_servers", "servers", NULL);
if (elt == NULL) {
if (st->classifier->cfg->opts) {
- elt = ucl_object_find_any_key (st->classifier->cfg->opts,
+ elt = ucl_object_lookup_any (st->classifier->cfg->opts,
"read_servers", "servers", NULL);
}
@@ -209,7 +209,7 @@ rspamd_stat_cache_redis_init (struct rspamd_stat_ctx *ctx,
return NULL;
}
- elt = ucl_object_find_key (stf->opts, "write_servers");
+ elt = ucl_object_lookup (stf->opts, "write_servers");
if (elt == NULL) {
/* Use read servers as write ones */
g_assert (relt != NULL);
@@ -232,7 +232,7 @@ rspamd_stat_cache_redis_init (struct rspamd_stat_ctx *ctx,
}
}
- elt = ucl_object_find_key (stf->opts, "key");
+ elt = ucl_object_lookup (stf->opts, "key");
if (elt == NULL || ucl_object_type (elt) != UCL_STRING) {
cache_ctx->redis_object = DEFAULT_REDIS_KEY;
}
@@ -240,7 +240,7 @@ rspamd_stat_cache_redis_init (struct rspamd_stat_ctx *ctx,
cache_ctx->redis_object = ucl_object_tostring (elt);
}
- elt = ucl_object_find_key (stf->opts, "timeout");
+ elt = ucl_object_lookup (stf->opts, "timeout");
if (elt) {
cache_ctx->timeout = ucl_object_todouble (elt);
}
diff --git a/src/libstat/learn_cache/sqlite3_cache.c b/src/libstat/learn_cache/sqlite3_cache.c
index 41731fa10..61335ab34 100644
--- a/src/libstat/learn_cache/sqlite3_cache.c
+++ b/src/libstat/learn_cache/sqlite3_cache.c
@@ -125,7 +125,7 @@ rspamd_stat_cache_sqlite3_init (struct rspamd_stat_ctx *ctx,
GError *err = NULL;
if (cf) {
- elt = ucl_object_find_any_key (cf, "path", "file", NULL);
+ elt = ucl_object_lookup_any (cf, "path", "file", NULL);
if (elt != NULL) {
path = ucl_object_tostring (elt);
diff --git a/src/libstat/stat_config.c b/src/libstat/stat_config.c
index 96af1eb53..6e383baf1 100644
--- a/src/libstat/stat_config.c
+++ b/src/libstat/stat_config.c
@@ -152,11 +152,11 @@ rspamd_stat_init (struct rspamd_config *cfg, struct event_base *ev_base)
cache_name = NULL;
if (clf->opts) {
- cache_obj = ucl_object_find_key (clf->opts, "cache");
+ cache_obj = ucl_object_lookup (clf->opts, "cache");
cache_name_obj = NULL;
if (cache_obj) {
- cache_name_obj = ucl_object_find_any_key (cache_obj,
+ cache_name_obj = ucl_object_lookup_any (cache_obj,
"name", "type", NULL);
}
diff --git a/src/libstat/stat_process.c b/src/libstat/stat_process.c
index b50a36894..6b1b16aed 100644
--- a/src/libstat/stat_process.c
+++ b/src/libstat/stat_process.c
@@ -702,7 +702,7 @@ rspamd_stat_check_autolearn (struct rspamd_task *task)
ret = FALSE;
if (cl->cfg->opts) {
- obj = ucl_object_find_key (cl->cfg->opts, "autolearn");
+ obj = ucl_object_lookup (cl->cfg->opts, "autolearn");
if (ucl_object_type (obj) == UCL_BOOLEAN) {
if (ucl_object_toboolean (obj)) {
diff --git a/src/libstat/tokenizers/osb.c b/src/libstat/tokenizers/osb.c
index bfeac55cc..906c1de25 100644
--- a/src/libstat/tokenizers/osb.c
+++ b/src/libstat/tokenizers/osb.c
@@ -97,12 +97,12 @@ rspamd_tokenizer_osb_config_from_ucl (rspamd_mempool_t * pool,
def = rspamd_tokenizer_osb_default_config ();
memcpy (cf, def, sizeof (*cf));
- elt = ucl_object_find_key (obj, "hash");
+ elt = ucl_object_lookup (obj, "hash");
if (elt != NULL && ucl_object_type (elt) == UCL_STRING) {
if (g_ascii_strncasecmp (ucl_object_tostring (elt), "xxh", 3)
== 0) {
cf->ht = RSPAMD_OSB_HASH_XXHASH;
- elt = ucl_object_find_key (obj, "seed");
+ elt = ucl_object_lookup (obj, "seed");
if (elt != NULL && ucl_object_type (elt) == UCL_INT) {
cf->seed = ucl_object_toint (elt);
}
@@ -110,7 +110,7 @@ rspamd_tokenizer_osb_config_from_ucl (rspamd_mempool_t * pool,
else if (g_ascii_strncasecmp (ucl_object_tostring (elt), "sip", 3)
== 0) {
cf->ht = RSPAMD_OSB_HASH_SIPHASH;
- elt = ucl_object_find_key (obj, "key");
+ elt = ucl_object_lookup (obj, "key");
if (elt != NULL && ucl_object_type (elt) == UCL_STRING) {
key = rspamd_decode_base32 (ucl_object_tostring (elt),
@@ -131,13 +131,13 @@ rspamd_tokenizer_osb_config_from_ucl (rspamd_mempool_t * pool,
}
}
else {
- elt = ucl_object_find_key (obj, "compat");
+ elt = ucl_object_lookup (obj, "compat");
if (elt != NULL && ucl_object_toboolean (elt)) {
cf->ht = RSPAMD_OSB_HASH_COMPAT;
}
}
- elt = ucl_object_find_key (obj, "window");
+ elt = ucl_object_lookup (obj, "window");
if (elt != NULL && ucl_object_type (elt) == UCL_INT) {
cf->window_size = ucl_object_toint (elt);
if (cf->window_size > DEFAULT_FEATURE_WINDOW_SIZE * 4) {
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-28 12:05:21 +0000