From 219ef08ffde8482dbaf6dfa151d9d06da7aabf4e Mon Sep 17 00:00:00 2001
From: "Smokowski, Steve (ss835w)" <ss835w@us.att.com>
Date: Thu, 9 Aug 2018 12:44:57 -0400
Subject: Fix Logging

Add more logging information for Java.Lang Exceptions

Issue-ID: SO-822

Change-Id: I5eb25adc087c9fb495829af2c9d0d1be7374f4a3


Change-Id: I5eb25adc087c9fb495829af2c9d0d1be7374f4a3
Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
---
 .../so/bpmn/common/scripts/ExceptionUtil.groovy    |  7 +++++
 .../CreateGenericALaCarteServiceInstance.bpmn      | 30 +++++++++++-----------
 2 files changed, 22 insertions(+), 15 deletions(-)

(limited to 'bpmn')

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ExceptionUtil.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ExceptionUtil.groovy
index de5408fac5..4b701e6a58 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ExceptionUtil.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/ExceptionUtil.groovy
@@ -381,15 +381,22 @@ class ExceptionUtil extends AbstractServiceTaskProcessor {
 			msoLogger.debug("Started processJavaException Method")
 			// if the BPMN flow java error handler sets "BPMN_javaExpMsg", append it to the WFE
 			String javaExpMsg = execution.getVariable("BPMN_javaExpMsg")
+            String errorMessage = execution.getVariable("gUnknownError")
 			String wfeExpMsg = "Catch a Java Lang Exception in " + processKey
 			if (javaExpMsg != null && !javaExpMsg.empty) {
 				wfeExpMsg = wfeExpMsg + ": " + javaExpMsg
 			}
+            if (errorMessage != null && !errorMessage.empty) {
+                msoLogger.error("Unknown Error: " + errorMessage);
+            }
+            msoLogger.error("Java Error: " + wfeExpMsg);
 			buildWorkflowException(execution, 2500, wfeExpMsg)
 
 		}catch(BpmnError b){
+            msoLogger.error(b);
 			throw b
 		}catch(Exception e){
+            msoLogger.error(e);
 			msoLogger.debug("Caught Exception during processJavaException Method: " + e)
 			buildWorkflowException(execution, 2500, "Internal Error - During Process Java Exception")
 		}
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateGenericALaCarteServiceInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateGenericALaCarteServiceInstance.bpmn
index 3d08fdb1d4..50e65dcaad 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateGenericALaCarteServiceInstance.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateGenericALaCarteServiceInstance.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.8.2" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
+<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.7.1" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="CreateGenericALaCarteServiceInstance" name="CreateGenericALaCarteServiceInstance" isExecutable="true">
     <bpmn2:startEvent id="createSI_startEvent" name="Create SI Start Flow">
       <bpmn2:outgoing>SequenceFlow_0lp2z7l</bpmn2:outgoing>
@@ -15,7 +15,7 @@ ex.processJavaException(execution)]]></bpmn2:script>
       <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_1" />
       <bpmn2:startEvent id="StartEvent_1">
         <bpmn2:outgoing>SequenceFlow_10</bpmn2:outgoing>
-        <bpmn2:errorEventDefinition id="ErrorEventDefinition_2" errorRef="Error_1" />
+        <bpmn2:errorEventDefinition id="ErrorEventDefinition_2" errorRef="Error_1" camunda:errorMessageVariable="gUnknownError" />
       </bpmn2:startEvent>
       <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="StartEvent_1" targetRef="ScriptTask_1" />
       <bpmn2:endEvent id="EndEvent_1">
@@ -197,35 +197,35 @@ csi.prepareCreateServiceInstance(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_28" bpmnElement="unexpectedErrors_SubProcess" isExpanded="true">
-        <dc:Bounds x="300" y="880" width="394" height="188" />
+        <dc:Bounds x="187" y="926" width="394" height="188" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_71" bpmnElement="StartEvent_1">
-        <dc:Bounds x="333" y="957" width="36" height="36" />
+        <dc:Bounds x="220" y="1003" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="351" y="998" width="0" height="0" />
+          <dc:Bounds x="193" y="1044" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_270" bpmnElement="ScriptTask_1">
-        <dc:Bounds x="448" y="935" width="100" height="80" />
+        <dc:Bounds x="335" y="981" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_220" bpmnElement="EndEvent_1">
-        <dc:Bounds x="609" y="957" width="36" height="36" />
+        <dc:Bounds x="496" y="1003" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="627" y="998" width="0" height="0" />
+          <dc:Bounds x="469" y="1044" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_StartEvent_71" targetElement="_BPMNShape_ScriptTask_270">
-        <di:waypoint xsi:type="dc:Point" x="369" y="975" />
-        <di:waypoint xsi:type="dc:Point" x="448" y="975" />
+        <di:waypoint xsi:type="dc:Point" x="256" y="1021" />
+        <di:waypoint xsi:type="dc:Point" x="335" y="1021" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="411" y="975" width="0" height="0" />
+          <dc:Bounds x="253" y="1021" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_270" targetElement="_BPMNShape_EndEvent_220">
-        <di:waypoint xsi:type="dc:Point" x="548" y="975" />
-        <di:waypoint xsi:type="dc:Point" x="609" y="975" />
+        <di:waypoint xsi:type="dc:Point" x="435" y="1021" />
+        <di:waypoint xsi:type="dc:Point" x="496" y="1021" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="583" y="975" width="0" height="0" />
+          <dc:Bounds x="425" y="1021" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_72" bpmnElement="doCreateServiceInstance_CallActivity">
@@ -449,4 +449,4 @@ csi.prepareCreateServiceInstance(execution)]]></bpmn2:script>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
\ No newline at end of file
+</bpmn2:definitions>
-- 
cgit 1.2.3-korg