Mercurial > dovecot > core-2.2
changeset 21418:31c324df23f0
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.
| author | Timo Sirainen <timo.sirainen@dovecot.fi> |
|---|---|
| date | Tue, 17 Jan 2017 16:28:10 +0200 |
| parents | cb8d45426709 |
| children | 046af124f98d |
| files | src/plugins/stats/mail-stats-fill.c src/plugins/stats/mail-stats.h src/plugins/stats/stats-plugin.c |
| diffstat | 3 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/plugins/stats/mail-stats-fill.c Tue Jan 17 16:23:50 2017 +0200 +++ b/src/plugins/stats/mail-stats-fill.c Tue Jan 17 16:28:10 2017 +0200 @@ -141,3 +141,9 @@ 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); +}
--- a/src/plugins/stats/mail-stats.h Tue Jan 17 16:23:50 2017 +0200 +++ b/src/plugins/stats/mail-stats.h Tue Jan 17 16:28:10 2017 +0200 @@ -35,4 +35,6 @@ void mail_stats_add_transaction(struct mail_stats *stats, const struct mailbox_transaction_stats *trans_stats); +void mail_stats_fill_global_deinit(void); + #endif
--- a/src/plugins/stats/stats-plugin.c Tue Jan 17 16:23:50 2017 +0200 +++ b/src/plugins/stats/stats-plugin.c Tue Jan 17 16:28:10 2017 +0200 @@ -470,6 +470,7 @@ { 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); }