projects
/
osm
/
MON.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 1976: MON fails to collect disk metrics fixed
[osm/MON.git]
/
osm_mon
/
core
/
config.py
diff --git
a/osm_mon/core/config.py
b/osm_mon/core/config.py
index
c4c3972
..
815e66e
100644
(file)
--- a/
osm_mon/core/config.py
+++ b/
osm_mon/core/config.py
@@
-33,14
+33,14
@@
logger = logging.getLogger(__name__)
class Config:
class Config:
- def __init__(self, config_file: str =
''
):
+ def __init__(self, config_file: str =
""
):
self.conf = {}
self._read_config_file(config_file)
self._read_env()
def _read_config_file(self, config_file):
if not config_file:
self.conf = {}
self._read_config_file(config_file)
self._read_env()
def _read_config_file(self, config_file):
if not config_file:
- path =
'mon.yaml'
+ path =
"mon.yaml"
config_file = pkg_resources.resource_filename(__name__, path)
with open(config_file) as f:
self.conf = yaml.load(f)
config_file = pkg_resources.resource_filename(__name__, path)
with open(config_file) as f:
self.conf = yaml.load(f)
@@
-48,7
+48,7
@@
class Config:
def get(self, section, field=None):
if not field:
return self.conf[section]
def get(self, section, field=None):
if not field:
return self.conf[section]
- return self.conf[section]
[field]
+ return self.conf[section]
.get(field)
def set(self, section, field, value):
if section not in self.conf:
def set(self, section, field, value):
if section not in self.conf:
@@
-63,10
+63,12
@@
class Config:
if len(elements) < 3:
logger.warning(
"Environment variable %s=%s does not comply with required format. Section and/or field missing.",
if len(elements) < 3:
logger.warning(
"Environment variable %s=%s does not comply with required format. Section and/or field missing.",
- env, os.getenv(env))
+ env,
+ os.getenv(env),
+ )
continue
section = elements[1]
continue
section = elements[1]
- field =
'_'
.join(elements[2:])
+ field =
"_"
.join(elements[2:])
value = os.getenv(env)
if section not in self.conf:
self.conf[section] = {}
value = os.getenv(env)
if section not in self.conf:
self.conf[section] = {}