From 50dd740667c84f08512a48037c5461696894dedc Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 17 Sep 2009 22:23:39 +0000 Subject: Remove check for soft limit being less than 97% of the hard limit, as some users want to set them equal to ensure that no files are ever deleted by housekeeping. --- bin/bbstoreaccounts/bbstoreaccounts.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'bin/bbstoreaccounts/bbstoreaccounts.cpp') diff --git a/bin/bbstoreaccounts/bbstoreaccounts.cpp b/bin/bbstoreaccounts/bbstoreaccounts.cpp index e377b661..a9d2b0af 100644 --- a/bin/bbstoreaccounts/bbstoreaccounts.cpp +++ b/bin/bbstoreaccounts/bbstoreaccounts.cpp @@ -45,16 +45,17 @@ bool sMachineReadableOutput = false; void CheckSoftHardLimits(int64_t SoftLimit, int64_t HardLimit) { - if(SoftLimit >= HardLimit) + if(SoftLimit > HardLimit) { BOX_FATAL("Soft limit must be less than the hard limit."); exit(1); } if(SoftLimit > ((HardLimit * MAX_SOFT_LIMIT_SIZE) / 100)) { - BOX_FATAL("Soft limit must be no more than " << - MAX_SOFT_LIMIT_SIZE << "% of the hard limit."); - exit(1); + BOX_WARNING("We recommend setting the soft limit below " << + MAX_SOFT_LIMIT_SIZE << "% of the hard limit, or " << + HumanReadableSize((HardLimit * MAX_SOFT_LIMIT_SIZE) + / 100) << " in this case."); } } -- cgit v1.2.3