Quellcode durchsuchen

Merge pull request #2662 from dotcloud/do_not_cleanup_start_if_running

on docker start, do not cleanup if already running
Victor Vieux vor 11 Jahren
Ursprung
Commit
71c05bb87c
1 geänderte Dateien mit 3 neuen und 4 gelöschten Zeilen
  1. 3 4
      container.go

+ 3 - 4
container.go

@@ -702,15 +702,14 @@ func (container *Container) Attach(stdin io.ReadCloser, stdinCloser io.Closer, s
 func (container *Container) Start() (err error) {
 func (container *Container) Start() (err error) {
 	container.State.Lock()
 	container.State.Lock()
 	defer container.State.Unlock()
 	defer container.State.Unlock()
+	if container.State.Running {
+		return fmt.Errorf("The container %s is already running.", container.ID)
+	}
 	defer func() {
 	defer func() {
 		if err != nil {
 		if err != nil {
 			container.cleanup()
 			container.cleanup()
 		}
 		}
 	}()
 	}()
-
-	if container.State.Running {
-		return fmt.Errorf("The container %s is already running.", container.ID)
-	}
 	if err := container.EnsureMounted(); err != nil {
 	if err := container.EnsureMounted(); err != nil {
 		return err
 		return err
 	}
 	}