← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ceilometer/trusty-proposed

« back to all changes in this revision

Viewing changes to ceilometer/agent.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, James Page, Chuck Short
  • Date: 2014-01-23 15:08:11 UTC
  • mfrom: (1.1.11)
  • Revision ID: package-import@ubuntu.com-20140123150811-1zaismsuyh1hcl8y
Tags: 2014.1~b2-0ubuntu1
https://launchpad.net/bugs/1261101
https://launchpad.net/bugs/1250002
https://launchpad.net/bugs/1224223
[ James Page ]
* d/control: Add python-jsonpath-rw to BD's.
* d/p/fix-setup-requirements.patch: Bump WebOb to support < 1.4.
 (LP: #1261101)

[ Chuck Short ]
* New upstream version.
* debian/control, debian/ceilometer-common.install: Split out
  ceilometer-alarm-evaluator and ceilometer-alarm-notifier into their
  own packages. (LP: #1250002)
* debian/ceilometer-agent-central.logrotate,
  debian/ceilometer-agent-compute.logrotate,
  debian/ceilometer-api.logrotate,
  debian/ceilometer-collector.logrotate: Add logrotate files, 
  thanks to Ahmed Rahal. (LP: #1224223)
* Fix typos in upstart files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ceilometer/agent.py
21
21
 
22
22
from ceilometer.openstack.common import context
23
23
from ceilometer.openstack.common import log
 
24
from ceilometer.openstack.common import service as os_service
24
25
from ceilometer import pipeline
25
26
from ceilometer import transformer
26
27
 
48
49
        """Polling sample and publish into pipeline."""
49
50
 
50
51
 
51
 
class AgentManager(object):
 
52
class AgentManager(os_service.Service):
52
53
 
53
54
    def __init__(self, extension_manager):
 
55
        super(AgentManager, self).__init__()
54
56
 
55
57
        self.pollster_manager = extension_manager
56
58
 
74
76
 
75
77
        return polling_tasks
76
78
 
77
 
    def initialize_service_hook(self, service):
 
79
    def start(self):
78
80
        self.pipeline_manager = pipeline.setup_pipeline(
79
81
            transformer.TransformerExtensionManager(
80
82
                'ceilometer.transformer',
81
83
            ),
82
84
        )
83
85
 
84
 
        self.service = service
85
86
        for interval, task in self.setup_polling_tasks().iteritems():
86
 
            self.service.tg.add_timer(interval,
87
 
                                      self.interval_task,
88
 
                                      task=task)
 
87
            self.tg.add_timer(interval,
 
88
                              self.interval_task,
 
89
                              task=task)
89
90
 
90
91
    @staticmethod
91
92
    def interval_task(task):