瀏覽代碼

using as flag of the up command, watch was blocking process shutdown
This happened when sunsetting the application from docker compose down command

Signed-off-by: Guillaume Lours <[email protected]>

Guillaume Lours 1 年之前
父節點
當前提交
e1fd7a6567
共有 1 個文件被更改,包括 2 次插入4 次删除
  1. 2 4
      pkg/compose/watch.go

+ 2 - 4
pkg/compose/watch.go

@@ -183,15 +183,13 @@ func (s *composeService) watch(ctx context.Context, syncChannel chan bool, proje
 	}
 	options.LogTo.Log(api.WatchLogger, "Watch enabled")
 
-	err = eg.Wait()
 	for {
 		select {
 		case <-ctx.Done():
-			return err
+			return eg.Wait()
 		case <-syncChannel:
 			options.LogTo.Log(api.WatchLogger, "Watch disabled")
-			ctx.Done()
-			return err
+			return nil
 		}
 	}
 }