From e0d24a2312c7b6a1a0487e6b478bc4a68afda635 Mon Sep 17 00:00:00 2001
From: Josef 'Jeff' Sipek <jeff.sipek@open-xchange.com>
Date: Wed, 13 Nov 2019 15:17:18 -0500
Subject: [PATCH] global: Remove sieve_ event field prefixes
---
src/lib-sieve/cmd-redirect.c | 2 +-
src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c | 2 +-
src/lib-sieve/plugins/notify/cmd-notify.c | 2 +-
src/lib-sieve/plugins/vnd.dovecot/report/cmd-report.c | 4 ++--
src/lib-sieve/sieve-actions.c | 4 ++--
src/lib-sieve/sieve-interpreter.c | 6 +++---
src/lib-sieve/sieve-result.c | 5 ++---
src/lib-sieve/sieve-script.c | 10 +++++-----
src/lib-sieve/sieve-storage.c | 7 +++----
src/managesieve/cmd-putscript.c | 6 +++---
src/managesieve/cmd-setactive.c | 7 +++----
src/plugins/sieve-extprograms/cmd-pipe.c | 2 +-
12 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/src/lib-sieve/cmd-redirect.c b/src/lib-sieve/cmd-redirect.c
index efe504086..641cbd44c 100644
--- a/src/lib-sieve/cmd-redirect.c
+++ b/src/lib-sieve/cmd-redirect.c
@@ -588,7 +588,7 @@ act_redirect_commit(const struct sieve_action_exec_env *aenv,
struct event_passthrough *e =
sieve_action_create_finish_event(aenv)->
- add_str("sieve_redirect_target",
+ add_str("redirect_target",
smtp_address_encode(ctx->to_address));
sieve_result_event_log(aenv, e->event(),
diff --git a/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c b/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c
index 17648a0aa..5bfa40b60 100644
--- a/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c
+++ b/src/lib-sieve/plugins/enotify/mailto/ntfy-mailto.c
@@ -720,7 +720,7 @@ static int ntfy_mailto_send
} else {
struct event_passthrough *e =
sieve_enotify_create_finish_event(nenv)->
- add_str("sieve_notify_target", str_c(all));
+ add_str("notify_target", str_c(all));
sieve_enotify_event_log(nenv, e->event(),
"sent mail notification to %s",
diff --git a/src/lib-sieve/plugins/notify/cmd-notify.c b/src/lib-sieve/plugins/notify/cmd-notify.c
index 7c820d634..708cf8c7c 100644
--- a/src/lib-sieve/plugins/notify/cmd-notify.c
+++ b/src/lib-sieve/plugins/notify/cmd-notify.c
@@ -837,7 +837,7 @@ act_notify_send(const struct sieve_action_exec_env *aenv,
} else {
struct event_passthrough *e =
sieve_action_create_finish_event(aenv)->
- add_str("sieve_notify_target", str_c(all));
+ add_str("notify_target", str_c(all));
sieve_result_event_log(aenv, e->event(),
"sent mail notification to %s",
diff --git a/src/lib-sieve/plugins/vnd.dovecot/report/cmd-report.c b/src/lib-sieve/plugins/vnd.dovecot/report/cmd-report.c
index e950307e6..d39ec50f4 100644
--- a/src/lib-sieve/plugins/vnd.dovecot/report/cmd-report.c
+++ b/src/lib-sieve/plugins/vnd.dovecot/report/cmd-report.c
@@ -655,9 +655,9 @@ act_report_send(const struct sieve_action_exec_env *aenv,
struct event_passthrough *e =
sieve_action_create_finish_event(aenv)->
- add_str("sieve_report_target",
+ add_str("report_target",
smtp_address_encode(act->to_address))->
- add_str("sieve_report_type",
+ add_str("report_type",
str_sanitize(act->feedback_type, 32));
sieve_result_event_log(aenv, e->event(),
diff --git a/src/lib-sieve/sieve-actions.c b/src/lib-sieve/sieve-actions.c
index 0b8fae354..629e70e29 100644
--- a/src/lib-sieve/sieve-actions.c
+++ b/src/lib-sieve/sieve-actions.c
@@ -726,8 +726,8 @@ act_store_log_status(struct act_store_transaction *trans,
} else {
struct event_passthrough *e =
sieve_action_create_finish_event(aenv)->
- add_str("sieve_fileinto_mailbox_name", mailbox_name)->
- add_str("sieve_fileinto_mailbox", mailbox_identifier);
+ add_str("fileinto_mailbox_name", mailbox_name)->
+ add_str("fileinto_mailbox", mailbox_identifier);
sieve_result_event_log(aenv, e->event(),
"stored mail into mailbox %s",
mailbox_identifier);
diff --git a/src/lib-sieve/sieve-interpreter.c b/src/lib-sieve/sieve-interpreter.c
index 29f6dc6e0..2d293ff87 100644
--- a/src/lib-sieve/sieve-interpreter.c
+++ b/src/lib-sieve/sieve-interpreter.c
@@ -130,11 +130,11 @@ _sieve_interpreter_create(struct sieve_binary *sbin,
interp->runenv.event = event_create(eenv->event);
event_add_category(interp->runenv.event, &event_category_sieve_runtime);
- event_add_str(interp->runenv.event, "sieve_script_name",
+ event_add_str(interp->runenv.event, "script_name",
sieve_binary_script_name(sbin));
- event_add_str(interp->runenv.event, "sieve_script_location",
+ event_add_str(interp->runenv.event, "script_location",
sieve_binary_script_location(sbin));
- event_add_str(interp->runenv.event, "sieve_binary_path",
+ event_add_str(interp->runenv.event, "binary_path",
sieve_binary_path(sbin));
svinst = sieve_binary_svinst(sbin);
diff --git a/src/lib-sieve/sieve-result.c b/src/lib-sieve/sieve-result.c
index 9a90d903b..c88eaae4f 100644
--- a/src/lib-sieve/sieve-result.c
+++ b/src/lib-sieve/sieve-result.c
@@ -260,9 +260,8 @@ sieve_result_init_action_event(struct sieve_result *result,
event_set_append_log_prefix(
action->event, t_strconcat(name, " action: ", NULL));
}
- event_add_str(action->event, "sieve_action_name", name);
- event_add_str(action->event, "sieve_action_script_location",
- action->location);
+ event_add_str(action->event, "action_name", name);
+ event_add_str(action->event, "script_location", action->location);
}
void sieve_result_add_implicit_side_effect(
diff --git a/src/lib-sieve/sieve-script.c b/src/lib-sieve/sieve-script.c
index 4794df765..dd237a3f6 100644
--- a/src/lib-sieve/sieve-script.c
+++ b/src/lib-sieve/sieve-script.c
@@ -100,8 +100,8 @@ void sieve_script_init(struct sieve_script *script,
script->name = p_strdup(script->pool, name);
script->event = event_create(storage->event);
- event_add_str(script->event, "sieve_script_name", name);
- event_add_str(script->event, "sieve_script_location", location);
+ event_add_str(script->event, "script_name", name);
+ event_add_str(script->event, "script_location", location);
if (name == NULL)
event_set_append_log_prefix(script->event, "script: ");
else {
@@ -206,7 +206,7 @@ int sieve_script_open_as(struct sieve_script *script, const char *name,
/* override name */
script->name = p_strdup(script->pool, name);
- event_add_str(script->event, "sieve_script_name", name);
+ event_add_str(script->event, "script_name", name);
return 0;
}
@@ -653,13 +653,13 @@ int sieve_script_rename(struct sieve_script *script, const char *newname)
if (ret >= 0) {
struct event_passthrough *e =
event_create_passthrough(script->event)->
- add_str("sieve_script_new_name", newname)->
+ add_str("script_new_name", newname)->
set_name("sieve_script_renamed");
e_debug(e->event(), "Script renamed to `%s'", newname);
} else {
struct event_passthrough *e =
event_create_passthrough(script->event)->
- add_str("sieve_script_new_name", newname)->
+ add_str("script_new_name", newname)->
add_str("error", storage->error)->
set_name("sieve_script_renamed");
e_debug(e->event(), "Failed to rename script: %s",
diff --git a/src/lib-sieve/sieve-storage.c b/src/lib-sieve/sieve-storage.c
index 5093e7059..df80ed9d8 100644
--- a/src/lib-sieve/sieve-storage.c
+++ b/src/lib-sieve/sieve-storage.c
@@ -259,8 +259,7 @@ sieve_storage_event_create(struct sieve_instance *svinst,
event = event_create(svinst->event);
event_add_category(event, &event_category_sieve_storage);
- event_add_str(event, "sieve_storage_driver",
- storage_class->driver_name);
+ event_add_str(event, "driver", storage_class->driver_name);
event_set_append_log_prefix(
event, t_strdup_printf("%s storage: ",
storage_class->driver_name));
@@ -345,7 +344,7 @@ sieve_storage_init(struct sieve_instance *svinst,
} else {
storage->location = p_strdup(storage->pool, location);
- event_add_str(event, "sieve_storage_location",
+ event_add_str(event, "script_location",
storage->location);
if (storage_class->v.init(storage, options,
@@ -1087,7 +1086,7 @@ sieve_storage_save_create_event(struct sieve_storage *storage,
struct event *event;
event = event_create(storage->event);
- event_add_str(event, "sieve_script_name", scriptname);
+ event_add_str(event, "script_name", scriptname);
if (scriptname == NULL) {
event_set_append_log_prefix(event, "save: ");
} else {
diff --git a/src/managesieve/cmd-putscript.c b/src/managesieve/cmd-putscript.c
index 62b8371bb..f1d3b4e3e 100644
--- a/src/managesieve/cmd-putscript.c
+++ b/src/managesieve/cmd-putscript.c
@@ -213,9 +213,9 @@ cmd_putscript_finish_script(struct cmd_putscript_context *ctx,
struct event_passthrough *e =
client_command_create_finish_event(cmd)->
add_str("error", "Compilation failed")->
- add_int("sieve_compile_errors",
+ add_int("compile_errors",
sieve_get_errors(ehandler))->
- add_int("sieve_compile_warnings",
+ add_int("compile_warnings",
sieve_get_warnings(ehandler));
e_debug(e->event(), "Failed to %s: "
"Compilation failed (%u errors, %u warnings)",
@@ -256,7 +256,7 @@ cmd_putscript_finish_script(struct cmd_putscript_context *ctx,
struct event_passthrough *e =
client_command_create_finish_event(cmd)->
- add_int("sieve_compile_warnings",
+ add_int("compile_warnings",
sieve_get_warnings(ehandler));
if (ctx->scriptname != NULL) {
e_debug(e->event(), "Stored script `%s' successfully "
diff --git a/src/managesieve/cmd-setactive.c b/src/managesieve/cmd-setactive.c
index 72012bf87..07844c5e3 100644
--- a/src/managesieve/cmd-setactive.c
+++ b/src/managesieve/cmd-setactive.c
@@ -81,8 +81,7 @@ cmd_setactive_activate(struct client_command_context *cmd,
} else {
struct event_passthrough *e =
client_command_create_finish_event(cmd)->
- add_int("sieve_compile_warnings",
- warning_count);
+ add_int("compile_warnings", warning_count);
e_debug(e->event(), "Activated script `%s' "
" (%u warnings%s)",
scriptname, warning_count,
@@ -103,8 +102,8 @@ cmd_setactive_activate(struct client_command_context *cmd,
struct event_passthrough *e =
client_command_create_finish_event(cmd)->
add_str("error", "Compilation failed")->
- add_int("sieve_compile_errors", error_count)->
- add_int("sieve_compile_warnings", warning_count);
+ add_int("compile_errors", error_count)->
+ add_int("compile_warnings", warning_count);
e_debug(e->event(), "Failed to activate script `%s': "
"Compilation failed (%u errors, %u warnings)",
scriptname, error_count, warning_count);
diff --git a/src/plugins/sieve-extprograms/cmd-pipe.c b/src/plugins/sieve-extprograms/cmd-pipe.c
index 0adbef897..1dbdcce35 100644
--- a/src/plugins/sieve-extprograms/cmd-pipe.c
+++ b/src/plugins/sieve-extprograms/cmd-pipe.c
@@ -362,7 +362,7 @@ act_pipe_commit(const struct sieve_action_exec_env *aenv,
if (ret > 0) {
struct event_passthrough *e =
sieve_action_create_finish_event(aenv)->
- add_str("sieve_pipe_program",
+ add_str("pipe_program",
str_sanitize(act->program_name, 256));
sieve_result_event_log(aenv, e->event(),
--
GitLab