x/stackalytics
Code Issues Proposed changes

Use CONF for oslo_config's cfg.CONF

Browse Source 
In most OpenStack projects, the instance of oslo_config's cfg.CONF
is declared as CONF. This patch applies it for readability on whole
OpenStack components.

Change-Id: I7758a1ce86de8689fb2c5e420e042fa56c275927
This commit is contained in:
Ken'ichi Ohmichi
2017-03-13 14:25:51 -07:00
parent 99edaeaaec
commit efee90803d
8 changed files with 52 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
stackalytics/dashboard/decorators.py
View File

@@ -32,6 +32,7 @@ from stackalytics.processor import utils
from stackalytics import version as stackalytics_version
CONF = cfg.CONF
LOG = logging.getLogger(__name__)
@@ -498,7 +499,7 @@ def profiler_decorator(func):
@functools.wraps(func)
def profiler_decorated_function(*args, **kwargs):
profiler = None
profile_filename = cfg.CONF.collect_profiler_stats
profile_filename = CONF.collect_profiler_stats
if profile_filename:
LOG.debug('Profiler is enabled')

8
stackalytics/dashboard/parameters.py
View File

@@ -21,6 +21,8 @@ import time
from stackalytics.dashboard import vault
CONF = cfg.CONF
DEFAULTS = {
'review_nth': 5,
}
@@ -66,7 +68,7 @@ DEFAULT_STATIC_ACTIVITY_SIZE = 100
def get_default(param_name):
if 'release' not in DEFAULTS:
release = cfg.CONF.default_release
release = CONF.default_release
if not release:
runtime_storage_inst = vault.get_runtime_storage()
releases = runtime_storage_inst.get_by_key('releases')
@@ -80,8 +82,8 @@ def get_default(param_name):
else:
release = 'all'
DEFAULTS['release'] = release.lower()
DEFAULTS['metric'] = cfg.CONF.default_metric.lower()
DEFAULTS['project_type'] = cfg.CONF.default_project_type.lower()
DEFAULTS['metric'] = CONF.default_metric.lower()
DEFAULTS['project_type'] = CONF.default_project_type.lower()
if param_name in DEFAULTS:
return DEFAULTS[param_name]

5
stackalytics/dashboard/vault.py
View File

@@ -28,6 +28,7 @@ from stackalytics.processor import user_processor
from stackalytics.processor import utils
CONF = cfg.CONF
LOG = logging.getLogger(__name__)
@@ -79,7 +80,7 @@ def get_vault():
try:
vault = {}
runtime_storage_inst = runtime_storage.get_runtime_storage(
cfg.CONF.runtime_storage_uri)
CONF.runtime_storage_uri)
vault['runtime_storage'] = runtime_storage_inst
vault['memory_storage'] = memory_storage.get_memory_storage(
memory_storage.MEMORY_STORAGE_CACHED)
@@ -97,7 +98,7 @@ def get_vault():
flask.request.stackalytics_updated = True
vault['vault_update_time'] = time_now
vault['vault_next_update_time'] = (
time_now + cfg.CONF.dashboard_update_interval)
time_now + CONF.dashboard_update_interval)
memory_storage_inst = vault['memory_storage']
have_updates = memory_storage_inst.update(compact_records(
vault['runtime_storage'].get_update(os.getpid())))

16
stackalytics/dashboard/web.py
View File

@@ -42,8 +42,8 @@ app.register_blueprint(kpi.blueprint)
LOG = logging.getLogger(__name__)
conf = cfg.CONF
conf.register_opts(config.CONNECTION_OPTS + config.DASHBOARD_OPTS)
CONF = cfg.CONF
CONF.register_opts(config.CONNECTION_OPTS + config.DASHBOARD_OPTS)
# Handlers ---------
@@ -680,20 +680,20 @@ def too_old(timestamp):
def main():
logging.register_options(conf)
logging.register_options(CONF)
logging.set_defaults()
conf_file = os.getenv('STACKALYTICS_CONF')
if conf_file and os.path.isfile(conf_file):
conf(default_config_files=[conf_file])
app.config['DEBUG'] = cfg.CONF.debug
CONF(default_config_files=[conf_file])
app.config['DEBUG'] = CONF.debug
LOG.info('Stackalytics.dashboard is configured via "%s"', conf_file)
else:
conf(project='stackalytics')
CONF(project='stackalytics')
logging.setup(conf, 'stackalytics.dashboard')
logging.setup(CONF, 'stackalytics.dashboard')
app.run(cfg.CONF.listen_host, cfg.CONF.listen_port)
app.run(CONF.listen_host, CONF.listen_port)
if __name__ == '__main__':
main()