Merge "Use standard Openstack config options for daemon"

This commit is contained in:
Jenkins 2015-02-06 03:12:21 +00:00 committed by Gerrit Code Review
commit 1cc51551f7

View File

@ -90,12 +90,6 @@ influxdb_group = cfg.OptGroup(name='influxdb', title='influxdb')
cfg.CONF.register_group(influxdb_group)
cfg.CONF.register_opts(influxdb_opts, influxdb_group)
cfg.CONF(sys.argv[1:])
log_levels = (cfg.CONF.default_log_levels)
cfg.set_defaults(log.log_opts, default_log_levels=log_levels)
log.setup("monasca-persister")
def main():
"""Start persister.
@ -103,6 +97,11 @@ def main():
Start metric persister and alarm persister in separate threads.
"""
cfg.CONF(args=[], project='monasca', prog='persister')
log_levels = (cfg.CONF.default_log_levels)
cfg.set_defaults(log.log_opts, default_log_levels=log_levels)
log.setup("monasca-persister")
metric_persister = MetricPersister(cfg.CONF.kafka_metrics,
cfg.CONF.influxdb,
cfg.CONF.zookeeper)