* tried to put some sense in the way things get logged, at least on server-side for now

[sfa.git] / sfa / util / config.py

diff --git a/sfa/util/config.py b/sfa/util/config.py
index aec8556..a3fe098 100644 (file)
--- a/sfa/util/config.py
+++ b/sfa/util/config.py
@@ -20,8 +20,6 @@
 import os.path
 import traceback
 
-from sfa.util.debug import log
-
 class Config:
     """
     Parse the bash/Python/PHP version of the configuration file. Very
@@ -94,9 +92,9 @@ class Config:
 
         return (aggr_mgr_ip,aggr_mgr_port)
 
-    def get_aggregate_rspec_type(self):
-        if (hasattr(self,'SFA_AGGREGATE_RSPEC_TYPE')):
-            return self.SFA_AGGREGATE_RSPEC_TYPE
+    def get_aggregate_type(self):
+        if (hasattr(self,'SFA_AGGREGATE_TYPE')):
+            return self.SFA_AGGREGATE_TYPE
         else:
             return "pl"