← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ceilometer/dispatcher/database.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/dispatcher/database.py
20
20
from ceilometer.openstack.common.gettextutils import _  # noqa
21
21
from ceilometer.openstack.common import log
22
22
from ceilometer.openstack.common import timeutils
23
 
from ceilometer.publisher import rpc as publisher_rpc
 
23
from ceilometer.publisher import utils as publisher_utils
24
24
from ceilometer import storage
25
25
 
26
26
LOG = log.getLogger(__name__)
54
54
                    'resource_id': meter['resource_id'],
55
55
                    'timestamp': meter.get('timestamp', 'NO TIMESTAMP'),
56
56
                    'counter_volume': meter['counter_volume']}))
57
 
            if publisher_rpc.verify_signature(
 
57
            if publisher_utils.verify_signature(
58
58
                    meter,
59
 
                    self.conf.publisher_rpc.metering_secret):
 
59
                    self.conf.publisher.metering_secret):
60
60
                try:
61
61
                    # Convert the timestamp to a datetime instance.
62
62
                    # Storage engines are responsible for converting