Changeset 2560

Timestamp:

17/09/2009 23:23:39 (2 years ago)

Author:

chris

Message:

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.

File:

• box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp (modified) (2 diffs)

box/trunk/bin/bbstoreaccounts/bbstoreaccounts.cpp

@@ -46 +46 @@
 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.");
@@ -53 +53 @@
         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.");
         }
 }