diff options
| author | Mehdi Abaakouk <sileht@redhat.com> | 2016-10-17 08:52:13 +0200 |
|---|---|---|
| committer | Mehdi Abaakouk <sileht@redhat.com> | 2016-11-24 15:29:46 +0100 |
| commit | 779b3228311beac0205962db2cef52f7237d4eaf (patch) | |
| tree | ab87cf4f0002bdb05c9f8e84163ccd172a810b82 /ceilometer/cmd | |
| parent | 1842e19487b4afb92cc5d2e87f5cf4281ed34603 (diff) | |
| download | ceilometer-779b3228311beac0205962db2cef52f7237d4eaf.tar.gz | |
Print ceilometer configuration on startup
This change prints the ceilometer configuration on startup.
It uses the cotyledon helper for this.
Change-Id: I727718220bb8da0fbe3eecb26623f2ab1ca35a42
Diffstat (limited to 'ceilometer/cmd')
| -rw-r--r-- | ceilometer/cmd/agent_notification.py | 2 | ||||
| -rw-r--r-- | ceilometer/cmd/api.py | 13 | ||||
| -rw-r--r-- | ceilometer/cmd/collector.py | 2 | ||||
| -rw-r--r-- | ceilometer/cmd/polling.py | 2 |
4 files changed, 18 insertions, 1 deletions
diff --git a/ceilometer/cmd/agent_notification.py b/ceilometer/cmd/agent_notification.py index 6efe5348..3cdfc473 100644 --- a/ceilometer/cmd/agent_notification.py +++ b/ceilometer/cmd/agent_notification.py @@ -15,6 +15,7 @@ # under the License. import cotyledon +from cotyledon import oslo_config_glue from ceilometer import notification from ceilometer import service @@ -26,4 +27,5 @@ def main(): sm = cotyledon.ServiceManager() sm.add(notification.NotificationService, workers=conf.notification.workers, args=(conf,)) + oslo_config_glue.setup(sm, conf) sm.run() diff --git a/ceilometer/cmd/api.py b/ceilometer/cmd/api.py index 22a9e41d..7591fb47 100644 --- a/ceilometer/cmd/api.py +++ b/ceilometer/cmd/api.py @@ -14,10 +14,21 @@ # License for the specific language governing permissions and limitations # under the License. +import logging + +from cotyledon import oslo_config_glue +from oslo_log import log from ceilometer.api import app from ceilometer import service +LOG = log.getLogger(__name__) + def build_wsgi_app(argv=None): - return app.load_app(service.prepare_service(argv=argv)) + conf = service.prepare_service(argv=argv) + conf.register_opts(oslo_config_glue.service_opts) + if conf.log_options: + LOG.debug('Full set of CONF:') + conf.log_opt_values(LOG, logging.DEBUG) + return app.load_app(conf) diff --git a/ceilometer/cmd/collector.py b/ceilometer/cmd/collector.py index aa7c7572..3bd00ebe 100644 --- a/ceilometer/cmd/collector.py +++ b/ceilometer/cmd/collector.py @@ -15,6 +15,7 @@ # under the License. import cotyledon +from cotyledon import oslo_config_glue from ceilometer import collector from ceilometer import service @@ -25,4 +26,5 @@ def main(): sm = cotyledon.ServiceManager() sm.add(collector.CollectorService, workers=conf.collector.workers, args=(conf,)) + oslo_config_glue.setup(sm, conf) sm.run() diff --git a/ceilometer/cmd/polling.py b/ceilometer/cmd/polling.py index d6b949e8..664bf1f0 100644 --- a/ceilometer/cmd/polling.py +++ b/ceilometer/cmd/polling.py @@ -15,6 +15,7 @@ # under the License. import cotyledon +from cotyledon import oslo_config_glue from oslo_config import cfg from oslo_log import log @@ -87,4 +88,5 @@ def main(): service.prepare_service(conf=conf) sm = cotyledon.ServiceManager() sm.add(create_polling_service, args=(conf,)) + oslo_config_glue.setup(sm, conf) sm.run() |