← Back to branch summary

~ubuntu-branches/ubuntu/trusty/heat/trusty-security

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2013-09-08 21:51:19 UTC
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: package-import@ubuntu.com-20130908215119-7tcek6gn73275x5k
Tags: upstream-2013.2~b3
Import upstream version 2013.2~b3

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/openstack/common/threadgroup.py
14
14
#    License for the specific language governing permissions and limitations
15
15
#    under the License.
16
16
 
17
 
from eventlet import greenlet
 
17
import eventlet
18
18
from eventlet import greenpool
19
19
from eventlet import greenthread
20
20
 
105
105
        for x in self.timers:
106
106
            try:
107
107
                x.wait()
108
 
            except greenlet.GreenletExit:
 
108
            except eventlet.greenlet.GreenletExit:
109
109
                pass
110
110
            except Exception as ex:
111
111
                LOG.exception(ex)
115
115
                continue
116
116
            try:
117
117
                x.wait()
118
 
            except greenlet.GreenletExit:
 
118
            except eventlet.greenlet.GreenletExit:
119
119
                pass
120
120
            except Exception as ex:
121
121
                LOG.exception(ex)