Use console scripts for ceilometer-collector

Blueprint: setuptools-console-scripts

Change-Id: I7d600eae8b29b3135b026dfb3ad0a848541f872e
Signed-off-by: Julien Danjou <julien@danjou.info>

bin/ceilometer-collector

@@ -1,40 +0,0 @@
-#!/usr/bin/env python
-# -*- encoding: utf-8 -*-
-#
-# Copyright © 2012 eNovance <licensing@enovance.com>
-#
-# Author: Julien Danjou <julien@danjou.info>
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-import eventlet
-eventlet.monkey_patch()
-import sys
-
-from oslo.config import cfg
-
-from ceilometer.openstack.common import gettextutils
-gettextutils.install('ceilometer')
-
-from ceilometer.collector import service as coll_service
-from ceilometer.service import prepare_service
-from ceilometer.openstack.common import service
-
-
-if __name__ == '__main__':
-    prepare_service(sys.argv)
-    topic = 'ceilometer.collector'
-    ceilo = coll_service.CollectorService(cfg.CONF.host,
-                                          topic)
-    launcher = service.launch(ceilo)
-    launcher.wait()

ceilometer/collector/service.py

@@ -231,3 +231,12 @@ class CollectorService(rpc_service.Service):
                 LOG.warning(
                     'message signature invalid, discarding message: %r',
                     meter)
+
+
+def collector():
+    # TODO(jd) move into prepare_service gettextutils and eventlet?
+    eventlet.monkey_patch()
+    gettextutils.install('ceilometer')
+    prepare_service(sys.argv)
+    os_service.launch(CollectorService(cfg.CONF.host,
+                                       'ceilometer.collector')).wait()

doc/source/install/manual.rst

@@ -115,7 +115,7 @@ Installing the Collector
 
    ::
 
-     $ ./bin/ceilometer-collector
+     $ ceilometer-collector
 
    .. note:: 
 

setup.cfg

@@ -30,7 +30,6 @@ scripts =
     bin/ceilometer-agent-compute
     bin/ceilometer-agent-central
     bin/ceilometer-api
-    bin/ceilometer-collector
     bin/ceilometer-dbsync
 
 [entry_points]
@@ -90,6 +89,7 @@ paste.filter_factory =
     swift = ceilometer.objectstore.swift_middleware:filter_factory
 
 console_scripts =
+    ceilometer-collector = ceilometer.collector.service:collector
     ceilometer-collector-udp = ceilometer.collector.service:udp_collector
 
 [build_sphinx]

tox.ini

@@ -24,7 +24,7 @@ deps = pep8==1.4.5
        flake8==2.0
        hacking>=0.5.3,<0.6
 commands =
-    flake8 ceilometer setup.py bin/ceilometer-agent-central bin/ceilometer-agent-compute bin/ceilometer-collector bin/ceilometer-api tests
+    flake8 ceilometer setup.py bin/ceilometer-agent-central bin/ceilometer-agent-compute bin/ceilometer-api tests
 
 [testenv:docs]
 deps = -r{toxinidir}/requirements.txt