Index: vhLib/Logging.cls.xml
===================================================================
diff -u -r3366 -r3883
--- vhLib/Logging.cls.xml	(.../Logging.cls.xml)	(revision 3366)
+++ vhLib/Logging.cls.xml	(.../Logging.cls.xml)	(revision 3883)
@@ -36,6 +36,17 @@
 <Type>%Time</Type>
 </Property>
 
+<Property name="UTCTijdstip">
+<Type>%String</Type>
+<Calculated>1</Calculated>
+<SqlComputeCode> Set {*}= $ZDT( {datum}_","_{tijd},3,7 ) </SqlComputeCode>
+<SqlComputed>1</SqlComputed>
+</Property>
+
+<Property name="SequenceId">
+<Type>%BigInt</Type>
+</Property>
+
 <Property name="Niveau">
 <Description>
 "E" = error
@@ -209,6 +220,10 @@
 <Properties>CspSessionId</Properties>
 </Index>
 
+<Index name="IndexOnSequenceId">
+<Properties>SequenceId</Properties>
+</Index>
+
 <Method name="AAACompilerFirst">
 <ClassMethod>1</ClassMethod>
 <CodeMode>objectgenerator</CodeMode>
@@ -229,16 +244,21 @@
 		Do ##class(TECH.Exceptions.GekendeExceptieMatcher).%New().KoppelErrorLog( oLog )
 		Set SendMail = (SendMail && oLog.TeBehandelen)
 	} Catch {
-		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		Do ##class(vhLib.Logger).%New().LogEnMailExceptie(Exception)
+		Try {
+			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+			Do ##class(vhLib.Logger).%New().LogEnMailExceptie(Exception)
+		} Catch {} 
 	} // Het log-item saven, is belangrijker dan de eventuele koppel-exceptie te behandelen.
 	#dim scSave As %Status = oLog.%Save()
-	Set oLog.Detail = "Maak een nieuwe gekende exceptie"_$$$CRLF _ ..GeefMaakGekendeExceptieUrl(oLog) _ $$$CRLF_ $$$CRLF _ oLog.Detail
+	
+	Try {
+    	Set oLog.Detail = "Maak een nieuwe gekende exceptie"_$$$CRLF _ ..GeefMaakGekendeExceptieUrl(oLog) _ $$$CRLF_ $$$CRLF _ oLog.Detail
+	} Catch {} // Geen error handling hier, om niet in een eindeloze recursie te belanden.
 
     #dim ServerPrefix As %String = "["_$$$UCase($$$Server)_"] "
 
 	#dim Subject As %String = ServerPrefix _ $S(Niveau="I":"Info",Niveau="E":"Error",Niveau="W":"Warning",Niveau="D":"Debug",1:"")_" - "
-	Set Subject = Subject _ oLog.Groep_" : "_ Actie _ " - " _ $ZDT($H,4)
+	Set Subject = Subject _ oLog.Groep_" : "_ Actie _ " - SessionID: " _ oLog.SessionID _ " - " _ $ZDT($H,4)
 	
 	; voortijdige quit indien een fout bij het opslaan van de log
 	
@@ -247,13 +267,14 @@
 	If ( scSave ) && ( SendMail ) & ( Niveau '= "D" ){
 		#dim Body As %GlobalCharacterStream = ##class(%GlobalCharacterStream).%New()
 		Do Body.WriteLine($$GetJobInfo^vhLib.System())
+		Do Body.WriteLine("SessionID: " _ oLog.SessionID)
 		Do Body.WriteLine("")
 		;Do Body.CopyFrom(oLog.GenMailBody())
 		Do Body.WriteLine(oLog.Detail)
 		Do oLogger.GetMailFields(.From,.lbTo,.Subject,)
 		Do SendMiniMailForced^vhLib.Mail(From,lbTo,Subject,Body,1,,,,)
 	}
-	
+    
 	If Niveau="D" Do oLog.DebugWindow()
 	
 	Quit oLog
@@ -293,20 +314,15 @@
 	set ..GebruikerID = ##class(TECH.Context.RuntimeContext).Instance().GeefGebruikerID()
 	set ..Gebruiker = ##class(TECH.Context.RuntimeContext).Instance().GeefGebruikerInitialen()
 	set ..SessionID = ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()
-	If ..SessionID '= "" {
-		Try {
-			Set ..ClientAdres = ##class(APPS.algemeen.VhintraShell.SessionService).%New().GeefClientAdresVoorSessieSleutel(..SessionID)
-		} Catch	{
-			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		}
-	}
+	Set ..SequenceId = $Increment(^vhLib.LoggingSequence)	
+	
 
-	if $IsObject(Detail) { 
-		set ..DetailAsStream = Detail 
-		set ..Detail = Detail.Read(10000)
+	if $IsObject(Detail) {
+		Do ..DetailAsStream.CopyFrom(Detail)
+		Do Detail.Rewind()
+		set ..Detail = Detail.Read(10000) // Dubbel..
 		do Detail.Rewind()
-	}
-	else  {	
+	} else {	
 		Set ..Detail = Detail	
 		do ..DetailAsStream.WriteLine(Detail) 
 	}
@@ -321,6 +337,39 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VoegToeNativeLogItem">
+<Description>
+Deze method mag geen ConfigMgr-acties oproepen. </Description>
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Groep:%String,Niveau:vhLib.enu.LogNiveau,Actie:%String,Detail:%String</FormalSpec>
+<Implementation><![CDATA[
+	#dim CurrentHorolog As %String = $H
+
+	Set LogItem = ##class(vhLib.Logging).%New()
+
+	Set LogItem.Datum = +CurrentHorolog
+	Set LogItem.Tijd = $P(CurrentHorolog,",",2)
+	Set LogItem.Server = $$$Server
+	Set LogItem.Namespace = $$$NSpace 
+	Set LogItem.Groep = $G(Groep)
+	Set LogItem.MainIndex = LogItem.Server_"_"_LogItem.Namespace
+	Do LogItem.SetSubID()
+	Set LogItem.JobID = $Job
+	Set LogItem.Niveau = $G(Niveau)
+	Set LogItem.ProgLabel = ""
+	Set LogItem.Actie = $G(Actie)
+	Set LogItem.Detail = Detail	
+	Do LogItem.DetailAsStream.WriteLine(Detail) 
+
+	Set LogItem.Applicatie = ##class(TECH.Context.RuntimeContext).Instance().GeefApplicatie()
+	Set LogItem.GebruikerID = ##class(TECH.Context.RuntimeContext).Instance().GeefGebruikerID()
+	Set LogItem.Gebruiker = ""
+	Set LogItem.SessionID = ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()
+
+	#dim scSave As %Status = LogItem.%Save()
+]]></Implementation>
+</Method>
+
 <Method name="GetJobInfo">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>blnMultiLine:%String,Indent:%String</FormalSpec>
@@ -366,6 +415,24 @@
 ]]></Implementation>
 </Method>
 
+<Method name="%OnAfterSave">
+<FormalSpec>insert:%Boolean</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ##class(vhLib.LoggingGetalIndex).BouwOpVoorLogEntry(##this)
+	Quit ##super(insert)
+]]></Implementation>
+</Method>
+
+<Method name="DeleteLogging">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>oid:%ObjectIdentity</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	Quit ##class(vhLib.Logging).%DeleteId(oid)
+]]></Implementation>
+</Method>
+
 <Storage name="Default">
 <Type>%Library.CacheStorage</Type>
 <DataLocation>^LOG.vhLib.LoggingD</DataLocation>
@@ -443,6 +510,9 @@
 <Value name="23">
 <Value>CspSessionId</Value>
 </Value>
+<Value name="24">
+<Value>SequenceId</Value>
+</Value>
 </Data>
 <Property name="%%CLASSNAME"/>
 <Property name="Actie"/>