diff --git a/src/cmd/worker/main.go b/src/cmd/worker/main.go index b3e3727..65a28aa 100644 --- a/src/cmd/worker/main.go +++ b/src/cmd/worker/main.go @@ -203,7 +203,7 @@ func updateKVConfig(s *discovery.Service, oldCnf *server.Config) error { // FIXM } if data == nil { - return errors.New("empty KV config data. Skipping") + return errors.New("empty KV config data") } buf := bytes.NewBuffer(data.Value) diff --git a/src/go.mod b/src/go.mod index 8e0bf90..20cc5db 100644 --- a/src/go.mod +++ b/src/go.mod @@ -3,7 +3,7 @@ module git.pbiernat.dev/egommerce/basket-service go 1.18 require ( - git.pbiernat.dev/egommerce/go-api-pkg v0.0.108 + git.pbiernat.dev/egommerce/go-api-pkg v0.0.113 github.com/georgysavva/scany/v2 v2.0.0 github.com/gofiber/fiber/v2 v2.40.1 github.com/jackc/pgtype v1.12.0 diff --git a/src/go.sum b/src/go.sum index dfbdee8..c10720a 100644 --- a/src/go.sum +++ b/src/go.sum @@ -8,6 +8,8 @@ git.pbiernat.dev/egommerce/go-api-pkg v0.0.106 h1:kOqDvQfk8MzmyQonMMLmZKhW7I5YeD git.pbiernat.dev/egommerce/go-api-pkg v0.0.106/go.mod h1:nAwcw2MZtn/54YKq8VQK6RJAsiuoLUtPuazXg8JcqK8= git.pbiernat.dev/egommerce/go-api-pkg v0.0.108 h1:gr5kzKNR3sCxTz+nbqtOM7vdIely5ZWb8itSLAjTo0I= git.pbiernat.dev/egommerce/go-api-pkg v0.0.108/go.mod h1:nAwcw2MZtn/54YKq8VQK6RJAsiuoLUtPuazXg8JcqK8= +git.pbiernat.dev/egommerce/go-api-pkg v0.0.113 h1:kf7HesezhXIAMNYgLCm8x6YVqyLqJRqaPKIFEXf4xSs= +git.pbiernat.dev/egommerce/go-api-pkg v0.0.113/go.mod h1:nAwcw2MZtn/54YKq8VQK6RJAsiuoLUtPuazXg8JcqK8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= diff --git a/src/internal/app/server/server.go b/src/internal/app/server/server.go index dd71400..bc1988e 100644 --- a/src/internal/app/server/server.go +++ b/src/internal/app/server/server.go @@ -3,6 +3,7 @@ package server import ( "bytes" "encoding/json" + "errors" "fmt" "os" "os/signal" @@ -117,14 +118,18 @@ func (s *Server) GetRequestID(c *fiber.Ctx) (string, error) { } func (s *Server) updateKVConfig() error { // FIXME: duplicated in cmd/worker/main.go - data, _, err := s.discovery.KV().Get(s.kvNmspc, nil) + config, _, err := s.discovery.KV().Get(s.kvNmspc, nil) if err != nil { fmt.Println(err) return err } - kvCnf := bytes.NewBuffer(data.Value) + if config == nil { + return errors.New("empty KV config data") + } + + kvCnf := bytes.NewBuffer(config.Value) decoder := json.NewDecoder(kvCnf) if err := decoder.Decode(&s.conf); err != nil { return err