Remove system folders reference from python setup; remove exception from config loader;

Author: Dmitry Surnin

plenum/common/config_util.py

@@ -38,14 +38,12 @@ def extend_with_external_config(extendee: object, extender: Tuple[str, str], req
 
 
 def extend_with_default_external_config(extendee: object, user_config_dir: str = None) -> object:
-    extend_with_external_config(extendee,
-                                (extendee.GENERAL_CONFIG_DIR,
-                                 extendee.GENERAL_CONFIG_FILE),
-                                required=True)
+    extend_with_external_config(extendee, (extendee.GENERAL_CONFIG_DIR, extendee.GENERAL_CONFIG_FILE))
 
     # fail if network is not set
     if not extendee.NETWORK_NAME:
-        raise Exception('NETWORK_NAME must be set')
+        return
+        # raise Exception('NETWORK_NAME must be set')
 
     network_config_dir = os.path.join(extendee.GENERAL_CONFIG_DIR,
                                       extendee.NETWORK_NAME)

plenum/common/test_network_setup.py

@@ -166,7 +166,7 @@ def domain_ledger_file_name(cls, config, envName):
 
     @classmethod
     def setup_base_dir(cls, config):
-        baseDir = config.baseDir
+        baseDir = os.path.join(config.baseDir, config.NETWORK_NAME)
         if not os.path.exists(baseDir):
             os.makedirs(baseDir, exist_ok=True)
         return baseDir

plenum/config.py

@@ -26,10 +26,10 @@
 
 baseDir = '~/.plenum/'
 walletsDir = 'wallets'
-NODE_BASE_DATA_DIR = '/var/plenum'
+NODE_BASE_DATA_DIR = baseDir
 nodeDataDir = 'data/nodes'
 clientDataDir = 'data/clients'
-LOG_DIR = '/var/log/plenum/'
+LOG_DIR = os.path.join(baseDir, "log")
 GENERAL_CONFIG_DIR = '/etc/plenum/'
 # walletDir = 'wallet'
 

plenum/server/node.py

@@ -129,10 +129,10 @@ def __init__(self,
         self.created = time.time()
         self.name = name
         self.config = config or getConfig()
-        self.basedirpath = basedirpath or os.path.join(config.baseDir, config.NETWORK_NAME)
+        self.basedirpath = basedirpath or os.path.join(self.config.baseDir, self.config.NETWORK_NAME)
         self.dataDir = self.config.nodeDataDir or "data/nodes"
         self.base_data_dir = base_data_dir or os.path.join(self.config.NODE_BASE_DATA_DIR,
-                                                           config.NETWORK_NAME)
+                                                           self.config.NETWORK_NAME)
 
         self._view_change_timeout = self.config.VIEW_CHANGE_TIMEOUT
 

setup.py

@@ -31,12 +31,10 @@
 exec(compile(open(METADATA).read(), METADATA, 'exec'))
 
 BASE_DIR = os.path.join(os.path.expanduser("~"), ".plenum")
-BASE_DATA_DIR = '/var/plenum'
-LOG_DIR = '/var/log/plenum'
-GENERAL_CONFIG_DIR = '/etc/plenum'
-CONFIG_FILE = os.path.join(GENERAL_CONFIG_DIR, "plenum_config.py")
+LOG_DIR = os.path.join(BASE_DIR, "log")
+CONFIG_FILE = os.path.join(BASE_DIR, "plenum_config.py")
 
-for path in [BASE_DIR, BASE_DATA_DIR, LOG_DIR, GENERAL_CONFIG_DIR]:
+for path in [BASE_DIR, LOG_DIR]:
     if not os.path.exists(path):
         os.makedirs(path)
 
@@ -119,6 +117,4 @@ def changeOwnerAndGrpToLoggedInUser(directory, raiseEx=False):
 
 
 changeOwnerAndGrpToLoggedInUser(BASE_DIR)
-changeOwnerAndGrpToLoggedInUser(BASE_DATA_DIR)
 changeOwnerAndGrpToLoggedInUser(LOG_DIR)
-changeOwnerAndGrpToLoggedInUser(GENERAL_CONFIG_DIR)