lib-storage: Remove mail_user and mail_storage_service_user events' "service" field

There is already "service:<name>" category added to all events so this is
duplication.

If it's later on decided to be useful after all, it should be added
automatically to all events. Probably by creating the root event in
lib-master.

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index a2193e4a8283f7be3c84bc7f8f51625a8b0a9f0e..7ffa21145a95b84b860611c932a5ba19aeeb97c6 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1333,7 +1333,6 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx,
                               user->service_ctx->debug || (flags & MAIL_STORAGE_SERVICE_FLAG_DEBUG) != 0);
        event_add_fields(user->event, (const struct event_add_field []){
                { .key = "user", .value = user->input.username },
-               { .key = "service", .value = ctx->service->name },
                { .key = "session", .value = user->input.session_id },
                { .key = NULL }
        });

diff --git a/src/lib-storage/mail-user.c b/src/lib-storage/mail-user.c
index 15f7b1cb0cc49dd60f015d1d6890b5183a27e3a6..64d474519a3a820d6e50c8a2eb6ca04c2ac4eff0 100644 (file)
--- a/src/lib-storage/mail-user.c
+++ b/src/lib-storage/mail-user.c
@@ -263,8 +263,6 @@ void mail_user_set_vars(struct mail_user *user, const char *service,
        i_assert(service != NULL);
 
        user->service = p_strdup(user->pool, service);
-       event_add_str(user->event, "service", service);
-
        mail_user_connection_init_from(&user->conn, user->pool, conn);
 }