mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2026-04-23 20:49:13 -05:00
Bump github.com/go-micro/plugins/v4/server/http from 1.2.1 to 1.2.2
Bumps [github.com/go-micro/plugins/v4/server/http](https://github.com/go-micro/plugins) from 1.2.1 to 1.2.2. - [Release notes](https://github.com/go-micro/plugins/releases) - [Commits](https://github.com/go-micro/plugins/compare/v4/logger/zap/v1.2.1...v4/server/http/v1.2.2) --- updated-dependencies: - dependency-name: github.com/go-micro/plugins/v4/server/http dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
committed by
Ralf Haferkamp
parent
a049a2984c
commit
59903e7662
+6
-6
@@ -15,7 +15,7 @@ import (
|
||||
"go-micro.dev/v4/codec"
|
||||
"go-micro.dev/v4/codec/jsonrpc"
|
||||
"go-micro.dev/v4/codec/protorpc"
|
||||
log "go-micro.dev/v4/logger"
|
||||
"go-micro.dev/v4/logger"
|
||||
"go-micro.dev/v4/registry"
|
||||
"go-micro.dev/v4/server"
|
||||
"go-micro.dev/v4/util/cmd"
|
||||
@@ -178,7 +178,7 @@ func (h *httpServer) Register() error {
|
||||
}
|
||||
|
||||
h.registerOnce.Do(func() {
|
||||
log.Infof("Registering node: %s", opts.Name+"-"+opts.Id)
|
||||
opts.Logger.Logf(logger.InfoLevel, "Registering node: %s", opts.Name+"-"+opts.Id)
|
||||
})
|
||||
|
||||
if err := opts.Registry.Register(service, rOpts...); err != nil {
|
||||
@@ -222,7 +222,7 @@ func (h *httpServer) Deregister() error {
|
||||
opts := h.opts
|
||||
h.Unlock()
|
||||
|
||||
log.Infof("Deregistering node: %s", opts.Name+"-"+opts.Id)
|
||||
opts.Logger.Logf(logger.InfoLevel, "Deregistering node: %s", opts.Name+"-"+opts.Id)
|
||||
|
||||
service := serviceDef(opts)
|
||||
if err := opts.Registry.Deregister(service); err != nil {
|
||||
@@ -243,7 +243,7 @@ func (h *httpServer) Deregister() error {
|
||||
wg.Add(1)
|
||||
go func(s broker.Subscriber) {
|
||||
defer wg.Done()
|
||||
log.Infof("Unsubscribing from topic: %s", s.Topic())
|
||||
opts.Logger.Logf(logger.InfoLevel, "Unsubscribing from topic: %s", s.Topic())
|
||||
s.Unsubscribe()
|
||||
}(sub)
|
||||
}
|
||||
@@ -278,7 +278,7 @@ func (h *httpServer) Start() error {
|
||||
return err
|
||||
}
|
||||
|
||||
log.Infof("Listening on %s", ln.Addr().String())
|
||||
opts.Logger.Logf(logger.InfoLevel, "Listening on %s", ln.Addr().String())
|
||||
|
||||
h.Lock()
|
||||
h.opts.Address = ln.Addr().String()
|
||||
@@ -318,7 +318,7 @@ func (h *httpServer) Start() error {
|
||||
// register self on interval
|
||||
case <-t.C:
|
||||
if err := h.Register(); err != nil {
|
||||
log.Error("Server register error: ", err)
|
||||
opts.Logger.Log(logger.ErrorLevel, "Server register error: ", err)
|
||||
}
|
||||
// wait for exit
|
||||
case ch = <-h.exit:
|
||||
|
||||
+5
@@ -6,6 +6,7 @@ import (
|
||||
|
||||
"go-micro.dev/v4/broker"
|
||||
"go-micro.dev/v4/codec"
|
||||
"go-micro.dev/v4/logger"
|
||||
"go-micro.dev/v4/registry"
|
||||
"go-micro.dev/v4/server"
|
||||
)
|
||||
@@ -23,6 +24,10 @@ func newOptions(opt ...server.Option) server.Options {
|
||||
o(&opts)
|
||||
}
|
||||
|
||||
if opts.Logger == nil {
|
||||
opts.Logger = logger.DefaultLogger
|
||||
}
|
||||
|
||||
if opts.Broker == nil {
|
||||
opts.Broker = broker.DefaultBroker
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user