particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jobsite/builder: move process into builder

Browse source 
Moves the background process into the builder struct in preparation for
using `sync.Once`.
This commit is contained in:
Simon de Vlieger 2024-02-12 10:33:09 +01:00 • committed by Sanne Raymaekers
parent 3cf2531ae2
commit 95b4979d88
1 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

37
cmd/osbuild-jobsite-builder/main.go
View file

@ -87,6 +87,7 @@ type Builder struct {
State State State State
StateLock sync.Mutex StateLock sync.Mutex
StateChannel chan State StateChannel chan State
Build *BackgroundProcess
} }
type BackgroundProcess struct { type BackgroundProcess struct {
@ -97,10 +98,6 @@ type BackgroundProcess struct {
Error error Error error
} }
var (
Build *BackgroundProcess
)
func (builder *Builder) SetState(state State) { func (builder *Builder) SetState(state State) {
builder.StateLock.Lock() builder.StateLock.Lock()
defer builder.StateLock.Unlock() defer builder.StateLock.Unlock()
@ -234,7 +231,7 @@ func (builder *Builder) HandleBuild(w http.ResponseWriter, r *http.Request) erro
return fmt.Errorf("HandleBuild: Failed to decode body") return fmt.Errorf("HandleBuild: Failed to decode body")
} }
if Build != nil { if builder.Build != nil {
logrus.Fatal("HandleBuild: Build started but Build was non-nil") logrus.Fatal("HandleBuild: Build started but Build was non-nil")
} }
@ -255,40 +252,40 @@ func (builder *Builder) HandleBuild(w http.ResponseWriter, r *http.Request) erro
envs := os.Environ() envs := os.Environ()
envs = append(envs, buildRequest.Environments...) envs = append(envs, buildRequest.Environments...)
Build = &BackgroundProcess{} builder.Build = &BackgroundProcess{}
Build.Process = exec.Command( builder.Build.Process = exec.Command(
"/usr/bin/osbuild", "/usr/bin/osbuild",
args..., args...,
) )
Build.Process.Env = envs builder.Build.Process.Env = envs
logrus.Infof("BackgroundProcess: Starting %s with %s", Build.Process, envs) logrus.Infof("BackgroundProcess: Starting %s with %s", builder.Build.Process, envs)
Build.Stdout, err = Build.Process.StdoutPipe() builder.Build.Stdout, err = builder.Build.Process.StdoutPipe()
if err != nil { if err != nil {
logrus.Fatal(err) logrus.Fatal(err)
} }
Build.Stderr, err = Build.Process.StderrPipe() builder.Build.Stderr, err = builder.Build.Process.StderrPipe()
if err != nil { if err != nil {
return err return err
} }
if err := Build.Process.Start(); err != nil { if err := builder.Build.Process.Start(); err != nil {
return fmt.Errorf("BackgroundProcess: Failed to start process") return fmt.Errorf("BackgroundProcess: Failed to start process")
} }
go func() { go func() {
Build.Error = Build.Process.Wait() builder.Build.Error = builder.Build.Process.Wait()
Build.Done = true builder.Build.Done = true
logrus.Info("BackgroundProcess: Exited") logrus.Info("BackgroundProcess: Exited")
}() }()
go func() { go func() {
scanner := bufio.NewScanner(Build.Stdout) scanner := bufio.NewScanner(builder.Build.Stdout)
for scanner.Scan() { for scanner.Scan() {
m := scanner.Text() m := scanner.Text()
logrus.Infof("BackgroundProcess: Stdout: %s", m) logrus.Infof("BackgroundProcess: Stdout: %s", m)
@ -296,7 +293,7 @@ func (builder *Builder) HandleBuild(w http.ResponseWriter, r *http.Request) erro
}() }()
go func() { go func() {
scanner := bufio.NewScanner(Build.Stderr) scanner := bufio.NewScanner(builder.Build.Stderr)
for scanner.Scan() { for scanner.Scan() {
m := scanner.Text() m := scanner.Text()
logrus.Infof("BackgroundProcess: Stderr: %s", m) logrus.Infof("BackgroundProcess: Stderr: %s", m)
@ -317,15 +314,15 @@ func (builder *Builder) HandleProgress(w http.ResponseWriter, r *http.Request) e
return fmt.Errorf("Builder.HandleProgress: Unexpected request method") return fmt.Errorf("Builder.HandleProgress: Unexpected request method")
} }
if Build == nil { if builder.Build == nil {
return fmt.Errorf("HandleProgress: Progress requested but Build was nil") return fmt.Errorf("HandleProgress: Progress requested but Build was nil")
} }
if Build.Done { if builder.Build.Done {
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
if Build.Error != nil { if builder.Build.Error != nil {
return fmt.Errorf("Builder.HandleBuild: Buildprocess exited with error: %s", Build.Error) return fmt.Errorf("Builder.HandleBuild: Buildprocess exited with error: %s", builder.Build.Error)
} }
builder.SetState(StateExport) builder.SetState(StateExport)