Skip to content

Gracefully shut down container when we want logs #392

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
erikjohnston merged 2 commits into from
Jun 10, 2022
Merged

Gracefully shut down container when we want logs #392

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85dcac8
Gracefully shut down container when we want logs
erikjohnston Jun 10, 2022
15c4eda
Sensible variable naming
erikjohnston Jun 10, 2022
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
20 changes: 15 additions & 5 deletions internal/docker/deployer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,23 @@ func (d *Deployer) Deploy(ctx context.Context, blueprintName string) (*Deploymen
func (d *Deployer) Destroy(dep *Deployment, printServerLogs bool) {
for _, hsDep := range dep.HS {
if printServerLogs {
// If we want the logs we gracefully stop the containers to allow
// the logs to be flushed.
x := 1 * time.Second
err := d.Docker.ContainerStop(context.Background(), hsDep.ContainerID, &x)
if err != nil {
log.Printf("Destroy: Failed to destroy container %s : %s\n", hsDep.ContainerID, err)
}

printLogs(d.Docker, hsDep.ContainerID, hsDep.ContainerID)
} else {
err := d.Docker.ContainerKill(context.Background(), hsDep.ContainerID, "KILL")
if err != nil {
log.Printf("Destroy: Failed to destroy container %s : %s\n", hsDep.ContainerID, err)
}
}
err := d.Docker.ContainerKill(context.Background(), hsDep.ContainerID, "KILL")
if err != nil {
log.Printf("Destroy: Failed to destroy container %s : %s\n", hsDep.ContainerID, err)
}
err = d.Docker.ContainerRemove(context.Background(), hsDep.ContainerID, types.ContainerRemoveOptions{

err := d.Docker.ContainerRemove(context.Background(), hsDep.ContainerID, types.ContainerRemoveOptions{
Force: true,
})
if err != nil {
Expand Down