global: Make process_shutdown_filter specific to imap/pop3/submission

diff --git a/src/imap/imap-settings.c b/src/imap/imap-settings.c
index b20cfbf456d773802a9e49ac86b69e9ab0e0a2c5..aa0cd747cbba12149ca5716848fcda74898331b0 100644 (file)
--- a/src/imap/imap-settings.c
+++ b/src/imap/imap-settings.c
@@ -172,6 +172,9 @@ static const struct setting_keyvalue imap_default_settings_keyvalue[] = {
        { "service/imap/imap_capability/LITERAL+", "yes" },
        { "service/imap/imap_capability/LITERAL-", "yes" },
        { "service/imap/imap_capability/UTF8=ACCEPT", "yes" },
+#ifdef DOVECOT_PRO_EDITION
+       { "service/imap/process_shutdown_filter", "event=mail_user_session_finished AND rss > 20MB" },
+#endif
        { "imap_id_send/name", DOVECOT_NAME },
        { NULL, NULL },
 };

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index cdcdd397a1c885aa4b631a9c35830e0afb57e43c..399d753ad75aee2a828612ee9265d70d57a023fc 100644 (file)
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -70,11 +70,7 @@ static const struct master_service_settings master_service_default_settings = {
        .log_timestamp = DEFAULT_FAILURE_STAMP_FORMAT,
        .log_debug = "",
        .log_core_filter = "",
-#ifdef DOVECOT_PRO_EDITION
-       .process_shutdown_filter = "event=mail_user_session_finished AND rss > 20MB",
-#else
        .process_shutdown_filter = "",
-#endif
        .syslog_facility = "mail",
        .import_environment = ARRAY_INIT,
        .stats_writer_socket_path = "stats-writer",

diff --git a/src/pop3/pop3-settings.c b/src/pop3/pop3-settings.c
index 8cf3921e761da0c4cc348f66b25807a43637899d..3dc5f09fda7e675b9418ae44d7e55d0e1f08613d 100644 (file)
--- a/src/pop3/pop3-settings.c
+++ b/src/pop3/pop3-settings.c
@@ -98,11 +98,19 @@ static const struct pop3_settings pop3_default_settings = {
        .pop3_delete_type = "default:expunge:flag"
 };
 
+static const struct setting_keyvalue pop3_default_settings_keyvalue[] = {
+#ifdef DOVECOT_PRO_EDITION
+       { "service/pop3/process_shutdown_filter", "event=mail_user_session_finished AND rss > 20MB" },
+#endif
+       { NULL, NULL },
+};
+
 const struct setting_parser_info pop3_setting_parser_info = {
        .name = "pop3",
 
        .defines = pop3_setting_defines,
        .defaults = &pop3_default_settings,
+       .default_settings = pop3_default_settings_keyvalue,
 
        .struct_size = sizeof(struct pop3_settings),
        .pool_offset1 = 1 + offsetof(struct pop3_settings, pool),

diff --git a/src/submission/submission-settings.c b/src/submission/submission-settings.c
index 6176025a92f5c6a94cee46b7183f733221933ab8..6f3d979a596df242d62f61236a78f58cb186afb6 100644 (file)
--- a/src/submission/submission-settings.c
+++ b/src/submission/submission-settings.c
@@ -142,11 +142,19 @@ static const struct submission_settings submission_default_settings = {
        .imap_urlauth_port = 143,
 };
 
+static const struct setting_keyvalue submission_default_settings_keyvalue[] = {
+#ifdef DOVECOT_PRO_EDITION
+       { "service/submission/process_shutdown_filter", "event=mail_user_session_finished AND rss > 20MB" },
+#endif
+       { NULL, NULL },
+};
+
 const struct setting_parser_info submission_setting_parser_info = {
        .name = "submission",
 
        .defines = submission_setting_defines,
        .defaults = &submission_default_settings,
+       .default_settings = submission_default_settings_keyvalue,
 
        .struct_size = sizeof(struct submission_settings),
        .pool_offset1 = 1 + offsetof(struct submission_settings, pool),