Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1018e24060 | |||
| ebef6e138d | |||
| 7bd8f754d8 | |||
| 43574a1d1c | |||
| f130eaedd7 |
@@ -3,7 +3,8 @@ package api
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
def "git.pbiernat.io/egommerce/api-entities/http"
|
"git.ego.cloudns.be/egommerce/api-entities/basket"
|
||||||
|
basket "git.ego.cloudns.be/egommerce/api-entities/basket/dto"
|
||||||
"github.com/go-redis/redis/v8"
|
"github.com/go-redis/redis/v8"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -15,9 +16,9 @@ type BasketAPI struct {
|
|||||||
httpClient *HttpClient
|
httpClient *HttpClient
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *BasketAPI) GetBasket(basketID string) (*def.GetBasketResponse, error) {
|
func (a *BasketAPI) GetBasket(basketID string) (*basket.GetBasketResponseDTO, error) {
|
||||||
req := &def.GetBasketRequest{BasketID: basketID}
|
req := &basket.GetBasketRequestDTO{BasketID: basketID}
|
||||||
res := new(def.GetBasketResponse)
|
res := new(basket.GetBasketResponse)
|
||||||
if err := a.httpClient.SendGet("basket-svc", "/api/v1/basket", req, res); err != nil {
|
if err := a.httpClient.SendGet("basket-svc", "/api/v1/basket", req, res); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -25,9 +26,9 @@ func (a *BasketAPI) GetBasket(basketID string) (*def.GetBasketResponse, error) {
|
|||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a *BasketAPI) GetBasketItems(basketID string) ([]*def.GetBasketItemsResponse, error) {
|
func (a *BasketAPI) GetBasketItems(basketID string) ([]*basket.GetBasketItemsResponseDTO, error) {
|
||||||
url := fmt.Sprintf("/api/v1/basket/%s/items", basketID)
|
url := fmt.Sprintf("/api/v1/basket/%s/items", basketID)
|
||||||
var res []*def.GetBasketItemsResponse
|
var res []*basket.GetBasketItemsResponseDTO
|
||||||
if err := a.httpClient.SendGet("basket-svc", url, nil, &res); err != nil {
|
if err := a.httpClient.SendGet("basket-svc", url, nil, &res); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,12 +2,11 @@ package consul
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.pbiernat.io/egommerce/go-api-pkg/config"
|
"git.ego.cloudns.be/egommerce/go-api-pkg/config"
|
||||||
consul "github.com/hashicorp/consul/api"
|
consul "github.com/hashicorp/consul/api"
|
||||||
"github.com/hashicorp/consul/connect"
|
"github.com/hashicorp/consul/connect"
|
||||||
)
|
)
|
||||||
@@ -61,7 +60,6 @@ func NewService(servAddr, id, name, useDomainOverIp, addr, domain, pathPrefix st
|
|||||||
|
|
||||||
func newClientConfig(serverAddr string) *consul.Config {
|
func newClientConfig(serverAddr string) *consul.Config {
|
||||||
conf := consul.DefaultConfig()
|
conf := consul.DefaultConfig()
|
||||||
log.Printf("Setting consul server addr: %s", serverAddr)
|
|
||||||
conf.Address = serverAddr
|
conf.Address = serverAddr
|
||||||
|
|
||||||
return conf
|
return conf
|
||||||
@@ -129,7 +127,7 @@ func (s *Service) RegisterHealthChecks() {
|
|||||||
}()
|
}()
|
||||||
|
|
||||||
go func() { // TTL
|
go func() { // TTL
|
||||||
t := time.NewTicker(s.ttl)
|
t := time.NewTicker(time.Second * 5)
|
||||||
for range t.C {
|
for range t.C {
|
||||||
if _, err := s.healthCheck(); err != nil {
|
if _, err := s.healthCheck(); err != nil {
|
||||||
// fmt.Printf("HealthCheck endpoint not available (%s)#: %v\n", s.GetFullAddr(), err)
|
// fmt.Printf("HealthCheck endpoint not available (%s)#: %v\n", s.GetFullAddr(), err)
|
||||||
|
|||||||
Reference in New Issue
Block a user