Index: BL/Sys/FOP/SchedulerAbstract.cls.xml =================================================================== diff -u -r29059 -r66530 --- BL/Sys/FOP/SchedulerAbstract.cls.xml (.../SchedulerAbstract.cls.xml) (revision 29059) +++ BL/Sys/FOP/SchedulerAbstract.cls.xml (.../SchedulerAbstract.cls.xml) (revision 66530) @@ -176,7 +176,7 @@ Lock -@("^"_..#ClassNm) ; unlock Job ClassMethod^vhLib.Thread(..#ClassNm,"Schedule") Set NewPID=$ZCHILD - d WLIP^vhDBG(97,"Scheduler started (from $J="_$J_") in New PID "_NewPID) + ;d WLIP^vhDBG(97,"Scheduler started (from $J="_$J_") in New PID "_NewPID) Hang 1 ; 1 seconde wachten Quit ]]> @@ -202,7 +202,7 @@ cbtHandleBusyTask() ; Possible actions: Send mail / Increase MaxBusyTime / Set Status to $$$qsError / Kill process / Restart Task (?) / Ignore / ... Set msg="Max. Busy Time overschreden: QItem "_QItem.%Id()_" started on "_QItem.Started_" and is running for "_DeltaT_" seconds ("_$$cbtFormatTime(DeltaT)_")" - d WL^vhDBG(msg) + ;d WL^vhDBG(msg) ; TO DO: other actions ... ; *** Kill the running process. Else, it might run until eternity :-P If 0 && QItem.ThreadedPID Do @@ -247,24 +247,24 @@ @@ -258,7 +258,7 @@ Set sc=tmpStream.LinkToFile(FilePath) If $$$ISOK(sc) Do . Do FStream.CopyFrom(tmpStream) - . d WL^vhDBG("Stream from file "_FilePath_" Size: "_tmpStream.Size) + . ;d WL^vhDBG("Stream from file "_FilePath_" Size: "_tmpStream.Size) Else Do . d WL^vhDBG("Fout bij openen van de FileStream: LinkToFile="_$$ParseStatus^vhLib(sc)) . Set FStream="" @@ -277,7 +277,7 @@ Else Do Quit . Set ..ErrorStatus=$$$ERROR($$$GeneralError,"Foutief type voor BuildProxyFromDoc") - d WL^vhDBG("BuildProxyFromDoc class="_BLClassName_" method="_BLMethod) + ;d WL^vhDBG("BuildProxyFromDoc class="_BLClassName_" method="_BLMethod) Set blProxy=$zobjclassmethod(BLClassName,"Instantiate") ; ,%this) Do blProxy.InitProxy($$bpdGetProxySettings()) ; Init(...) ;d WL^vhDBG("Proxy Settings "_$$$LCVT($$ObjectArrayToLB^vhLib(blProxy.ProxySettings))) Index: BL/Sys/FOP/Test.cls.xml =================================================================== diff -u -r29059 -r66530 --- BL/Sys/FOP/Test.cls.xml (.../Test.cls.xml) (revision 29059) +++ BL/Sys/FOP/Test.cls.xml (.../Test.cls.xml) (revision 66530) @@ -128,7 +128,7 @@ 1 %Status SOAPService niet actief/bereikbaar - d:(blnPeek) WL^vhDBG($G(%PrefixWL)_"PeekServer OK") + ;d:(blnPeek) WL^vhDBG($G(%PrefixWL)_"PeekServer OK") ;Do cl.SetLocation($S(locIndx>0:$LG(lbLocs,locIndx),1:"")) ; Only one location, i.e. the default is already set Do cl.SetTimeOut($G(TimeOut,60)) If $G(%blnProxy,0) Do - . d WL^vhDBG("Set Proxy") + . ;d WL^vhDBG("Set Proxy") . Set cl.HttpProxyServer="192.168.1.97" . Set cl.HttpProxyPort=8888 ;If $G(%blnProxy,..#UseProxy) Do @@ -871,8 +871,8 @@ Set sc=$$ProxyToXMLStream^vhLib(pxDoc,.DataStream, "DOCS", 0) ; blnIndentTags=0 Quit:($$$ISERR(sc)) sc - d WL^vhDBG("pxDoc") - d WL^vhDBG($$ObjToText^vhLib(pxDoc)) + ;d WL^vhDBG("pxDoc") + ;d WL^vhDBG($$ObjToText^vhLib(pxDoc)) ;Set scDebug=$$rppStreamToFile() @@ -911,7 +911,7 @@ 1 %Status ^BL.Sys.FOP.TestI ^BL.Sys.FOP.TestS -listnode - %%CLASSNAME Index: BL/Sys/FOP/Data.cls.xml =================================================================== diff -u -r29059 -r66530 --- BL/Sys/FOP/Data.cls.xml (.../Data.cls.xml) (revision 29059) +++ BL/Sys/FOP/Data.cls.xml (.../Data.cls.xml) (revision 66530) @@ -39,7 +39,7 @@ @@ -208,7 +208,7 @@ SOAPService niet actief/bereikbaar - d:(blnPeek) WL^vhDBG($G(%PrefixWL)_"PeekServer OK") + ;d:(blnPeek) WL^vhDBG($G(%PrefixWL)_"PeekServer OK") ;Do cl.SetLocation($S(locIndx>0:$LG(lbLocs,locIndx),1:"")) ; Only one location, i.e. the default is already set Do cl.SetTimeOut($G(TimeOut,60)) Set cl.HttpUsername="uta" Set cl.HttpPassword="uta" If $G(%blnProxy,..#UseProxy)||($G($$$globSettingUseProxy,..#UseProxy)) Do - . d WL^vhDBG("Set Proxy") + . ;d WL^vhDBG("Set Proxy") . Set cl.HttpProxyServer=$G($$$globSettingUseProxySub("ProxyServer"),..#ProxyServer) . Set cl.HttpProxyPort=$G($$$globSettingUseProxySub("ProxyPort"),..#ProxyPort) Quit $$$OK @@ -767,9 +767,9 @@ Set sc=..PrepareWSClient(ProcSvc,.TimeOut,.blnPeek) Quit:($$$ISERR(sc)) sc ;d WL^vhDBG("SOAP Client class: "_ProcSvc_$$$CRLF_$$ObjToText^vhLib(ProcSvc)) - d WL^vhDBG($G(%PrefixWL)_"Invoke DocBase WS ""fopRes=ProcSvc.doSeededTasks(fopReq)"" ... ") + ;d WL^vhDBG($G(%PrefixWL)_"Invoke DocBase WS ""fopRes=ProcSvc.doSeededTasks(fopReq)"" ... ") Do cwpFopProcessSub() - d WL^vhDBG($G(%PrefixWL)_"Finished DocBase CallWSProcess(); Result: "_$G(fopRes)) + ;d WL^vhDBG($G(%PrefixWL)_"Finished DocBase CallWSProcess(); Result: "_$G(fopRes)) Quit sc cwpFopProcessSub() Set fopRes="" @@ -942,7 +942,7 @@ ;New sLog,ResourceID Set $ZTRAP="sfsErrorFeedback" Set blnStatusFailed=($G(Status)=$$$adbResultFAILED)||($G(Status)=$$$adbResultFAILEDlong) - Do WLIP^vhDBG(97,$G(%PrefixWL)_"OnSendFOPStatus triggered for "_$G(DocBaseID)_$$$CRLF_"SFS Status="_$S(blnStatusFailed:"F(ailed)", 1:$G(Status))) + ;Do WLIP^vhDBG(97,$G(%PrefixWL)_"OnSendFOPStatus triggered for "_$G(DocBaseID)_$$$CRLF_"SFS Status="_$S(blnStatusFailed:"F(ailed)", 1:$G(Status))) Set ResourceID=..ResourceNameFromJobID($G(DocBaseID)) ZTRAP:(ResourceID="") "NoID" ; this triggers the error trapping ;Quit:(ResourceID="") ; ZTrap:() causes to quit this method @@ -959,7 +959,7 @@ ; Nothing to signal: ; - Async without wait --> Resource not defined ; - Async wait timed out --> Resource already deleted - Do WL^vhDBG("Resource=UNDEF : "_ResourceID) + ;Do WL^vhDBG("Resource=UNDEF : "_ResourceID) Do sfsAddToTempLog("Resource=UNDEF") ; Retry after about 1,5,10 sec, in case of a delayed resource creation. ; This should be done in a separate Job/thread. Index: BL/Sys/FOP/Interface.cls.xml =================================================================== diff -u -r45322 -r66530 --- BL/Sys/FOP/Interface.cls.xml (.../Interface.cls.xml) (revision 45322) +++ BL/Sys/FOP/Interface.cls.xml (.../Interface.cls.xml) (revision 66530) @@ -109,19 +109,19 @@ %Status @@ -138,17 +138,17 @@ %Status finish Task "_$G(QItemID)) ;w "Waiting for Signal from Scheduler --> finish Task "_$G(QItemID),! + ;d WL^vhDBG("Scheduler triggered to run Task "_$G(QItemID)_" in new thread") ;w "Scheduler triggered to run Task "_$G(QItemID)_" in new thread",! + ;d WL^vhDBG("Waiting for Signal from Scheduler --> finish Task "_$G(QItemID)) ;w "Waiting for Signal from Scheduler --> finish Task "_$G(QItemID),! Set Ok=##class(Scheduler).WaitForSignal(TimeOut) If Ok'=1 Do Quit sc . Set sc=$$$ERROR($$$GeneralError,"Error waiting for signal for Finish of Task "_Task.%Id()_" QItem:"_$G(QItemID)) ; Else Do - d WL^vhDBG("Finished processing Task "_$G(QItemID)) ;w "Finished processing Task "_$G(QItemID),! + ;d WL^vhDBG("Finished processing Task "_$G(QItemID)) ;w "Finished processing Task "_$G(QItemID),! ;Set sc=##class(Verwerker).GetResult() Quit sc ]]> @@ -183,13 +183,13 @@ %Status @@ -207,7 +207,7 @@ Set sc=..AddToQueue(Task) If $$$ISERR(sc)&&(sc=$$$ErrorNextOnQueue) Do . ; Could not run task from Queue. Start task immediatly. [for development stages ONLY ] - . d WL^vhDBG("added to queue, but will need to run directly (sync)") + . ;d WL^vhDBG("added to queue, but will need to run directly (sync)") . Set:($G(%objlasterror)=$$$ErrorNextOnQueue) %objlasterror="" . Set sc=..RunTask(Task) Else If $$$ISERR(sc) Do