1. docker
  2. Commit 54b44e3705046a27402536ce9f9ab70d71cd403d
Browse code

Make sure that Deregister really returns an error instead of just displaying it

creack authored on 2013/03/15 19:07:33
Showing 1 changed files
docker.go
History View file @ 54b44e3
... ... 
@@ -74,14 +74,14 @@ func (docker *Docker) Destroy(container *Container) error {
74 74 
 	}
75 75 
 	if container.Mountpoint.Mounted() {
76 76 
 		if err := container.Mountpoint.Umount(); err != nil {
77 
-			log.Printf("Unable to umount container %v: %v", container.Id, err)
77 
+			return fmt.Errorf("Unable to umount container %v: %v", container.Id, err)
78 78 
 		}
79 79 
 	}
80 80 
 	if err := container.Mountpoint.Deregister(); err != nil {
81 
-		log.Printf("Unable to deregiser mountpoint %v: %v", container.Mountpoint.Root, err)
81 
+		return fmt.Errorf("Unable to deregiser -- ? mountpoint %v: %v", container.Mountpoint.Root, err)
82 82 
 	}
83 83 
 	if err := os.RemoveAll(container.Root); err != nil {
84 
-		log.Printf("Unable to remove filesystem for %v: %v", container.Id, err)
84 
+		return fmt.Errorf("Unable to remove filesystem for %v: %v", container.Id, err)
85 85 
 	}
86 86 
 	docker.containers.Remove(element)
87 87 
 	return nil