|
|
|
|
@@ -27,16 +27,20 @@ type Service struct {
|
|
|
|
|
|
|
|
|
|
var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
|
|
|
|
|
|
|
|
|
|
func NewService(servAddr, id, name, hostname, domain, pathPrefix string, appPort int) (*Service, error) {
|
|
|
|
|
func NewService(servAddr, id, name, useDomainOverIp, addr, domain, pathPrefix string, appPort int) (*Service, error) {
|
|
|
|
|
s := new(Service)
|
|
|
|
|
s.Name = name
|
|
|
|
|
s.Address = hostname
|
|
|
|
|
s.Address = addr
|
|
|
|
|
s.appID = id
|
|
|
|
|
s.domain = domain
|
|
|
|
|
s.pathPrefix = pathPrefix
|
|
|
|
|
s.port = appPort
|
|
|
|
|
s.ttl = time.Second * 10
|
|
|
|
|
|
|
|
|
|
if useDomainOverIp == "true" { // FIXME types...
|
|
|
|
|
s.Address = domain
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
client, err := consul.NewClient(newClientConfig(servAddr))
|
|
|
|
|
if err != nil {
|
|
|
|
|
return nil, err
|
|
|
|
|
@@ -95,6 +99,11 @@ func (s *Service) Register() error {
|
|
|
|
|
return nil
|
|
|
|
|
}
|
|
|
|
|
func (s *Service) Unregister() error {
|
|
|
|
|
// s.client.Catalog().Deregister(&consul.CatalogDeregistration{
|
|
|
|
|
// Address: s.Address,
|
|
|
|
|
// ServiceID: s.GetID(),
|
|
|
|
|
// }, nil)
|
|
|
|
|
|
|
|
|
|
return s.agent.ServiceDeregister(s.GetID())
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -194,6 +203,9 @@ func (s *Service) getTags() []string {
|
|
|
|
|
"traefik.http.services." + s.Name + ".loadbalancer.server.scheme=http",
|
|
|
|
|
"traefik.http.services." + s.Name + ".loadbalancer.server.port=" + strconv.Itoa(s.port),
|
|
|
|
|
"traefik.http.services." + s.Name + ".loadbalancer.passhostheader=true",
|
|
|
|
|
"traefik.http.services." + s.Name + ".loadbalancer.healthcheck.interval=1s",
|
|
|
|
|
"traefik.http.services." + s.Name + ".loadbalancer.healthcheck.timeout=1s",
|
|
|
|
|
"traefik.http.services." + s.Name + ".loadbalancer.healthcheck.path=/health",
|
|
|
|
|
"traefik.tls.certificates.certfile=/certs/client.cert",
|
|
|
|
|
"traefik.tls.certificates.keyfile=/certs/client.key",
|
|
|
|
|
}
|
|
|
|
|
|