Improve logging when there are other tasks running locally

Author: efekarakus

ecs-cli/modules/cli/local/local_app.go

@@ -38,7 +38,10 @@ func Create(c *cli.Context) {
 // If the container is not running, this command creates a new network for all local ECS tasks to join
 // and communicate with the Amazon ECS Local Endpoints container.
 func Up(c *cli.Context) {
-	docker, err := client.NewEnvClient() // Temporary client created to test network.Setup()
+	// TODO move these clients to a separate file leveraging the DOCKER_API_VERSION,
+	// these clients are created to test the local network for now.
+	// See https://github.com/awslabs/amazon-ecs-local-container-endpoints/blob/master/local-container-endpoints/clients/docker/client.go#L49
+	docker, err := client.NewEnvClient()
 	if err != nil {
 		logrus.Fatal("Could not connect to docker", err)
 	}
@@ -49,7 +52,10 @@ func Up(c *cli.Context) {
 //
 // If the user stops the last running task in the local network then also remove the network.
 func Stop(c *cli.Context) {
-	docker, err := client.NewEnvClient() // Temporary client created to test network.Teardown()
+	// TODO move these clients to a separate file leveraging the DOCKER_API_VERSION,
+	// these clients are created to test the local network for now.
+	// See https://github.com/awslabs/amazon-ecs-local-container-endpoints/blob/master/local-container-endpoints/clients/docker/client.go#L49
+	docker, err := client.NewEnvClient()
 	if err != nil {
 		logrus.Fatal("Could not connect to docker", err)
 	}

ecs-cli/modules/cli/local/network/teardown.go

@@ -76,6 +76,7 @@ func hasRunningTasksInNetwork(d networkInspector) bool {
 
 	if len(resp.Containers) > 1 {
 		// Has other containers running in the network
+		logrus.Infof("%d other task(s) running locally, skipping network removal.", len(resp.Containers)-1)
 		return true
 	}
 
@@ -99,7 +100,7 @@ func stopEndpointsContainer(d containerStopper) {
 	err := d.ContainerStop(ctx, localEndpointsContainerName, nil)
 	if err != nil {
 		if strings.Contains(strings.ToLower(err.Error()), "no such container") {
-			// The container was removed, do nothing.
+			// The containers in the network were already stopped by the user using "docker stop", do nothing.
 			return
 		}
 		logrus.Fatalf("Failed to stop %s container due to %v", localEndpointsContainerName, err)
@@ -122,7 +123,7 @@ func removeEndpointsContainer(d containerRemover) {
 	err := d.ContainerRemove(ctx, localEndpointsContainerName, types.ContainerRemoveOptions{})
 	if err != nil {
 		if strings.Contains(strings.ToLower(err.Error()), "no such container") {
-			// The container was removed, do nothing.
+			// The containers in the network were already removed by the user using "docker rm", do nothing.
 			return
 		}
 		logrus.Fatalf("Failed to remove %s container due to %v", localEndpointsContainerName, err)