openstack/oslo-incubator
Code Issues Proposed changes

Merge "threadgroup: use threading rather than greenthread"

Browse Source
This commit is contained in:
Jenkins 2014-01-27 14:04:05 +00:00 committed by Gerrit Code Review
commit 5f8ace053c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack/common/threadgroup.py
View File

@ -11,10 +11,10 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import threading
import eventlet import eventlet
from eventlet import greenpool from eventlet import greenpool
from eventlet import greenthread
from openstack.common import log as logging from openstack.common import log as logging
from openstack.common import loopingcall from openstack.common import loopingcall
@ -86,7 +86,7 @@ class ThreadGroup(object):
self.threads.remove(thread) self.threads.remove(thread)
def stop(self): def stop(self):
current = greenthread.getcurrent() current = threading.current_thread()
# Iterate over a copy of self.threads so thread_done doesn't # Iterate over a copy of self.threads so thread_done doesn't
# modify the list while we're iterating # modify the list while we're iterating
@ -114,7 +114,7 @@ class ThreadGroup(object):
pass pass
except Exception as ex: except Exception as ex:
LOG.exception(ex) LOG.exception(ex)
current = greenthread.getcurrent() current = threading.current_thread()
# Iterate over a copy of self.threads so thread_done doesn't # Iterate over a copy of self.threads so thread_done doesn't
# modify the list while we're iterating # modify the list while we're iterating