fix(*): suppress "Key already exists" errors

Matthew Fisher · Matthew Fisher · commit 5bc375d0682b · 2015-05-18T12:08:23.000-07:00
diff --git a/cache/main.go b/cache/main.go
@@ -105,7 +105,7 @@ func publishService(client *etcd.Client, host string, etcdPath string,
 
 func setEtcd(client *etcd.Client, key, value string, ttl uint64) {
 	_, err := client.Set(key, value, ttl)
-	if err != nil {
+	if err != nil && !strings.Contains(err.Error(), "Key already exists") {
 		log.Println(err)
 	}
 }
diff --git a/logger/main.go b/logger/main.go
@@ -7,6 +7,7 @@ import (
 	"os"
 	"os/signal"
 	"strconv"
+	"strings"
 	"syscall"
 	"time"
 
@@ -67,7 +68,7 @@ func publishService(client *etcd.Client, host string, etcdPath string, port stri
 
 func setEtcd(client *etcd.Client, key, value string, ttl uint64) {
 	_, err := client.Set(key, value, ttl)
-	if err != nil {
+	if err != nil && !strings.Contains(err.Error(), "Key already exists") {
 		log.Println(err)
 	}
 }
diff --git a/router/boot.go b/router/boot.go
@@ -7,6 +7,7 @@ import (
 	"os"
 	"os/exec"
 	"os/signal"
+	"strings"
 	"syscall"
 	"time"
 
@@ -211,7 +212,7 @@ func setDefaultEtcd(client *etcd.Client, key, value string) {
 
 func mkdirEtcd(client *etcd.Client, path string) {
 	_, err := client.CreateDir(path, 0)
-	if err != nil {
+	if err != nil && !strings.Contains(err.Error(), "Key already exists") {
 		log.Warn(err)
 	}
 }
diff --git a/swarm/swarm.go b/swarm/swarm.go
@@ -75,7 +75,7 @@ func publishService(client *etcd.Client, host string, ttl uint64) {
 
 func setEtcd(client *etcd.Client, key, value string, ttl uint64) {
 	_, err := client.Set(key, value, ttl)
-	if err != nil {
+	if err != nil && !strings.Contains(err.Error(), "Key already exists") {
 		log.Println(err)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ func publishService(client *etcd.Client, host string, etcdPath string,`
`105`	`105`
`106`	`106`	`func setEtcd(client *etcd.Client, key, value string, ttl uint64) {`
`107`	`107`	`_, err := client.Set(key, value, ttl)`
`108`		`- if err != nil {`
	`108`	`+ if err != nil && !strings.Contains(err.Error(), "Key already exists") {`
`109`	`109`	`log.Println(err)`
`110`	`110`	`}`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"os"`
`8`	`8`	`"os/signal"`
`9`	`9`	`"strconv"`
	`10`	`+ "strings"`
`10`	`11`	`"syscall"`
`11`	`12`	`"time"`
`12`	`13`
`@@ -67,7 +68,7 @@ func publishService(client *etcd.Client, host string, etcdPath string, port stri`
`67`	`68`
`68`	`69`	`func setEtcd(client *etcd.Client, key, value string, ttl uint64) {`
`69`	`70`	`_, err := client.Set(key, value, ttl)`
`70`		`- if err != nil {`
	`71`	`+ if err != nil && !strings.Contains(err.Error(), "Key already exists") {`
`71`	`72`	`log.Println(err)`
`72`	`73`	`}`
`73`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`	`"os"`
`8`	`8`	`"os/exec"`
`9`	`9`	`"os/signal"`
	`10`	`+ "strings"`
`10`	`11`	`"syscall"`
`11`	`12`	`"time"`
`12`	`13`
`@@ -211,7 +212,7 @@ func setDefaultEtcd(client *etcd.Client, key, value string) {`
`211`	`212`
`212`	`213`	`func mkdirEtcd(client *etcd.Client, path string) {`
`213`	`214`	`_, err := client.CreateDir(path, 0)`
`214`		`- if err != nil {`
	`215`	`+ if err != nil && !strings.Contains(err.Error(), "Key already exists") {`
`215`	`216`	`log.Warn(err)`
`216`	`217`	`}`
`217`	`218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func publishService(client *etcd.Client, host string, ttl uint64) {`
`75`	`75`
`76`	`76`	`func setEtcd(client *etcd.Client, key, value string, ttl uint64) {`
`77`	`77`	`_, err := client.Set(key, value, ttl)`
`78`		`- if err != nil {`
	`78`	`+ if err != nil && !strings.Contains(err.Error(), "Key already exists") {`
`79`	`79`	`log.Println(err)`
`80`	`80`	`}`
`81`	`81`	`}`