diff --git a/preload/cls/IPM/Installer.cls b/preload/cls/IPM/Installer.cls index 9a865f0a..c1a8e870 100644 --- a/preload/cls/IPM/Installer.cls +++ b/preload/cls/IPM/Installer.cls @@ -95,16 +95,6 @@ ClassMethod Map( quit ##class(%Installer.Manifest).%Generate(%compiledclass, %code, "MapOnly") } -ClassMethod AsyncSetup(Args...) -{ - try { - set tSC = ..setup(Args...) - } catch ex { - set tSC = ex.AsStatus() - } - do $system.Event.Signal($zparent, tSC) -} - ClassMethod ZPMInit( pRegistry As %String = "", pAnalyticsTrackingID As %String = "") @@ -212,31 +202,10 @@ ClassMethod EndCompile(qstruct) As %Status write !,"Installing ZPM" set ts = $zhorolog - set logFile=##class(%File).TempFilename() - job ..AsyncSetup(tModDir, 3):(:::logFile):0 - if '$test { - quit $$$ERROR($$$GeneralError, "Job did not start") - } - - #; Wait setup - set child=$zchild - set tSC = $$$OK - do { - hang 1 - set $listbuild(res, tSC) = $system.Event.WaitMsg("", 10) - quit:res=1 - } while $data(^$job(child)) - - set fs=##class(%Stream.FileCharacter).%New() - set fs.Filename=logFile - while 'fs.AtEnd { - write !,fs.ReadLine() - } - if ##class(%File).Delete(logFile) - + set sc = ..setup(tModDir, 3) write !,"Time spent ",$zhorolog - ts - quit tSC + quit sc } /// Check currently installed version, if any