[tor-commits] [arm/master] Dropping optional total prepopulation state file

[sebastian at torproject.org]

commit 4f3f7cfd957bc55f956e21e8af82888a24ec7ff4
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Apr 23 20:30:41 2011 -0700

    Dropping optional total prepopulation state file
    
    The total value provided by the 'features.graph.bw.prepopulateTotal' config
    option was confusing, pointless, and conflicted with the new functionality we
    have to fetch the true totals from Tor.
---
 src/interface/graphing/bandwidthStats.py |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/src/interface/graphing/bandwidthStats.py b/src/interface/graphing/bandwidthStats.py
index 3f34e3c..70a1e16 100644
--- a/src/interface/graphing/bandwidthStats.py
+++ b/src/interface/graphing/bandwidthStats.py
@@ -20,8 +20,7 @@ ACCOUNTING_ARGS = ("status", "resetTime", "read", "written", "readLimit", "writt
 PREPOPULATE_SUCCESS_MSG = "Read the last day of bandwidth history from the state file"
 PREPOPULATE_FAILURE_MSG = "Unable to prepopulate bandwidth information (%s)"
 
-DEFAULT_CONFIG = {"features.graph.bw.prepopulateTotal": False,
-                  "features.graph.bw.transferInBytes": False,
+DEFAULT_CONFIG = {"features.graph.bw.transferInBytes": False,
                   "features.graph.bw.accounting.show": True,
                   "features.graph.bw.accounting.rate": 10,
                   "features.graph.bw.accounting.isTimeLong": False,
@@ -347,10 +346,6 @@ class BandwidthStats(graphPanel.GraphStats):
   
   def _getTotalLabel(self, isPrimary):
     total = self.primaryTotal if isPrimary else self.secondaryTotal
-    
-    if self._config["features.graph.bw.prepopulateTotal"]:
-      total += self.prepopulatePrimaryTotal if isPrimary else self.prepopulateSecondaryTotal
-    
     return "total: %s" % uiTools.getSizeLabel(total * 1024, 1)
   
   def _updateAccountingInfo(self):