fixed issue where lock was not being allocated for given service but …

…for the same key
ChrisMcKenzie · Nov 4, 2015 · 8a27e4e · 8a27e4e
1 parent dd69256
commit 8a27e4e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lock/consul.go b/lock/consul.go
@@ -2,6 +2,7 @@ package lock
 
 import (
 	"os"
+	"path/filepath"
 
 	"github.com/hashicorp/consul/api"
 )
@@ -17,7 +18,7 @@ func NewConsulLocker(prefix string, config *api.Config) (*ConsulLocker, error) {
 	}
 	name, _ := os.Hostname()
 	s, err := client.SemaphoreOpts(&api.SemaphoreOptions{
-		Prefix: "dropship/services/",
+		Prefix: filepath.Join("dropship/services/", prefix),
 		Limit:  1,
 
 		SessionName: name,

diff --git a/lock/consul_test.go b/lock/consul_test.go
@@ -13,7 +13,7 @@ var (
 )
 
 func TestMain(t *testing.T) {
-	locker, err = NewConsulLocker("dropship/services", api.DefaultConfig())
+	locker, err = NewConsulLocker("dropship", api.DefaultConfig())
 	if err != nil {
 		t.Error(err)
 		t.Fail()