Skip to content

fix: ensure subprocesses are canceled correctly when the main process is terminated #104

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

Merged
josegonzalez merged 1 commit into from
Jul 8, 2023
Merged

fix: ensure subprocesses are canceled correctly when the main process is terminated #104

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
34 changes: 30 additions & 4 deletions builders/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ import (
"html/template"
"io/ioutil"
"os"
"os/signal"
"path/filepath"
"strconv"
"strings"

"lambda-builder/io"

execute "github.com/alexellis/go-execute/pkg/v1"
execute "github.com/alexellis/go-execute/pkg/v2"
extract "github.com/codeclysm/extract/v3"
"gopkg.in/yaml.v2"
)
Expand Down Expand Up @@ -170,14 +171,23 @@ func executeBuildContainer(script string, config Config) error {
"--force",
buildImageTag,
}

signals := make(chan os.Signal, 1)
signal.Notify(signals, os.Interrupt)
ctx, cancel := context.WithCancel(context.Background())
go func() {
<-signals
cancel()
}()

cmd := execute.ExecTask{
Args: args,
Command: "docker",
Cwd: config.WorkingDirectory,
StreamStdio: !config.RunQuiet,
}

if _, err := cmd.Execute(); err != nil {
if _, err := cmd.Execute(ctx); err != nil {
fmt.Printf(" Error cleaning up build image: %s", err.Error())
}
}()
Expand Down Expand Up @@ -232,14 +242,22 @@ func extractLambdaFromBuildImage(config Config) error {

args = append(args, fmt.Sprintf("%s-build", config.GetImageTag()), "/bin/bash", "-c", "mv /var/task/lambda.zip /tmp/task/lambda.zip")

signals := make(chan os.Signal, 1)
signal.Notify(signals, os.Interrupt)
ctx, cancel := context.WithCancel(context.Background())
go func() {
<-signals
cancel()
}()

cmd := execute.ExecTask{
Args: args,
Command: "docker",
Cwd: config.WorkingDirectory,
StreamStdio: !config.RunQuiet,
}

res, err := cmd.Execute()
res, err := cmd.Execute(ctx)
if err != nil {
return fmt.Errorf("error executing builder: %w", err)
}
Expand Down Expand Up @@ -306,14 +324,22 @@ func buildDockerImage(directory string, config Config, phase string, dockerfileP

args = append(args, directory)

signals := make(chan os.Signal, 1)
signal.Notify(signals, os.Interrupt)
ctx, cancel := context.WithCancel(context.Background())
go func() {
<-signals
cancel()
}()

cmd := execute.ExecTask{
Args: args,
Command: "docker",
Cwd: config.WorkingDirectory,
StreamStdio: !config.RunQuiet,
}

res, err := cmd.Execute()
res, err := cmd.Execute(ctx)
if err != nil {
return fmt.Errorf("error building image: %w", err)
}
Expand Down