Skip to content

fix: installer runs synchronously #1221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
isc-tleavitt wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: installer runs synchronously #1221

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 2 additions & 33 deletions preload/cls/IPM/Installer.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "")
Expand Down Expand Up @@ -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
Expand Down
Loading