Update
This commit is contained in:
parent
544298eb99
commit
2584e23826
@ -9,6 +9,8 @@
|
|||||||
},
|
},
|
||||||
"Check": {
|
"Check": {
|
||||||
"TCP": "__IP__:443",
|
"TCP": "__IP__:443",
|
||||||
|
"Interval": "5s",
|
||||||
|
"Timeout": "1s",
|
||||||
"DeregisterCriticalServiceAfter": "10s"
|
"DeregisterCriticalServiceAfter": "10s"
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -7,7 +7,7 @@ APP_PATH_PREFIX=/order
|
|||||||
APP_KV_NAMESPACE=dev.egommerce/service/order-svc
|
APP_KV_NAMESPACE=dev.egommerce/service/order-svc
|
||||||
|
|
||||||
LOGGER_ADDR=api-logger:24224
|
LOGGER_ADDR=api-logger:24224
|
||||||
REGISTRY_ADDR=api-registry:8500
|
REGISTRY_ADDR=api-registry:8501
|
||||||
DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
|
DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
|
||||||
CACHE_ADDR=api-cache:6379
|
CACHE_ADDR=api-cache:6379
|
||||||
CACHE_PASSWORD=12345678
|
CACHE_PASSWORD=12345678
|
||||||
|
@ -17,12 +17,14 @@ waitForService()
|
|||||||
update-resolv # provided by stack - better approach - single copy
|
update-resolv # provided by stack - better approach - single copy
|
||||||
update-ca-certificates
|
update-ca-certificates
|
||||||
|
|
||||||
waitForService "api-registry:8500"
|
waitForService "api-registry:8501"
|
||||||
waitForService "postgres-db:5432"
|
|
||||||
waitForService "api-eventbus:5672"
|
waitForService "api-eventbus:5672"
|
||||||
waitForService "api-logger:24224"
|
waitForService "api-logger:24224"
|
||||||
|
waitForService "db-postgres:5432"
|
||||||
waitForService "basket-svc:443"
|
waitForService "basket-svc:443"
|
||||||
|
|
||||||
|
register-service
|
||||||
|
|
||||||
# run migrations
|
# run migrations
|
||||||
migrate.sh
|
migrate.sh
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ func main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func healthCheck() bool {
|
func healthCheck() bool {
|
||||||
run, err := os.Open("/app.run")
|
run, err := os.Open("./app.run")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@ func main() {
|
|||||||
a.RegisterPlugin(app.CachePlugin(cArr))
|
a.RegisterPlugin(app.CachePlugin(cArr))
|
||||||
a.RegisterPlugin(app.DatabasePlugin(cArr))
|
a.RegisterPlugin(app.DatabasePlugin(cArr))
|
||||||
a.RegisterPlugin(app.EventbusPlugin(cArr))
|
a.RegisterPlugin(app.EventbusPlugin(cArr))
|
||||||
a.RegisterPlugin(app.RegistryPlugin(cArr))
|
// a.RegisterPlugin(app.RegistryPlugin(cArr))
|
||||||
|
|
||||||
while := make(chan struct{})
|
while := make(chan struct{})
|
||||||
err := a.Start(while)
|
err := a.Start(while)
|
||||||
|
@ -4,7 +4,7 @@ go 1.18
|
|||||||
|
|
||||||
require (
|
require (
|
||||||
git.pbiernat.io/egommerce/api-entities v0.2.3
|
git.pbiernat.io/egommerce/api-entities v0.2.3
|
||||||
git.pbiernat.io/egommerce/go-api-pkg v0.3.18
|
git.pbiernat.io/egommerce/go-api-pkg v0.3.24
|
||||||
github.com/georgysavva/scany/v2 v2.0.0
|
github.com/georgysavva/scany/v2 v2.0.0
|
||||||
github.com/go-pg/migrations/v8 v8.1.0
|
github.com/go-pg/migrations/v8 v8.1.0
|
||||||
github.com/go-pg/pg/v10 v10.10.7
|
github.com/go-pg/pg/v10 v10.10.7
|
||||||
|
@ -37,8 +37,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
|
|||||||
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
|
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
|
||||||
git.pbiernat.io/egommerce/api-entities v0.2.3 h1:mR6EYfZkAzh4teydb7KXDBWoxwVW3qasnmmH5J3mnas=
|
git.pbiernat.io/egommerce/api-entities v0.2.3 h1:mR6EYfZkAzh4teydb7KXDBWoxwVW3qasnmmH5J3mnas=
|
||||||
git.pbiernat.io/egommerce/api-entities v0.2.3/go.mod h1:INXAG5x4+i+vNwg1NpfPHiDW8nY1kn1K7pgLOtX+/I0=
|
git.pbiernat.io/egommerce/api-entities v0.2.3/go.mod h1:INXAG5x4+i+vNwg1NpfPHiDW8nY1kn1K7pgLOtX+/I0=
|
||||||
git.pbiernat.io/egommerce/go-api-pkg v0.3.18 h1:0+C9BMsllrNvRbh4kb7dJ5lrzP1Lc7J4pb+KV76YrXk=
|
git.pbiernat.io/egommerce/go-api-pkg v0.3.24 h1:if6xsFOStckWdGm7kcgKWOhOGOe6iIBOOr+3DjgX5tM=
|
||||||
git.pbiernat.io/egommerce/go-api-pkg v0.3.18/go.mod h1:XIy2mmvRNIzQmYIUAcDZafhRPxTQFS2HDmsK7ZQ6980=
|
git.pbiernat.io/egommerce/go-api-pkg v0.3.24/go.mod h1:XIy2mmvRNIzQmYIUAcDZafhRPxTQFS2HDmsK7ZQ6980=
|
||||||
github.com/Azure/azure-sdk-for-go v44.0.0+incompatible h1:e82Yv2HNpS0kuyeCrV29OPKvEiqfs2/uJHic3/3iKdg=
|
github.com/Azure/azure-sdk-for-go v44.0.0+incompatible h1:e82Yv2HNpS0kuyeCrV29OPKvEiqfs2/uJHic3/3iKdg=
|
||||||
github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
|
github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
|
||||||
github.com/Azure/go-autorest/autorest v0.11.18 h1:90Y4srNYrwOtAgVo3ndrQkTYn6kf1Eg/AjTFJ8Is2aM=
|
github.com/Azure/go-autorest/autorest v0.11.18 h1:90Y4srNYrwOtAgVo3ndrQkTYn6kf1Eg/AjTFJ8Is2aM=
|
||||||
|
@ -21,7 +21,7 @@ const (
|
|||||||
defNetAddr = ":443"
|
defNetAddr = ":443"
|
||||||
defMongoDbURL = "mongodb://mongodb:12345678@mongo-db:27017"
|
defMongoDbURL = "mongodb://mongodb:12345678@mongo-db:27017"
|
||||||
defPathPrefix = "/order"
|
defPathPrefix = "/order"
|
||||||
defRegistryAddr = "api-registry:8500"
|
defRegistryAddr = "api-registry:8501"
|
||||||
defEbEventsExchange = "api-events"
|
defEbEventsExchange = "api-events"
|
||||||
defEbEventsQueue = "order-svc"
|
defEbEventsQueue = "order-svc"
|
||||||
)
|
)
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
package server
|
package server
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/gofiber/fiber/v2"
|
"github.com/gofiber/fiber/v2"
|
||||||
|
|
||||||
"git.pbiernat.io/egommerce/go-api-pkg/fluentd"
|
"git.pbiernat.io/egommerce/go-api-pkg/fluentd"
|
||||||
@ -17,10 +15,10 @@ func SetupMiddleware(s *Server) {
|
|||||||
|
|
||||||
func LoggingMiddleware(log *fluentd.Logger) func(c *fiber.Ctx) error {
|
func LoggingMiddleware(log *fluentd.Logger) func(c *fiber.Ctx) error {
|
||||||
return func(c *fiber.Ctx) error {
|
return func(c *fiber.Ctx) error {
|
||||||
path := string(c.Request().URI().Path())
|
// path := string(c.Request().URI().Path())
|
||||||
if strings.Contains(path, "/health") {
|
// if strings.Contains(path, "/health") {
|
||||||
return c.Next()
|
// return c.Next()
|
||||||
}
|
// }
|
||||||
|
|
||||||
log.Log("Request: %s, remote: %s, via: %s",
|
log.Log("Request: %s, remote: %s, via: %s",
|
||||||
c.Request().URI().String(),
|
c.Request().URI().String(),
|
||||||
|
@ -69,7 +69,7 @@ func (s *Server) RegisterHandler(name string, fn func() any) {
|
|||||||
func (s *Server) OnShutdown() {
|
func (s *Server) OnShutdown() {
|
||||||
// s.GetLogger().Log("Server %s is going down...", s.ID)
|
// s.GetLogger().Log("Server %s is going down...", s.ID)
|
||||||
|
|
||||||
s.GetRegistry().Unregister()
|
// s.GetRegistry().Unregister()
|
||||||
// a.clearMetadataCache()
|
// a.clearMetadataCache()
|
||||||
s.GetEventBus().Close()
|
s.GetEventBus().Close()
|
||||||
s.GetDatabase().Close()
|
s.GetDatabase().Close()
|
||||||
|
Loading…
Reference in New Issue
Block a user