Remove the Prometheus socket post-run, some format cleanups

weaveworks · Jul 8, 2019 · ef49edd · ef49edd
1 parent edff414
commit ef49edd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/cmd/ignite-spawn/ignite-spawn.go b/cmd/ignite-spawn/ignite-spawn.go
@@ -67,6 +67,9 @@ func StartVM(co *options) error {
 	// Remove the port mappings post-run
 	defer co.vm.ClearPortMappings()
 
+	// Remove the Prometheus socket post-run
+	defer os.Remove(metricsSocket)
+
 	// Execute Firecracker
 	if err := container.ExecuteFirecracker(co.vm, dhcpIfaces); err != nil {
 		return fmt.Errorf("runtime error for VM %q: %v", co.vm.GetUID(), err)

diff --git a/cmd/ignite/run/stop.go b/cmd/ignite/run/stop.go
@@ -44,5 +44,6 @@ func Stop(so *stopOptions) error {
 			return err
 		}
 	}
+
 	return nil
 }
diff --git a/pkg/operations/remove.go b/pkg/operations/remove.go
@@ -54,6 +54,7 @@ func RemoveVMContainer(vm meta.Object) error {
 // StopVM stops or kills a (potentially running) VM
 func StopVM(vm meta.Object, kill, silent bool) error {
 	dockerArgs := stopArgs
+
 	// Change to kill arguments if requested
 	if kill {
 		dockerArgs = killArgs
@@ -77,5 +78,6 @@ func StopVM(vm meta.Object, kill, silent bool) error {
 	} else {
 		log.Printf("Stopped %s with name %q and ID %q", vm.GetKind(), vm.GetName(), vm.GetUID())
 	}
+
 	return nil
 }