~ubuntu-branches/ubuntu/vivid/openstack-trove/vivid

« back to all changes in this revision

Viewing changes to trove/cmd/api.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, James Page
  • Date: 2015-03-30 11:22:26 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20150330112226-op8vdoaqypjn9ghs
Tags: 2015.1~b3-0ubuntu1
[ Chuck Short ]
* New upstream release.
  - d/control: Align with upstream dependencies.
  - d/p/fix-requirements.patch: Rebased
  - d/p/patch-default-config-file.patch: Rebased

[ James Page ]
* d/rules,control: Tweak unit test execution, add subunit to BD's.

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
#    under the License.
15
15
from oslo_concurrency import processutils
16
16
from trove.cmd.common import with_initialize
 
17
from trove.common import profile
17
18
 
18
19
 
19
20
@with_initialize
20
21
def main(CONF):
21
22
    from trove.common import wsgi
 
23
    profile.setup_profiler('api', CONF.host)
22
24
    conf_file = CONF.find_file(CONF.api_paste_config)
23
25
    workers = CONF.trove_api_workers or processutils.get_worker_count()
24
26
    launcher = wsgi.launch('trove', CONF.bind_port, conf_file,