stop looking for config files once we've found one

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

diff --git a/geni/util/config.py b/geni/util/config.py
index 8d1a003..a45bb68 100644 (file)
--- a/geni/util/config.py
+++ b/geni/util/config.py
@@ -16,13 +16,10 @@
 
 import os
 import sys
+from geni.util.debug import log
+import traceback
 
-# If we have been checked out into a directory at the same
-# level as myplc, where plc_config.py lives. If we are in a
-# MyPLC environment, plc_config.py has already been installed
-# in site-packages.
-myplc = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + \
-        os.sep + "myplc"
+geni =  os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))+ os.sep + "geni"
 
 class Config:
     """
@@ -30,20 +27,22 @@ class Config:
     fast but no type conversions.
     """
 
-    def __init__(self, file = "/usr/share/geniwrapper/util/geni_config"):
+    def __init__(self, file = "/etc/geni/geni_config"):
         # Load plc_config
 
         loaded = False
         path = os.path.dirname(os.path.abspath(__file__))
         filename = file.split(os.sep)[-1]
-        alt_file = path + os.sep + filename
-        myplc_file = myplc + os.sep + filename
-        files = [file, alt_file, myplc_file]
+        alt_file = path + os.sep + 'util' + os.sep + filename
+        geni_file = geni + os.sep + 'util' + os.sep + filename
+        files = [file, alt_file, geni_file]
 
         for file in files:
-            try: 
+            try:
                 execfile(file, self.__dict__)
                 loaded = True
+                self.config_file = file
+                break
             except:
                 pass