lib-storage: Add functions to get log prefixes

This changes the log prefixes to be stored even when
MAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT is used.

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 94189899c4c55d77027c02fcb69b0a1e49831b7e..a19ac845c83e6eb78bea877e7cbd21d5454c2061 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -885,6 +885,13 @@ mail_storage_service_var_expand(struct mail_storage_service_ctx *ctx,
                   func_table, user, error_r);
 }
 
+const char *
+mail_storage_service_user_get_log_prefix(struct mail_storage_service_user *user)
+{
+       i_assert(user->log_prefix != NULL);
+       return user->log_prefix;
+}
+
 static void
 mail_storage_service_init_log(struct mail_storage_service_ctx *ctx,
                              struct mail_storage_service_user *user,
@@ -892,7 +899,6 @@ mail_storage_service_init_log(struct mail_storage_service_ctx *ctx,
 {
        const char *error;
 
-       ctx->log_initialized = TRUE;
        T_BEGIN {
                string_t *str;
 
@@ -902,7 +908,10 @@ mail_storage_service_init_log(struct mail_storage_service_ctx *ctx,
                        user, &user->input, priv, &error);
                user->log_prefix = p_strdup(user->pool, str_c(str));
        } T_END;
+       if ((user->flags & MAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT) != 0)
+               return;
 
+       ctx->log_initialized = TRUE;
        master_service_init_log_with_prefix(ctx->service, user->log_prefix);
        /* replace the whole log prefix with mail_log_prefix */
        event_replace_log_prefix(user->event, user->log_prefix);
@@ -990,17 +999,17 @@ mail_storage_service_init(struct master_service *service,
                       sizeof(*ctx->set_roots) * count);
        }
 
+       /* note: we may not have read any settings yet, so this logging
+          may still be going to wrong location */
+       const char *configured_name =
+               master_service_get_configured_name(service);
+       ctx->default_log_prefix =
+               p_strdup_printf(pool, "%s(%s): ", configured_name, my_pid);
+
        /* do all the global initialization. delay initializing plugins until
           we drop privileges the first time. */
-       if ((flags & MAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT) == 0) {
-               /* note: we may not have read any settings yet, so this logging
-                  may still be going to wrong location */
-               const char *configured_name =
-                       master_service_get_configured_name(service);
-               ctx->default_log_prefix = p_strdup_printf(pool,
-                       "%s(%s): ", configured_name, my_pid);
+       if ((flags & MAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT) == 0)
                master_service_init_log_with_prefix(service, ctx->default_log_prefix);
-       }
        dict_drivers_register_builtin();
        if (storage_service_global == NULL)
                storage_service_global = ctx;
@@ -1265,11 +1274,9 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx,
            !ctx->log_initialized) {
                /* initialize logging again, in case we only read the
                   settings for the first above */
-               const char *configured_name =
-                       master_service_get_configured_name(ctx->service);
                ctx->log_initialized = TRUE;
                master_service_init_log_with_prefix(ctx->service,
-                       t_strdup_printf("%s(%s): ", configured_name, my_pid));
+                                                   ctx->default_log_prefix);
                update_log_prefix = TRUE;
        }
        sets = master_service_settings_parser_get_others(master_service,
@@ -1504,8 +1511,7 @@ mail_storage_service_next_real(struct mail_storage_service_ctx *ctx,
                set_keyval(ctx, user, "mail_home", priv.home);
        }
 
-       if ((user->flags & MAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT) == 0)
-               mail_storage_service_init_log(ctx, user, &priv);
+       mail_storage_service_init_log(ctx, user, &priv);
 
        /* create ioloop context regardless of logging. it's also used by
           stats plugin. */
@@ -1796,3 +1802,9 @@ int mail_storage_service_user_set_setting(struct mail_storage_service_user *user
        *error_r = settings_parser_get_error(user->set_parser);
        return ret;
 }
+
+const char *
+mail_storage_service_get_log_prefix(struct mail_storage_service_ctx *ctx)
+{
+       return ctx->default_log_prefix;
+}

diff --git a/src/lib-storage/mail-storage-service.h b/src/lib-storage/mail-storage-service.h
index f3a18c92265ef1f93fd3d07c59c69b9c85d74c6a..042a7bbb444c7b8415a60736a4466533f4b494c9 100644 (file)
--- a/src/lib-storage/mail-storage-service.h
+++ b/src/lib-storage/mail-storage-service.h
@@ -162,7 +162,11 @@ mail_storage_service_user_get_settings_parser(struct mail_storage_service_user *
 struct mail_storage_service_ctx *
 mail_storage_service_user_get_service_ctx(struct mail_storage_service_user *user);
 pool_t mail_storage_service_user_get_pool(struct mail_storage_service_user *user);
+const char *
+mail_storage_service_user_get_log_prefix(struct mail_storage_service_user *user);
 
+const char *
+mail_storage_service_get_log_prefix(struct mail_storage_service_ctx *ctx);
 const struct var_expand_table *
 mail_storage_service_get_var_expand_table(struct mail_storage_service_ctx *ctx,
                                          struct mail_storage_service_input *input);