← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ceilometer/openstack/common/threadgroup.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/openstack/common/threadgroup.py
87
87
 
88
88
    def stop(self):
89
89
        current = greenthread.getcurrent()
90
 
        for x in self.threads:
 
90
 
 
91
        # Iterate over a copy of self.threads so thread_done doesn't
 
92
        # modify the list while we're iterating
 
93
        for x in self.threads[:]:
91
94
            if x is current:
92
95
                # don't kill the current thread.
93
96
                continue
112
115
            except Exception as ex:
113
116
                LOG.exception(ex)
114
117
        current = greenthread.getcurrent()
115
 
        for x in self.threads:
 
118
 
 
119
        # Iterate over a copy of self.threads so thread_done doesn't
 
120
        # modify the list while we're iterating
 
121
        for x in self.threads[:]:
116
122
            if x is current:
117
123
                continue
118
124
            try: