valitydev/registrator
14
0
Fork 0
mirror of https://github.com/valitydev/registrator.git synced 2024-11-06 10:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #336 from colebrumley/consul-sock

Browse Source 
Add support for Consul unix sockets
This commit is contained in:
Jeff Lindsay 2016-02-09 08:15:58 -06:00
commit 1f9fa9e756
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
consul/consul.go
View File

@ -13,7 +13,9 @@ import (
const DefaultInterval = "10s"
func init() {
bridge.Register(new(Factory), "consul")
f := new(Factory)
bridge.Register(f, "consul")
bridge.Register(f, "consul-unix")
}
func (r *ConsulAdapter) interpolateService(script string, service *bridge.Service) string {
@ -26,7 +28,9 @@ type Factory struct{}
func (f *Factory) New(uri *url.URL) bridge.RegistryAdapter {
config := consulapi.DefaultConfig()
if uri.Host != "" {
if uri.Scheme == "consul-unix" {
config.Address = strings.TrimPrefix(uri.String(), "consul-")
} else if uri.Host != "" {
config.Address = uri.Host
}
client, err := consulapi.NewClient(config)

15
consulkv/consulkv.go
View File

@ -5,27 +5,34 @@ import (
"net"
"net/url"
"strconv"
"strings"
"github.com/gliderlabs/registrator/bridge"
consulapi "github.com/hashicorp/consul/api"
)
func init() {
bridge.Register(new(Factory), "consulkv")
f := new(Factory)
bridge.Register(f, "consulkv")
bridge.Register(f, "consulkv-unix")
}
type Factory struct{}
func (f *Factory) New(uri *url.URL) bridge.RegistryAdapter {
config := consulapi.DefaultConfig()
if uri.Host != "" {
path := uri.Path
if uri.Scheme == "consulkv-unix" {
spl := strings.SplitN(uri.Path, ":", 2)
config.Address, path = "unix://"+spl[0], spl[1]
} else if uri.Host != "" {
config.Address = uri.Host
}
client, err := consulapi.NewClient(config)
if err != nil {
log.Fatal("consulkv: ", uri.Scheme)
}
return &ConsulKVAdapter{client: client, path: uri.Path}
return &ConsulKVAdapter{client: client, path: path}
}
type ConsulKVAdapter struct {
@ -46,9 +53,11 @@ func (r *ConsulKVAdapter) Ping() error {
}
func (r *ConsulKVAdapter) Register(service *bridge.Service) error {
log.Println("Register")
path := r.path[1:] + "/" + service.Name + "/" + service.ID
port := strconv.Itoa(service.Port)
addr := net.JoinHostPort(service.IP, port)
log.Printf("path: %s", path)
_, err := r.client.KV().Put(&consulapi.KVPair{Key: path, Value: []byte(addr)}, nil)
if err != nil {
log.Println("consulkv: failed to register service:", err)

2
docs/user/backends.md
View File

@ -9,6 +9,7 @@ See also [Contributing Backends](../dev/backends.md).
## Consul
consul://<address>:<port>
consul-unix://<filepath>
Consul is the recommended registry since it specifically models services for
service discovery with health checks.
@ -63,6 +64,7 @@ SERVICE_CHECK_TTL=30s
## Consul KV
consulkv://<address>:<port>/<prefix>
consulkv-unix://<filepath>:/<prefix>
This is a separate backend to use Consul's key-value store instead of its native
service catalog. This behaves more like etcd since it has similar semantics, but