Better error handling

objectscript · Dec 9, 2019 · 34316ee · 34316ee
1 parent 2221776
commit 34316ee
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/isc/rabbitmq/Common.cls b/isc/rabbitmq/Common.cls
@@ -83,12 +83,23 @@ Method ConnectToRabbitMQ() As %Status
 
 	Try {
 		Set ..API = ##class(isc.rabbitmq.API).%New(..JGW, ..Host, ..Port, user, pass, ..VirtualHost, ..Queue, $$$YES)
-	} Catch ex {		
-		Set sc = $$$ADDSC(ex.AsStatus(),$g(%objlasterror))
+	} Catch ex {
+		Set sc = ..ExceptionToStatus(ex)
 	}
 
 	Quit sc
 }
 
+Method ExceptionToStatus(ex As %Exception.General) As %Status
+{
+	#Dim sc As %Status
+	If ((ex.Name="<ZJGTW>") && $d(%objlasterror)) {
+		Set sc = %objlasterror
+	} Else {
+		Set sc = ex.AsStatus()
+	}
+    Quit sc
+}
+
 }
 
diff --git a/isc/rabbitmq/InboundAdapter.cls b/isc/rabbitmq/InboundAdapter.cls
@@ -44,13 +44,22 @@ Method OnTask() As %Status
 		#Dim messageList As %ListOfDataTypes 
 
 		If ..BodyClass = "" {
-			Set messageList = ..API.readMessageString()
+			Try {
+				Set messageList = ..API.readMessageString()
+			} Catch ex {
+				Set sc = ..ExceptionToStatus(ex)
+			}
 		} Else {
 			#Dim tempStream As %Library.GlobalBinaryStream
 			Set messageList = ##class(%ListOfDataTypes).%New()
 			For i=1:1:15 Do messageList.Insert("")
-			Set tempStream = ..API.readMessageStream(.messageList)
+			Try {
+				Set tempStream = ..API.readMessageStream(.messageList)
+			} Catch ex {
+				Set sc = ..ExceptionToStatus(ex)
+			}
 		}
+		Quit:$$$ISERR(sc)
 
 		Set messageLength = messageList.GetAt(1)
 		Set messageCount = messageList.GetAt(2)

diff --git a/isc/rabbitmq/OutboundAdapter.cls b/isc/rabbitmq/OutboundAdapter.cls
@@ -41,7 +41,7 @@ Method SendMessage(message As %Stream.Object) As %Status
 	Try {
 		Do ..API.sendMessage(stream)
 	} Catch ex {
-		Set sc = ex.AsStatus()
+		Set sc = ..ExceptionToStatus(ex)
 	}
 	Quit sc
 }
@@ -63,7 +63,7 @@ Method SendMessageToQueue(queue As %String, message As %Stream.Object) As %Statu
 	Try {
 		Do ..API.sendMessageToQueue(queue, stream)
 	} Catch ex {
-		Set sc = ex.AsStatus()
+		Set sc = ..ExceptionToStatus(ex)
 	}
 	Quit sc
 }

diff --git a/isc/rabbitmq/Production.cls b/isc/rabbitmq/Production.cls
@@ -6,7 +6,7 @@ XData ProductionDefinition
 <Production Name="isc.rabbitmq.Production" TestingEnabled="true" LogGeneralTraceEvents="false">
   <Description></Description>
   <ActorPoolSize>2</ActorPoolSize>
-  <Item Name="isc.rabbitmq.Service" Category="" ClassName="RabbitMQ.Service" PoolSize="1" Enabled="true" Foreground="false" Comment="" LogTraceEvents="true" Schedule="">
+  <Item Name="isc.rabbitmq.Service" Category="" ClassName="isc.rabbitmq.Service" PoolSize="1" Enabled="true" Foreground="false" Comment="" LogTraceEvents="true" Schedule="">
     <Setting Target="Adapter" Name="JGService">EnsLib.JavaGateway.Service</Setting>
     <Setting Target="Adapter" Name="ClassPath">C:\InterSystems\RabbitMQjava.jar;C:\InterSystems\Java\amqp-client-5.7.2.jar</Setting>
     <Setting Target="Adapter" Name="Queue">hello</Setting>
@@ -20,7 +20,7 @@ XData ProductionDefinition
     <Setting Target="Host" Name="JavaHome">C:\Progra~1\Java\jdk1.8.0_121\</Setting>
     <Setting Target="Host" Name="ClassPath">C:\InterSystems\RabbitMQjava.jar;C:\InterSystems\Java\amqp-client-5.7.2.jar</Setting>
   </Item>
-  <Item Name="isc.rabbitmq.Operation" Category="" ClassName="RabbitMQ.Operation" PoolSize="1" Enabled="true" Foreground="false" Comment="" LogTraceEvents="false" Schedule="">
+  <Item Name="isc.rabbitmq.Operation" Category="" ClassName="isc.rabbitmq.Operation" PoolSize="1" Enabled="true" Foreground="false" Comment="" LogTraceEvents="false" Schedule="">
     <Setting Target="Adapter" Name="JGService">EnsLib.JavaGateway.Service</Setting>
     <Setting Target="Adapter" Name="Queue">hello</Setting>
     <Setting Target="Adapter" Name="ClassPath">C:\InterSystems\RabbitMQjava.jar;C:\InterSystems\Java\amqp-client-5.7.2.jar</Setting>