From ca39c2c2276640c8348daebe970ee961d603a2aa Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Tue, 17 Jan 2017 16:28:10 +0200 Subject: [PATCH] stats plugin: Fix /proc/self/io fd leak on plugin deinit This could have been a problem with doveadm-server processes if they had service_count>1, because doveadm unloads all plugins between commands. --- src/plugins/stats/mail-stats-fill.c | 6 ++++++ src/plugins/stats/mail-stats.h | 2 ++ src/plugins/stats/stats-plugin.c | 1 + 3 files changed, 9 insertions(+) diff --git a/src/plugins/stats/mail-stats-fill.c b/src/plugins/stats/mail-stats-fill.c index 07561a9b89..d706450d34 100644 --- a/src/plugins/stats/mail-stats-fill.c +++ b/src/plugins/stats/mail-stats-fill.c @@ -141,3 +141,9 @@ void mail_stats_fill(struct stats_user *suser, struct mail_stats *stats_r) process_read_io_stats(stats_r); user_trans_stats_get(suser, stats_r); } + +void mail_stats_fill_global_deinit(void) +{ + if (proc_io_fd != -1) + i_close_fd(&proc_io_fd); +} diff --git a/src/plugins/stats/mail-stats.h b/src/plugins/stats/mail-stats.h index 0663dae069..fc536325e0 100644 --- a/src/plugins/stats/mail-stats.h +++ b/src/plugins/stats/mail-stats.h @@ -35,4 +35,6 @@ void mail_stats_fill(struct stats_user *suser, struct mail_stats *mail_stats); void mail_stats_add_transaction(struct mail_stats *stats, const struct mailbox_transaction_stats *trans_stats); +void mail_stats_fill_global_deinit(void); + #endif diff --git a/src/plugins/stats/stats-plugin.c b/src/plugins/stats/stats-plugin.c index 62a953afb7..c99ded624e 100644 --- a/src/plugins/stats/stats-plugin.c +++ b/src/plugins/stats/stats-plugin.c @@ -470,6 +470,7 @@ void stats_plugin_deinit(void) { if (global_stats_conn != NULL) stats_connection_unref(&global_stats_conn); + mail_stats_fill_global_deinit(); mail_storage_hooks_remove(&stats_mail_storage_hooks); stats_unregister(&mail_stats_item); }