openstack/deb-python-swiftclient
Code Issues Proposed changes

Merge "Make swift not hang on error."

Browse Source
This commit is contained in:
Jenkins
2012-06-27 19:02:58 +00:00
committed by Gerrit Code Review
parent 3a11e185b3 6c1813dd34
commit 8396e3a4cb
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bin/swift
View File

@@ -83,20 +83,21 @@ class QueueFunctionThread(Thread):
self.exc_infos = [] self.exc_infos = []
def run(self): def run(self):
try:
while True: while True:
try: try:
item = self.queue.get_nowait() item = self.queue.get_nowait()
if not self.abort:
self.func(item, *self.args, **self.kwargs)
self.queue.task_done()
except Empty: except Empty:
if self.abort: if self.abort:
break break
sleep(0.01) sleep(0.01)
else:
try:
if not self.abort:
self.func(item, *self.args, **self.kwargs)
except Exception: except Exception:
self.exc_infos.append(exc_info()) self.exc_infos.append(exc_info())
finally:
self.queue.task_done()
st_delete_help = ''' st_delete_help = '''
delete --all OR delete container [--leave-segments] [object] [object] ... delete --all OR delete container [--leave-segments] [object] [object] ...