fix

consul/discovery.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"log"
 	"net/http"
-	"os"
 	"time"
 
 	consul "github.com/hashicorp/consul/api"
@@ -23,8 +22,6 @@ type Service struct {
 var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
 
 func NewService(serverAddr, appID, appName, ip, domain string, appPort int) (*Service, error) {
-	hostname, _ := os.Hostname()
-	fmt.Println("hostname:" + hostname)
 	s := new(Service)
 	s.AppID = appID
 	s.Name = appName
@@ -51,7 +48,7 @@ func newClientConfig(serverAddr string) *consul.Config {
 
 func (s *Service) Register() error {
 	def := &consul.AgentServiceRegistration{
-		ID:      s.AppID,
+		ID:      s.Name + "_" + s.AppID,
 		Name:    s.Name,
 		Address: s.IP,
 		Port:    s.Port,
@@ -77,7 +74,7 @@ func (s *Service) UpdateTTL(service *consul.AgentServiceRegistration) {
 	for range ticker.C {
 		ok, err := s.check()
 		if !ok {
-			if err := s.ConsulAgent.FailTTL("service:"+s.AppID, err.Error()); err != nil {
+			if err := s.ConsulAgent.FailTTL("service:"+s.Name+"_"+s.AppID, err.Error()); err != nil {
 				log.Println(err)
 			}
 		} else {
@@ -111,7 +108,8 @@ func (s *Service) check() (bool, error) {
 }
 
 func (s *Service) getTags() []string {
-	fullName := fmt.Sprintf("%s_%s", s.Name, s.AppID)
+	fullName := fmt.Sprintf("%s-%s", s.Name, s.AppID)
+	bFullAddr := fmt.Sprintf("http://%s:%d/", s.IP, s.Port) // FIXME: declare one once - dont need to refresh....
 
 	tags := []string{
 		"traefik.enable=true",
@@ -122,8 +120,8 @@ func (s *Service) getTags() []string {
 		"traefik.http.routers." + s.Name + ".tls=true",
 		// "traefik.http.services." + s.Name + ".loadbalancer.server.scheme=http",
 		// "traefik.http.services." + s.Name + ".loadbalancer.server.port=" + port,
-		"traefik.http.services." + s.Name + ".loadbalancer.servers." + fullName + "=" + s.Address,
 		"traefik.http.services." + s.Name + ".loadbalancer.passhostheader=false",
+		"traefik.http.services." + s.Name + ".loadbalancer.servers." + fullName + ".url=" + bFullAddr,
 		"traefik.http.middlewares.compress.compress=true",
 		"traefik.http.middlewares.requestid.plugin.requestid.headerName=X-Request-ID",
 		// "traefik.http.services." + fullName + ".loadbalancer.healthcheck.path=/health",

push-tag.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+git tag -d dev
+git push origin develop
+git tag dev
+git push origin dev --force
+