Index: WS/WebService.cls.xml
===================================================================
diff -u -r3007 -r3009
--- WS/WebService.cls.xml	(.../WebService.cls.xml)	(revision 3007)
+++ WS/WebService.cls.xml	(.../WebService.cls.xml)	(revision 3009)
@@ -74,7 +74,8 @@
 		#; Process as SOAP or HTTP page
 		Set tAction=$Get(%request.CgiEnvs("HTTP_SOAPACTION"))
 		If tAction'="" {
-			do ..LogStream(%request.Content,"IN")
+			Set ClassName = ..%ClassName(1)
+			do ##class(WS.WebserviceLogger).LogStream(%request.Content,"IN",ClassName)
 			Do service.ProcessSOAP($$$URLDECODE(tAction),%request.Content)
 		} Else {
 			Do service.ProcessHTTP()
@@ -105,58 +106,10 @@
 	while 'Stream.AtEnd {
 		write Stream.Read()
 	}	
-	do ..LogStream(Stream,"OUT")
+	Set ClassName = ..%ClassName(1)
+	do ##class(WS.WebserviceLogger).LogStream(Stream,"OUT",ClassName)
 	quit sc
 ]]></Implementation>
 </Method>
-
-<Method name="LogStream">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>Stream:%Stream,Direction:%String</FormalSpec>
-<Implementation><![CDATA[
-	set Path = ##class(TECH.Config.ConfigMgr).Instance().GetString("DefaultExportDirectory")
-	set Timestamp =$tr($zdt($ZU(188),8,,3),":","")
-	
-	set Webmethod = $Get(%request.CgiEnvs("HTTP_SOAPACTION"))
-	set Webmethod = $Piece($Piece(Webmethod,".",$length(Webmethod,".")),"""")
-	
-	Set ClassName = ..%ClassName(1)
-	
-	If (..IsLoggingNodig(ClassName, Webmethod))
-	{
-		set Counter = $increment(^zWS.Logger(ClassName_" "_Webmethod))
-		if Counter < 201 {
-			set Filename = ##class(TECH.Files).AppendFile(Path,ClassName_"\"_Webmethod_"\"_$job_Direction_Timestamp_$Random(10000)_".log")	
-			set FileWriter = ##class(TECH.File.FileWriter).%New(Filename)
-			
-			Do FileWriter.WriteStream(Stream)
-			Do FileWriter.Close()
-		
-			do Stream.Rewind()
-		}
-	}
-]]></Implementation>
-</Method>
-
-<Method name="IsLoggingNodig">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>ClassName:%String,Webmethod:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[
-	Set IsLoggingNodig = 0
-	If (##class(TECH.Config.ConfigMgr).Instance().GetBoolean("WS.WebService.Log")){
-		If $Data(^TECH.Config.LogAlleWebservices){
-			Set IsLoggingNodig = ^TECH.Config.LogAlleWebservices
-			If ('IsLoggingNodig){
-				If $Data(^TECH.Config.LogWebservice(ClassName)){
-					Set IsLoggingNodig = ^TECH.Config.LogWebservice(ClassName)
-				}
-			}
-		}
-	}
-	Quit IsLoggingNodig
-]]></Implementation>
-</Method>
 </Class>
 </Export>