No service matching task id, change log level to warning.

allegro · Apr 11, 2017 · 2a9b403 · 2a9b403
1 parent 96dab08
commit 2a9b403
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/consul/consul.go b/consul/consul.go
@@ -203,7 +203,10 @@ func (c *Consul) DeregisterByTask(taskID apps.TaskID) error {
 	if err != nil {
 		return err
 	} else if len(services) == 0 {
-		return fmt.Errorf("Couldn't find any service matching task id %s", taskID)
+		log.WithFields(
+			log.Fields{"Id": taskID},
+		).Warningf("Couldn't find any service matching task id")
+		return nil
 	}
 	return c.deregisterMultipleServices(services, taskID)
 }

diff --git a/consul/consul_test.go b/consul/consul_test.go
@@ -618,7 +618,7 @@ func TestDeregisterServicesByTask_shouldReturnErrorOnFailure(t *testing.T) {
 	assert.Error(t, err)
 }
 
-func TestDeregisterServicesByTask_shouldReturnErrorOnServiceMatchingTaskNotFound(t *testing.T) {
+func TestDeregisterServicesByTask_shouldReturnNilErrorOnServiceMatchingTaskNotFound(t *testing.T) {
 	t.Parallel()
 	server := CreateTestServer(t)
 	defer server.Stop()
@@ -639,7 +639,7 @@ func TestDeregisterServicesByTask_shouldReturnErrorOnServiceMatchingTaskNotFound
 	err := consul.DeregisterByTask("non-existing")
 
 	// then
-	assert.Error(t, err)
+	assert.NoError(t, err)
 	services, _ = consul.GetAllServices()
 	assert.Len(t, services, 2)
 }