← Back to branch summary

~ubuntu-branches/ubuntu/vivid/heat/vivid

« back to all changes in this revision

Viewing changes to heat/openstack/common/service.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Corey Bryant
  • Date: 2015-01-06 08:55:22 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20150106085522-4o3hnaff5lacvtrf
Tags: 2015.1~b1-0ubuntu1
[ Chuck Short ]
* Open up for vivid.
* debian/control: Update bzr branch. 
* debian/control: Add python-saharaclient,
  python-osprofiler, python-oslo.middleware, python-oslo.serialization.
* debian/patches/fix-reqirements.patch: Refreshed.
* debian/patches/skip-tests.patch: Updated to skip more tests.
* debian/rules: Skip integration tests.

[ Corey Bryant ]
* New upstream release.
  - d/control: Align requirements with upstream.
  - d/watch: Update uversionmangle for kilo beta naming.
  - d/rules: Generate heat.conf.sample and apply patch before copy.
  - d/rules: Run base tests instead of integration tests.
  - d/p/fix-requirements.patch: Refreshed.
  - d/p/remove-gettextutils-import.patch: Cherry picked from master.
* d/control: Bumped Standards-Version to 3.9.6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/openstack/common/service.py
38
38
from oslo.config import cfg
39
39
 
40
40
from heat.openstack.common import eventlet_backdoor
41
 
from heat.openstack.common.gettextutils import _LE, _LI, _LW
42
 
from heat.openstack.common import importutils
 
41
from heat.openstack.common._i18n import _LE, _LI, _LW
43
42
from heat.openstack.common import log as logging
44
43
from heat.openstack.common import systemd
45
44
from heat.openstack.common import threadgroup
46
45
 
47
46
 
48
 
rpc = importutils.try_import('heat.openstack.common.rpc')
49
47
CONF = cfg.CONF
50
48
LOG = logging.getLogger(__name__)
51
49
 
180
178
            status = exc.code
181
179
        finally:
182
180
            self.stop()
183
 
            if rpc:
184
 
                try:
185
 
                    rpc.cleanup()
186
 
                except Exception:
187
 
                    # We're shutting down, so it doesn't matter at this point.
188
 
                    LOG.exception(_LE('Exception during rpc cleanup.'))
189
181
 
190
182
        return status, signo
191
183