~ubuntu-branches/ubuntu/saucy/ceilometer/saucy

« back to all changes in this revision

Viewing changes to ceilometer/objectstore/swift_middleware.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Yolanda Robla, Chuck Short, James Page
  • Date: 2013-07-19 10:04:36 UTC
  • mfrom: (1.1.5)
  • Revision ID: package-import@ubuntu.com-20130719100436-8ppgb9laoyr60zyr
Tags: 2013.2~b2-0ubuntu1
[ Yolanda Robla ]
* debian/patches/default-dbconnection-sqlite.patch: updated db section

[ Chuck Short ]
* New upstream version.
* debian/patches/default-dbconnection-sqlite.patch: Refreshed.
* debian/control: Bump requirements for stevedore to 0.9.
* debian/control: Add python-simplejson
* debian/control: Drop python-keystoneclient hardcoded version.
* debian/control: Add python-testscenarios as a build depends.
* debian/control: Add python-cinderclient as a build depends.
* debian/control: Add python-ceilometerclient as a build depends.
* debian/control: Add python-alembic as build depends.
* debian/control: Add python-oslo.sphinx as build-depends.
* debian/control: Update runtime depends.
* debian/control: Add python-happybase.
* debian/ceilometer-common.install: Add ceilometer-alarm-singleton,
  ceilometer-alarm-notifier, and ceilometer-expirer.
* debian/patches/skip-database-tests.patch: Skip database tests
  if the database is not installed.

[ James Page ]
* d/control: Update VCS fields for new branch locations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
60
60
from ceilometer.openstack.common import context
61
61
from ceilometer.openstack.common import timeutils
62
62
from ceilometer import pipeline
63
 
from ceilometer import publisher
64
63
from ceilometer import service
65
64
from ceilometer import transformer
66
65
 
67
66
 
68
67
class CeilometerMiddleware(object):
69
 
    """
70
 
    Ceilometer middleware used for counting requests.
71
 
    """
 
68
    """Ceilometer middleware used for counting requests."""
72
69
 
73
70
    def __init__(self, app, conf):
74
71
        self.app = app
78
75
                                     "metadata_headers",
79
76
                                     "").split(",") if h.strip()]
80
77
 
81
 
        service.prepare_service()
 
78
        service.prepare_service([])
82
79
 
83
80
        self.pipeline_manager = pipeline.setup_pipeline(
84
81
            transformer.TransformerExtensionManager(
85
82
                'ceilometer.transformer',
86
83
            ),
87
 
            publisher.PublisherExtensionManager(
88
 
                'ceilometer.publisher',
89
 
            ),
90
84
        )
91
85
 
92
86
    def __call__(self, env, start_response):