begin to switch to configparser

To not have unwanted environment influence
This commit is contained in:
Nico Schottelius 2019-12-08 12:59:18 +01:00
commit 6d0ce65f5c
2 changed files with 46 additions and 11 deletions

View file

@ -4,14 +4,46 @@ from ucloud.common.host import HostPool
from ucloud.common.request import RequestPool
from ucloud.common.vm import VmPool
from ucloud.common.storage_handlers import FileSystemBasedImageStorageHandler, CEPHBasedImageStorageHandler
from decouple import Config, RepositoryEnv, RepositoryEmpty
# Replacing decouple inline
import configparser
import os
import os.path
import logging
log = logging.getLogger("ucloud.config")
conf_name = "ucloud.conf"
try:
conf_dir = os.environ["UCLOUD_CONF_DIR"]
except KeyError:
conf_dir = "/etc/ucloud"
config_file = os.path.join(conf_dir, conf_name)
config = configparser.ConfigParser()
try:
with open(config_file, "r") as conf_fd:
conf.read(conf_fd)
except FileNotFoundError:
log.warn("Configuration file not found - using defaults")
# Compatibility to old code
env_vars = config
# Try importing config, but don't fail if it does not exist
try:
env_vars = Config(RepositoryEnv('/etc/ucloud/ucloud.conf'))
except FileNotFoundError:
env_vars = Config(RepositoryEmpty())
# try:
# env_vars = Config(RepositoryEnv('/etc/ucloud/ucloud.conf'))
# except FileNotFoundError:
# env_vars = Config(RepositoryEmpty())
etcd_wrapper_args = ()