openstack/taskflow
Code Issues Proposed changes

Remove direct usage of the deprecated failure location

Browse Source 
Internally we should be using the new location and not the
deprecated location wherever possible. This avoids emitting
warnings messages on our own code, which is a dirty habit.

Change-Id: Idac5a772eca7529d92542ada3be1cea092880e25
This commit is contained in:
Joshua Harlow
2014-10-18 19:22:08 -07:00
committed by Joshua Harlow
parent 58f27fcd2d
commit 3c9871d8c3
28 changed files with 138 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
taskflow/engines/worker_based/server.py
View File

@@ -21,6 +21,7 @@ import six
from taskflow.engines.worker_based import protocol as pr
from taskflow.engines.worker_based import proxy
from taskflow.types import failure as ft
from taskflow.utils import misc
LOG = logging.getLogger(__name__)
@@ -69,20 +70,20 @@ class Server(object):
failures=None, **kwargs):
"""Parse request before it can be further processed.
All `misc.Failure` objects that have been converted to dict on the
remote side will now converted back to `misc.Failure` objects.
All `failure.Failure` objects that have been converted to dict on the
remote side will now converted back to `failure.Failure` objects.
"""
action_args = dict(arguments=arguments, task_name=task_name)
if result is not None:
data_type, data = result
if data_type == 'failure':
action_args['result'] = misc.Failure.from_dict(data)
action_args['result'] = ft.Failure.from_dict(data)
else:
action_args['result'] = data
if failures is not None:
action_args['failures'] = {}
for k, v in failures.items():
action_args['failures'][k] = misc.Failure.from_dict(v)
for key, data in six.iteritems(failures):
action_args['failures'][key] = ft.Failure.from_dict(data)
return task_cls, action, action_args
@staticmethod
@@ -218,7 +219,7 @@ class Server(object):
message.delivery_tag, exc_info=True)
reply_callback(result=failure.to_dict())
else:
if isinstance(result, misc.Failure):
if isinstance(result, ft.Failure):
reply_callback(result=result.to_dict())
else:
reply_callback(state=pr.SUCCESS, result=result)