From b8a4aab1f117f6760184ad50b1af41ba810b51f9 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sun, 31 Mar 2013 19:02:32 +0300 Subject: [PATCH] quota: Added more debug logs about quota_grace --- src/plugins/quota/quota-private.h | 1 + src/plugins/quota/quota.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/plugins/quota/quota-private.h b/src/plugins/quota/quota-private.h index 1f21990311..ba73d5380d 100644 --- a/src/plugins/quota/quota-private.h +++ b/src/plugins/quota/quota-private.h @@ -26,6 +26,7 @@ struct quota_settings { const char *quota_exceeded_msg; unsigned int debug:1; + unsigned int initialized:1; }; struct quota_rule { diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c index 39e52131af..656f412e29 100644 --- a/src/plugins/quota/quota.c +++ b/src/plugins/quota/quota.c @@ -227,6 +227,8 @@ int quota_user_read_settings(struct mail_user *user, pool_unref(&pool); return 0; } + + quota_set->initialized = TRUE; *set_r = quota_set; return 1; } @@ -454,6 +456,13 @@ void quota_root_recalculate_relative_rules(struct quota_root_settings *root_set, quota_rule_recalculate_relative_rules(&root_set->grace_rule, bytes_limit, 0); root_set->last_mail_max_extra_bytes = root_set->grace_rule.bytes_limit; + + if (root_set->set->debug && root_set->set->initialized) { + i_debug("Quota root %s: Recalculated relative rules with " + "bytes=%lld count=%lld. Now grace=%llu", root_set->name, + (long long)bytes_limit, (long long)count_limit, + (unsigned long long)root_set->last_mail_max_extra_bytes); + } } static int @@ -632,6 +641,12 @@ quota_root_parse_grace(struct mail_user *user, const char *root_name, quota_rule_recalculate_relative_rules(&root_set->grace_rule, root_set->default_rule.bytes_limit, 0); root_set->last_mail_max_extra_bytes = root_set->grace_rule.bytes_limit; + if (root_set->set->debug) { + i_debug("Quota grace: root=%s bytes=%lld%s", + root_set->name, (long long)root_set->grace_rule.bytes_limit, + root_set->grace_rule.bytes_percent == 0 ? "" : + t_strdup_printf(" (%u%%)", root_set->grace_rule.bytes_percent)); + } return 0; } -- 2.47.3