From 9b0d7ff1e52cfbfc69d0e27dc898cbeea4573488 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Mon, 30 Mar 2015 18:45:31 +0300 Subject: diff_commit__topo, diff_commit__attr: use @common_rest_req_exception_handler --- src/server/rz_api_rest.py | 51 ++++++++++++++--------------------------------- 1 file changed, 15 insertions(+), 36 deletions(-) (limited to 'src/server/rz_api_rest.py') diff --git a/src/server/rz_api_rest.py b/src/server/rz_api_rest.py index 4c024fc1..e1788586 100644 --- a/src/server/rz_api_rest.py +++ b/src/server/rz_api_rest.py @@ -68,6 +68,7 @@ class Req_Context(): +@common_rest_req_exception_handler def diff_commit__topo(): """ REST API wrapper around diff_commit__topo(): @@ -82,22 +83,14 @@ def diff_commit__topo(): sanitize_input__topo_diff(topo_diff) return rzdoc_name, topo_diff - try: - rzdoc_name, topo_diff = sanitize_input(request) - except Exception as e: - return common_resp_handle(error='malformed input') - - rzdoc_id = map_rzdoc_name_to_rzdoc_id(rzdoc_name) - ctx = __context__common(rzdoc_id=rzdoc_id) - try: - kernel = flask.current_app.kernel - _, commit_ret = kernel.diff_commit__topo(topo_diff, ctx) - return common_resp_handle(data=commit_ret) - except Exception as e: - log.error(e.message) - log.error(traceback.print_exc()) - return common_resp_handle(error=e) + rzdoc_name, topo_diff = sanitize_input(request) + + ctx = __context__common(rzdoc_name) + kernel = flask.current_app.kernel + _, commit_ret = kernel.diff_commit__topo(topo_diff, ctx) + return common_resp_handle__success(data=commit_ret) +@common_rest_req_exception_handler def diff_commit__attr(): """ commit a graph attribute diff @@ -108,29 +101,15 @@ def diff_commit__attr(): attr_diff = Attr_Diff.from_json_dict(attr_diff_dict) sanitize_input__attr_diff(attr_diff) - + return rzdoc_name, attr_diff; - def on_error(e): - # handle DB ERRORS, eg. name attr change error - return common_resp_handle(error='error occurred') - - try: - rzdoc_name, attr_diff = sanitize_input(request) - validate_obj__attr_diff(attr_diff) - except Exception as e: - return common_resp_handle(error='malformed input') - - rzdoc_id = map_rzdoc_name_to_rzdoc_id(rzdoc_name) - ctx = __context__common(rzdoc_id=rzdoc_id) - try: - kernel = flask.current_app.kernel - _, commit_ret = kernel.diff_commit__attr(attr_diff, ctx) - return common_resp_handle(data=commit_ret) - except Exception as e: - log.error(e.message) - log.error(traceback.print_exc()) - return common_resp_handle(error=e) + rzdoc_name, attr_diff = sanitize_input(request) + validate_obj__attr_diff(attr_diff) + ctx = __context__common(rzdoc_name) + kernel = flask.current_app.kernel + _, commit_ret = kernel.diff_commit__attr(attr_diff, ctx) + return common_resp_handle__success(data=commit_ret) def diff_commit__vis(): pass -- cgit v1.3.1