[Box Backup-commit] COMMIT r2560 - box/trunk/bin/bbstoreaccounts

[subversion at boxbackup.org]

Author: chris
Date: 2009-09-17 23:23:39 +0100 (Thu, 17 Sep 2009)
New Revision: 2560

Modified:
   box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp
Log:
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.


Modified: box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp
===================================================================
--- box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp	2009-09-15 00:46:59 UTC (rev 2559)
+++ box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp	2009-09-17 22:23:39 UTC (rev 2560)
@@ -45,16 +45,17 @@
 
 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.");
 	}
 }