From 02703b89d8158b35463ad2a529f00469d408ff6c Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 20 Apr 2022 12:35:34 -0400 Subject: [PATCH] Don't bomb out trying to parse the old json format for creating warnings about the task size. --- crc/services/workflow_processor.py | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/crc/services/workflow_processor.py b/crc/services/workflow_processor.py index 0b4ad1a9..9a0c2585 100644 --- a/crc/services/workflow_processor.py +++ b/crc/services/workflow_processor.py @@ -124,21 +124,15 @@ class WorkflowProcessor(object): json_size = B/MB if json_size > 1: wf_json = json.loads(workflow_model.bpmn_workflow_json) - task_tree = wf_json['task_tree'] - test_spec = wf_json['wf_spec'] - task_size = "{:.2f}".format(len(json.dumps(task_tree).encode('utf-8'))/MB) - spec_size = "{:.2f}".format(len(test_spec.encode('utf-8'))/MB) - task_specs = json.loads(test_spec)['task_specs'] - sub_workflows = json.loads(test_spec)['sub_workflows'] - message = 'Workflow ' + workflow_model.workflow_spec_id + ' JSON Size is over 1MB:{0:.2f} MB'.format(json_size) - message += f"\n Task Size: {task_size}" - message += f"\n Spec Size: {spec_size}" - message += f"\n Largest Sub-Process Sizes:" - for sw_name, sw_data in sub_workflows.items(): - size = len(json.dumps(sw_data).encode('utf-8')) / MB - if size > 0.1: - message += "\n " + sw_name + " {:.2f}".format(size) - app.logger.warning(message) + if 'spec' in wf_json and 'tasks' in wf_json: # + task_tree = wf_json['tasks'] + test_spec = wf_json['spec'] + task_size = "{:.2f}".format(len(json.dumps(task_tree).encode('utf-8'))/MB) + spec_size = "{:.2f}".format(len(json.dumps(test_spec).encode('utf-8'))/MB) + message = 'Workflow ' + workflow_model.workflow_spec_id + ' JSON Size is over 1MB:{0:.2f} MB'.format(json_size) + message += f"\n Task Size: {task_size}" + message += f"\n Spec Size: {spec_size}" + app.logger.warning(message) self.workflow_spec_id = workflow_model.workflow_spec_id try: