Index: TECH/PubSub/impl/EventDispatcher.cls.xml
===================================================================
diff -u -r1085 -r1089
--- TECH/PubSub/impl/EventDispatcher.cls.xml	(.../EventDispatcher.cls.xml)	(revision 1085)
+++ TECH/PubSub/impl/EventDispatcher.cls.xml	(.../EventDispatcher.cls.xml)	(revision 1089)
@@ -3,73 +3,99 @@
 <Class name="TECH.PubSub.impl.EventDispatcher">
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.RegisteredObject,TECH.PubSub.EventDispatcher</Super>
 
-<Method name="DispatchEventASync">
-<FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
+<Property name="Logger">
+<Type>vhLib.Logger</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SubscriptionCollector">
+<Type>TECH.PubSub.EventSubscriptionCollector</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>SubscriptionCollector:TECH.PubSub.EventSubscriptionCollector</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Do ..LogEvent(Event)
-	
-	Set ResultSet = ##class(%ResultSet).%New(..%ClassName(1)_":qAlleSubscriptions")
-	#dim sc As %Status = ResultSet.Execute(Event)	
-	While (ResultSet.Next()){		
-		Set Subscription = ##class(TECH.PubSub.EventSubscription).%OpenId(ResultSet.Data("ID"))
-		
-		Try
-		{
-			Do $ZOBJCLASSMETHOD(Subscription.RespondingClass, Subscription.RespondingMethod, Event)
-		}
-		Catch (e)
-		{
-			Set Logger = ##class(TECH.PubSub.impl.PubSubLogger).%New()
-			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-			
-			#dim LogDetail As %String = ..GeefLogDetail(Event,Exception,Subscription)
-			Do Logger.ErrorMail(Exception.GeefOmschrijving(), LogDetail)
-						
-			if ##class(TECH.Config.ConfigMgr).Instance().GeefBoolean("TECH.PubSub.Rethrow_Exception") {
-				do ##class(TECH.ExceptionHandler).Throw(Exception)
-			}
-		}
-	}
-	
-	If $SYSTEM.Status.IsError(sc) Set Logger = ##class(TECH.PubSub.impl.PubSubLogger).%New().ErrorMail("/!\ Error bij het ophalen van de subscriptions /!\",$$ParseStatus^vhLib(sc))
-	
+	set ..SubscriptionCollector = $get(SubscriptionCollector,##class(TECH.PubSub.impl.EventSubscriptionCollector).%New())
+	set ..Logger = ##class(vhLib.Logger).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="DispatchEventASync">
+<FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	quit ..DispatchEvent(Event,##class(TECH.PubSub.impl.DispatchType).Asynchroon())
+]]></Implementation>
+</Method>
+
 <Method name="DispatchEventSync">
 <FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
 <ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	quit ..DispatchEvent(Event,##class(TECH.PubSub.impl.DispatchType).Synchroon())
+]]></Implementation>
+</Method>
+
+<Method name="DispatchEvent">
+<FormalSpec>Event:TECH.PubSub.Event,DispatchType:TECH.PubSub.impl.DispatchType</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Do ..LogEvent(Event)
-	
-	Set ResultSet = ##class(%ResultSet).%New(..%ClassName(1)_":qAlleSubscriptions")
-	#dim sc As %Status = ResultSet.Execute(Event)	
-	While (ResultSet.Next()){		
-		Set Subscription = ##class(TECH.PubSub.EventSubscription).%OpenId(ResultSet.Data("ID"))
+	#dim stSubscriptions As %Status = $$$OK
+	#dim Subscriptions As TECH.PubSub.EventSubscriptionList = ..SubscriptionCollector.CollectSubscriptions(Event)
+	set SubscriptionCollectorIterator = ##class(TECH.ListIterator).%New(Subscriptions)
+	while SubscriptionCollectorIterator.HasNext() {
+		#dim Subscription As TECH.PubSub.EventSubscription = SubscriptionCollectorIterator.Next()  
+		set stSubscriptions = ..VoerUitSubscription(Subscription,Event,DispatchType)
+	}	
+	Quit stSubscriptions
+]]></Implementation>
+</Method>
+
+<Method name="VoerUitSubscription">
+<FormalSpec>Subscription:TECH.PubSub.EventSubscription,Event:TECH.PubSub.Event,DispatchType:TECH.PubSub.impl.DispatchType</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	#dim stSubscriptions As %Status = $$$OK
+	try	{
 		Do $ZOBJCLASSMETHOD(Subscription.RespondingClass, Subscription.RespondingMethod, Event)
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		do:(DispatchType=##class(TECH.PubSub.impl.DispatchType).Asynchroon()) ..LogExceptie(Event,Exception,Subscription)
+		do:(DispatchType=##class(TECH.PubSub.impl.DispatchType).Synchroon()) ##class(TECH.ExceptionHandler).Throw(Exception)
+		set stSubscriptions = $$$ERROR($$$GeneralError,"aSubscriptionFailed")		
 	}
-	
-	If $SYSTEM.Status.IsError(sc) Set Logger = ##class(TECH.PubSub.impl.PubSubLogger).%New().ErrorMail("/!\ Error bij het ophalen van de subscriptions /!\",$$ParseStatus^vhLib(sc))
-	
-	Quit $$$OK
+	quit stSubscriptions
 ]]></Implementation>
 </Method>
 
 <Method name="LogEvent">
 <FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	Do ##class(vhLib.Logger).%New("EventLog").Info(Event.%ClassName(1),"Data: "_$$LCVT^vhLib(..GeefGeserializeerdeString(Event)))
+<Implementation><![CDATA[	do ..Logger.Info(Event.%ClassName(1),"Data: "_$$LCVT^vhLib(..GeefGeserializeerdeString(Event)))
 ]]></Implementation>
 </Method>
 
+<Method name="LogExceptie">
+<FormalSpec>Event:TECH.PubSub.Event,Exception:TECH.Exceptions.Exception,Subscription:TECH.PubSub.EventSubscription</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim LogDetail As %String = ..GeefLogDetail(Event,Exception,Subscription)
+	Do ..Logger.ErrorMail(Exception.GeefOmschrijving(), LogDetail)
+]]></Implementation>
+</Method>
+
 <Method name="GeefLogDetail">
 <FormalSpec>Event:TECH.PubSub.Event,Exception:TECH.Exceptions.Exception,Subscription:TECH.PubSub.EventSubscription</FormalSpec>
 <Private>1</Private>
-<ReturnType>%Status</ReturnType>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim LogDetail As %String = ""
 
@@ -103,12 +129,6 @@
 	Quit SerializedObject
 ]]></Implementation>
 </Method>
-
-<Query name="qAlleSubscriptions">
-<Type>%SQLQuery</Type>
-<FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
-<SqlQuery>	SELECT ID FROM TECH_PubSub.EventSubscription WHERE EventType = :Event.Type</SqlQuery>
-</Query>
 </Class>
 
 
Index: TECH/PubSub/EventDispatcher.cls.xml
===================================================================
diff -u
--- TECH/PubSub/EventDispatcher.cls.xml	(revision 0)
+++ TECH/PubSub/EventDispatcher.cls.xml	(revision 1089)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.PubSub.EventDispatcher">
+<Abstract>1</Abstract>
+<Super>TECH.Interface</Super>
+
+<Method name="DispatchEventASync">
+<Abstract>1</Abstract>
+<FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
+<ReturnType>%Status</ReturnType>
+</Method>
+
+<Method name="DispatchEventSync">
+<Abstract>1</Abstract>
+<FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
+<ReturnType>%Status</ReturnType>
+</Method>
+</Class>
+
+
+<Package name="TECH.PubSub" sqlname="TECH_PubSub"/>
+</Export>
Index: TECH/PubSub/WachtendeEventVerwerker.cls.xml
===================================================================
diff -u -r1051 -r1089
--- TECH/PubSub/WachtendeEventVerwerker.cls.xml	(.../WachtendeEventVerwerker.cls.xml)	(revision 1051)
+++ TECH/PubSub/WachtendeEventVerwerker.cls.xml	(.../WachtendeEventVerwerker.cls.xml)	(revision 1089)
@@ -5,7 +5,15 @@
 
 <Method name="VerwerkAlle">
 <Implementation><![CDATA[
-	Lock +^WachtendEventVerwerker
+	Lock +^WachtendEventVerwerker:0
+	if $TEST Do ..StartVerwerking()
+	Lock -^WachtendEventVerwerker
+]]></Implementation>
+</Method>
+
+<Method name="StartVerwerking">
+<Private>1</Private>
+<Implementation><![CDATA[
 	Set ResultSet = ##class(%ResultSet).%New()
 	Do ResultSet.Prepare("SELECT ID FROM TECH_PubSub.WachtendEvent ORDER BY ID ASC")
 	Do ResultSet.Execute()
@@ -58,16 +66,26 @@
 			Set RaiseEvent = ##class(vhConsistency.Checks.Events.ProductOrderLijn).%ExistsId(OrderID_"||"_OrderLijnCode)
 		}
 		
-		If (RaiseEvent)
-		{
-			Do ##class(TECH.Context).Instance().GeefPubSubAPI().GeefEventRaiser().RaiseEventAsync(WachtendEvent.Event)
+		If (RaiseEvent)	{
+			#dim stRaiseEvent As Status = ##class(TECH.Context).Instance().GeefPubSubAPI().GeefEventRaiser().RaiseEventAsync(WachtendEvent.Event)
+			do ..UpdateStatus(WachtendEvent , stRaiseEvent)
 		}
 		#dim Status As %Status = WachtendEvent.%DeleteId(WachtendEvent.%Id())
 		If ($$$ISERR(Status)) $$$ThrowStatus(Status)
 	}
-	Lock -^WachtendEventVerwerker
 ]]></Implementation>
 </Method>
+
+<Method name="UpdateStatus">
+<FormalSpec>Event:TECH.PubSub.WachtendEvent,Status:%Status</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set WachtendEventStatus = ##class(TECH.PubSub.impl.WachtendEventStatus).%New()
+	set WachtendEventStatus.EventID = Event.%Id()
+	set WachtendEventStatus.Status = $select(Status=$$$OK:##class(TECH.PubSub.enu.WachtendEventStatus).Gelukt(),1:##class(TECH.PubSub.enu.WachtendEventStatus).Gefaald())
+	do WachtendEventStatus.Save()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: TECH/PubSub/impl/SimpelEventRaiser.cls.xml
===================================================================
diff -u -r1051 -r1089
--- TECH/PubSub/impl/SimpelEventRaiser.cls.xml	(.../SimpelEventRaiser.cls.xml)	(revision 1051)
+++ TECH/PubSub/impl/SimpelEventRaiser.cls.xml	(.../SimpelEventRaiser.cls.xml)	(revision 1089)
@@ -5,17 +5,34 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>TECH.RegisteredObject,TECH.PubSub.EventRaiser</Super>
 
+<Property name="EventDispatcher">
+<Type>TECH.PubSub.EventDispatcher</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>EventDispatcher:TECH.PubSub.EventDispatcher</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..EventDispatcher = $get(EventDispatcher,##class(TECH.PubSub.impl.EventDispatcher).%New())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="RaiseEventAsync">
 <FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.PubSub.impl.EventDispatcher).%New().DispatchEventASync(Event)
+<Implementation><![CDATA[	Quit ..EventDispatcher.DispatchEventASync(Event)
 ]]></Implementation>
 </Method>
 
 <Method name="RaiseEventSync">
 <FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.PubSub.impl.EventDispatcher).%New().DispatchEventSync(Event)
+<Implementation><![CDATA[	Quit ..EventDispatcher.DispatchEventSync(Event)
 ]]></Implementation>
 </Method>
 
Index: TECH/PubSub/enu/WachtendEventStatus.cls.xml
===================================================================
diff -u
--- TECH/PubSub/enu/WachtendEventStatus.cls.xml	(revision 0)
+++ TECH/PubSub/enu/WachtendEventStatus.cls.xml	(revision 1089)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.PubSub.enu.WachtendEventStatus">
+<ClassType>datatype</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.Enumeration</Super>
+
+<Parameter name="VALUELIST">
+<Default>,Gelukt,Gefaald</Default>
+</Parameter>
+
+<Method name="Gelukt">
+<ClassMethod>1</ClassMethod>
+<ReturnType>TECH.PubSub.enu.WachtendEventStatus</ReturnType>
+<Implementation><![CDATA[	Quit "Gelukt"
+]]></Implementation>
+</Method>
+
+<Method name="Gefaald">
+<ClassMethod>1</ClassMethod>
+<ReturnType>TECH.PubSub.enu.WachtendEventStatus</ReturnType>
+<Implementation><![CDATA[	Quit "Gefaald"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: TECH/PubSub/EventSubscriptionCollector.cls.xml
===================================================================
diff -u
--- TECH/PubSub/EventSubscriptionCollector.cls.xml	(revision 0)
+++ TECH/PubSub/EventSubscriptionCollector.cls.xml	(revision 1089)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.PubSub.EventSubscriptionCollector">
+<Abstract>1</Abstract>
+<Super>TECH.Interface</Super>
+
+<Method name="CollectSubscriptions">
+<Abstract>1</Abstract>
+<ReturnType>TECH.PubSub.EventSubscriptionList</ReturnType>
+</Method>
+</Class>
+
+
+<Package name="TECH.PubSub" sqlname="TECH_PubSub"/>
+</Export>
Index: TECH/PubSub/impl/EventSubscriptionCollector.cls.xml
===================================================================
diff -u
--- TECH/PubSub/impl/EventSubscriptionCollector.cls.xml	(revision 0)
+++ TECH/PubSub/impl/EventSubscriptionCollector.cls.xml	(revision 1089)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.PubSub.impl.EventSubscriptionCollector">
+<Super>TECH.RegisteredObject,TECH.PubSub.EventSubscriptionCollector</Super>
+
+<Property name="Logger">
+<Type>vhLib.Logger</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>SubscriptionCollector:TECH.PubSub.EventSubscriptionCollector</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	set ..Logger = ##class(vhLib.Logger).%New()
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="CollectSubscriptions">
+<FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
+<ReturnType>TECH.PubSub.EventSubscriptionList</ReturnType>
+<Implementation><![CDATA[
+	set SubscriptionList = ##class(TECH.PubSub.EventSubscriptionList).%New()
+	#dim ResultSet As %ResultSet = ..GetSubscriptionResultSet(Event)
+	while ResultSet.Next() {
+		#dim Subscription As TECH.PubSub.EventSubscription = ##class(TECH.PubSub.EventSubscription).%OpenId(ResultSet.GetData(1))
+		do SubscriptionList.Insert(Subscription)
+	}
+	quit SubscriptionList
+]]></Implementation>
+</Method>
+
+<Method name="GetSubscriptionResultSet">
+<FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
+<Private>1</Private>
+<ReturnType>%ResultSet</ReturnType>
+<Implementation><![CDATA[
+	Set ResultSet = ##class(%ResultSet).%New(..%ClassName(1)_":qAlleSubscriptions")
+	#dim stResultSet As %Status = ResultSet.Execute(Event)	
+	do:$SYSTEM.Status.IsError(stResultSet) ..LogExecuteFailed(Event,stResultSet)
+	quit ResultSet
+]]></Implementation>
+</Method>
+
+<Query name="qAlleSubscriptions">
+<Type>%SQLQuery</Type>
+<FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
+<SqlQuery>	SELECT ID FROM TECH_PubSub.EventSubscription WHERE EventType = :Event.Type</SqlQuery>
+</Query>
+
+<Method name="LogExecuteFailed">
+<FormalSpec>Event:TECH.PubSub.Event,Status:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set Detail = ##class(%GlobalCharacterStream).%New()
+	do Detail.WriteLine("Event : "_Event.%ClassName(1))
+	do Detail.WriteLine("Status : "_$$ParseStatus^vhLib(Status))
+	do ..Logger.ErrorMail("Error bij het ophalen van de subscriptions",Detail)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: TECH/PubSub/impl/WachtendEventStatus.cls.xml
===================================================================
diff -u
--- TECH/PubSub/impl/WachtendEventStatus.cls.xml	(revision 0)
+++ TECH/PubSub/impl/WachtendEventStatus.cls.xml	(revision 1089)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.PubSub.impl.WachtendEventStatus">
+<ClassType>persistent</ClassType>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>TECH.Persistent</Super>
+
+<Index name="MainIndex">
+<IdKey>1</IdKey>
+<Properties>EventID</Properties>
+</Index>
+
+<Property name="EventID">
+<Type>%String</Type>
+</Property>
+
+<Property name="Status">
+<Type>%String</Type>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>EventID:%String=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	set ..EventID = EventID
+	quit $$$OK
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DataLocation>^TECH.PubSub583.WachtendEven7B4D</DataLocation>
+<DefaultData>WachtendEventStatusDefaultData</DefaultData>
+<IdLocation>^TECH.PubSub583.WachtendEven7B4D</IdLocation>
+<IndexLocation>^TECH.PubSub583.WachtendEven7B4I</IndexLocation>
+<StreamLocation>^TECH.PubSub583.WachtendEven7B4S</StreamLocation>
+<Data name="WachtendEventStatusDefaultData">
+<Value name="1">
+<Value>%%CLASSNAME</Value>
+</Value>
+<Value name="2">
+<Value>Status</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>
Index: TECH/PubSub/impl/DispatchType.cls.xml
===================================================================
diff -u
--- TECH/PubSub/impl/DispatchType.cls.xml	(revision 0)
+++ TECH/PubSub/impl/DispatchType.cls.xml	(revision 1089)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.PubSub.impl.DispatchType">
+<Super>TECH.Enumeration</Super>
+
+<Parameter name="VALUELIST">
+<Default>;S,A</Default>
+</Parameter>
+
+<Parameter name="DISPLAYLIST">
+<Default>;Synchroon,Asynchroon</Default>
+</Parameter>
+
+<Method name="Synchroon">
+<ClassMethod>1</ClassMethod>
+<ReturnType>TECH.PubSub.impl.DispatchType</ReturnType>
+<Implementation><![CDATA[	Quit "S"
+]]></Implementation>
+</Method>
+
+<Method name="Asynchroon">
+<ClassMethod>1</ClassMethod>
+<ReturnType>TECH.PubSub.impl.DispatchType</ReturnType>
+<Implementation><![CDATA[	Quit "A"
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: TECH/PubSub/EventSubscriptionList.cls.xml
===================================================================
diff -u
--- TECH/PubSub/EventSubscriptionList.cls.xml	(revision 0)
+++ TECH/PubSub/EventSubscriptionList.cls.xml	(revision 1089)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.PubSub.EventSubscriptionList">
+<Super>%ListOfObjects</Super>
+
+<Parameter name="ELEMENTTYPE">
+<Description>
+The type (class name) of the elements stored in the collection.</Description>
+<Default>TECH.PubSub.EventSubscription</Default>
+</Parameter>
+
+<Storage name="Custom">
+<Type>%Library.CompleteCustomStorage</Type>
+</Storage>
+</Class>
+
+
+<Package name="TECH.PubSub" sqlname="TECH_PubSub"/>
+</Export>