From d6a8ed7e887429932b41fb316b5348b51e016c58 Mon Sep 17 00:00:00 2001 From: Karl Fleischmann Date: Mon, 30 Jan 2023 16:45:05 +0100 Subject: [PATCH] lib-dict: Rename proxy attributes Make the naming of the attributes consistent with other storage parameters, especially the http-storage. --- src/lib-dict/dict-client.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/lib-dict/dict-client.c b/src/lib-dict/dict-client.c index 960b0bba03..d2eae61554 100644 --- a/src/lib-dict/dict-client.c +++ b/src/lib-dict/dict-client.c @@ -74,7 +74,7 @@ struct client_dict { char *uri; enum dict_data_type value_type; - unsigned int warn_slow_msecs; + unsigned int slow_warn_msecs; time_t last_failed_connect; char *last_connect_error; @@ -83,7 +83,7 @@ struct client_dict { uint64_t last_timer_switch_usecs; struct timeout *to_requests; struct timeout *to_idle; - unsigned int idle_msecs; + unsigned int idle_timeout_msecs; ARRAY(struct client_dict_cmd *) cmds; struct client_dict_transaction_context *transactions; @@ -422,10 +422,10 @@ static bool client_dict_have_nonbackground_cmds(struct client_dict *dict) static void client_dict_add_timeout(struct client_dict *dict) { if (dict->to_idle != NULL) { - if (dict->idle_msecs > 0) + if (dict->idle_timeout_msecs > 0) timeout_reset(dict->to_idle); } else if (client_dict_is_finished(dict)) { - dict->to_idle = timeout_add(dict->idle_msecs, + dict->to_idle = timeout_add(dict->idle_timeout_msecs, client_dict_timeout, dict); timeout_remove(&dict->to_requests); } else if (dict->transactions == NULL && @@ -708,30 +708,30 @@ client_dict_init(struct dict *driver, const char *uri, struct ioloop *old_ioloop = current_ioloop; struct client_dict *dict; const char *p, *dest_uri, *value, *path; - unsigned int idle_msecs = DICT_CLIENT_DEFAULT_TIMEOUT_MSECS; - unsigned int warn_slow_msecs = DICT_CLIENT_DEFAULT_WARN_SLOW_MSECS; + unsigned int idle_timeout_msecs = DICT_CLIENT_DEFAULT_TIMEOUT_MSECS; + unsigned int slow_warn_msecs = DICT_CLIENT_DEFAULT_WARN_SLOW_MSECS; - /* uri = [idle_msecs=:] [warn_slow_msecs=:] [] ":" */ + /* uri = [idle_timeout=:] [slow_warn=:] [] ":" */ for (;;) { - if (str_begins(uri, "idle_msecs=", &value)) { + if (str_begins(uri, "idle_timeout=", &value)) { p = strchr(value, ':'); if (p == NULL) { *error_r = t_strdup_printf("Invalid URI: %s", uri); return -1; } - if (str_to_uint(t_strdup_until(value, p), &idle_msecs) < 0) { - *error_r = "Invalid idle_msecs"; + if (str_to_uint(t_strdup_until(value, p), &idle_timeout_msecs) < 0) { + *error_r = "Invalid idle_timeout"; return -1; } uri = p+1; - } else if (str_begins(uri, "warn_slow_msecs=", &value)) { + } else if (str_begins(uri, "slow_warn=", &value)) { p = strchr(value, ':'); if (p == NULL) { *error_r = t_strdup_printf("Invalid URI: %s", uri); return -1; } - if (str_to_uint(t_strdup_until(value, p), &warn_slow_msecs) < 0) { - *error_r = "Invalid warn_slow_msecs"; + if (str_to_uint(t_strdup_until(value, p), &slow_warn_msecs) < 0) { + *error_r = "Invalid slow_warn_msecs"; return -1; } uri = p+1; @@ -754,8 +754,8 @@ client_dict_init(struct dict *driver, const char *uri, dict->dict = *driver; dict->conn.dict = dict; dict->conn.conn.event_parent = set->event_parent; - dict->idle_msecs = idle_msecs; - dict->warn_slow_msecs = warn_slow_msecs; + dict->idle_timeout_msecs = idle_timeout_msecs; + dict->slow_warn_msecs = slow_warn_msecs; i_array_init(&dict->cmds, 32); if (uri[0] == ':') { @@ -958,7 +958,7 @@ client_dict_lookup_async_callback(struct client_dict_cmd *cmd, result.error = t_strdup_printf("%s (reply took %s)", result.error, dict_warnings_sec(cmd, diff, extra_args)); } else if (!cmd->background && - diff >= (int)dict->warn_slow_msecs) { + diff >= (int)dict->slow_warn_msecs) { e_warning(dict->conn.conn.event, "dict lookup took %s: %s", dict_warnings_sec(cmd, diff, extra_args), cmd->query); @@ -1072,7 +1072,7 @@ client_dict_iter_api_callback(struct client_dict_iterate_context *ctx, i_free(ctx->error); ctx->error = new_error; } else if (!cmd->background && - diff >= (int)dict->warn_slow_msecs) { + diff >= (int)dict->slow_warn_msecs) { e_warning(dict->conn.conn.event, "dict iteration took %s: %s", dict_warnings_sec(cmd, diff, extra_args), cmd->query); @@ -1350,7 +1350,7 @@ client_dict_transaction_commit_callback(struct client_dict_cmd *cmd, result.error = t_strdup_printf("%s (reply took %s)", result.error, dict_warnings_sec(cmd, diff, extra_args)); } else if (!cmd->background && !cmd->trans->ctx.set.no_slowness_warning && - diff >= (int)dict->warn_slow_msecs) { + diff >= (int)dict->slow_warn_msecs) { e_warning(dict->conn.conn.event, "dict commit took %s: " "%s (%u commands, first: %s)", dict_warnings_sec(cmd, diff, extra_args), -- 2.47.3