Merge pull request #368 from twelho/containerd-improvements

containerd backend improvements
weaveworks · Aug 30, 2019 · 3dee0c7 · 3dee0c7
2 parents f042d9a + e0ffbc6
commit 3dee0c7
Show file tree

Hide file tree

Showing 4 changed files with 430 additions and 71 deletions.
diff --git a/pkg/container/firecracker.go b/pkg/container/firecracker.go
@@ -153,7 +153,7 @@ func installSignalHandlers(ctx context.Context, m *firecracker.Machine) {
 		for {
 			switch s := <-c; {
 			case s == syscall.SIGTERM || s == os.Interrupt:
-				fmt.Println("Caught SIGINT, requesting clean shutdown")
+				fmt.Println("Caught SIGTERM, requesting clean shutdown")
 				m.Shutdown(ctx)
 				time.Sleep(constants.STOP_TIMEOUT * time.Second)
 
@@ -164,7 +164,7 @@ func installSignalHandlers(ctx context.Context, m *firecracker.Machine) {
 					m.StopVMM()
 				}
 			case s == syscall.SIGQUIT:
-				fmt.Println("Caught SIGTERM, forcing shutdown")
+				fmt.Println("Caught SIGQUIT, forcing shutdown")
 				m.StopVMM()
 			}
 		}