changing references from WHITELIST_FILE to METRIC_FILTERS_FILE

Author: gwaldo

webapp/graphite/settings.py

@@ -39,7 +39,7 @@
 DASHBOARD_CONF = ''
 GRAPHTEMPLATES_CONF = ''
 STORAGE_DIR = ''
-WHITELIST_FILE = ''
+METRIC_FILTERS_FILE = ''
 INDEX_FILE = ''
 LOG_DIR = ''
 CERES_DIR = ''
@@ -162,8 +162,8 @@
 
 if not STORAGE_DIR:
   STORAGE_DIR = os.environ.get('GRAPHITE_STORAGE_DIR', join(GRAPHITE_ROOT, 'storage'))
-if not WHITELIST_FILE:
-  WHITELIST_FILE = join(STORAGE_DIR, 'lists', 'whitelist')
+if not METRIC_FILTERS_FILE:
+  METRIC_FILTERS_FILE = join(STORAGE_DIR, 'lists', 'allowed_metrics')
 if not INDEX_FILE:
   INDEX_FILE = join(STORAGE_DIR, 'index')
 if not LOG_DIR:

webapp/graphite/whitelist/views.py

@@ -41,21 +41,21 @@ def show(request):
   return HttpResponse(content_type="text/plain", content=members)
 
 def load_whitelist():
-  fh = open(settings.WHITELIST_FILE, 'rb')
+  fh = open(settings.METRIC_FILTERS_FILE, 'rb')
   whitelist = unpickle.load(fh)
   fh.close()
   return whitelist
 
 def save_whitelist(whitelist):
   serialized = pickle.dumps(whitelist, protocol=-1) #do this instead of dump() to raise potential exceptions before open()
-  tmpfile = '%s-%d' % (settings.WHITELIST_FILE, randint(0, 100000))
+  tmpfile = '%s-%d' % (settings.METRIC_FILTERS_FILE, randint(0, 100000))
   try:
     fh = open(tmpfile, 'wb')
     fh.write(serialized)
     fh.close()
-    if os.path.exists(settings.WHITELIST_FILE):
-      os.unlink(settings.WHITELIST_FILE)
-    os.rename(tmpfile, settings.WHITELIST_FILE)
+    if os.path.exists(settings.METRIC_FILTERS_FILE):
+      os.unlink(settings.METRIC_FILTERS_FILE)
+    os.rename(tmpfile, settings.METRIC_FILTERS_FILE)
   finally:
     if os.path.exists(tmpfile):
       os.unlink(tmpfile)