From: Timo Sirainen Date: Thu, 21 Nov 2019 13:21:13 +0000 (+0200) Subject: lib-storage: Remove mail_user and mail_storage_service_user events' "service" field X-Git-Tag: 2.3.9~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d58472d13fe717bd12d21e0cea78556e7fe38bbd;p=thirdparty%2Fdovecot%2Fcore.git lib-storage: Remove mail_user and mail_storage_service_user events' "service" field There is already "service:" 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 a2193e4a82..7ffa21145a 100644 --- 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 15f7b1cb0c..64d474519a 100644 --- 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); }