modify all code for never logger interface

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
2021-01-10 19:24:03 +03:00
parent 7b3a7a9448
commit 8b7380876e
16 changed files with 82 additions and 59 deletions

View File

@@ -1,6 +1,8 @@
package resolver
import (
"context"
"github.com/unistack-org/micro/v3/registry"
)
@@ -8,6 +10,7 @@ import (
type Options struct {
Handler string
ServicePrefix string
Context context.Context
}
// Option func
@@ -29,7 +32,9 @@ func WithServicePrefix(p string) Option {
// NewOptions returns new initialised options
func NewOptions(opts ...Option) Options {
options := Options{}
options := Options{
Context: context.Background(),
}
for _, o := range opts {
o(&options)
}

View File

@@ -55,7 +55,7 @@ func (r *Resolver) Domain(req *http.Request) string {
domain, err := publicsuffix.EffectiveTLDPlusOne(host)
if err != nil {
if logger.V(logger.DebugLevel) {
logger.Debug("Unable to extract domain from %v", host)
logger.Debug(r.opts.Context, "Unable to extract domain from %v", host)
}
return ""
}

View File

@@ -7,13 +7,16 @@ import (
"net"
"os"
"github.com/unistack-org/micro/v3/api/server"
"github.com/unistack-org/micro/v3/api/server/acme"
"github.com/unistack-org/micro/v3/logger"
"golang.org/x/crypto/acme/autocert"
)
// autoCertACME is the ACME provider from golang.org/x/crypto/acme/autocert
type autocertProvider struct{}
type autocertProvider struct {
opts server.Options
}
func (a *autocertProvider) Init(opts ...acme.Option) error {
return nil
@@ -36,7 +39,7 @@ func (a *autocertProvider) TLSConfig(hosts ...string) (*tls.Config, error) {
dir := cacheDir()
if err := os.MkdirAll(dir, 0700); err != nil {
if logger.V(logger.InfoLevel) {
logger.Info("warning: autocert not using a cache: %v", err)
logger.Info(a.opts.Context, "warning: autocert not using a cache: %v", err)
}
} else {
m.Cache = autocert.DirCache(dir)

View File

@@ -74,7 +74,7 @@ func (s *httpServer) Start() error {
}
if config.Logger.V(logger.InfoLevel) {
config.Logger.Infof("HTTP API Listening on %s", l.Addr().String())
config.Logger.Infof(s.opts.Context, "HTTP API Listening on %s", l.Addr().String())
}
s.Lock()
@@ -85,7 +85,7 @@ func (s *httpServer) Start() error {
if err := http.Serve(l, s.mux); err != nil {
// temporary fix
if config.Logger.V(logger.ErrorLevel) {
config.Logger.Errorf("serve err: %v", err)
config.Logger.Errorf(s.opts.Context, "serve err: %v", err)
}
s.Stop()
}

View File

@@ -1,6 +1,7 @@
package server
import (
"context"
"crypto/tls"
"net/http"
@@ -23,12 +24,14 @@ type Options struct {
Resolver resolver.Resolver
Wrappers []Wrapper
Logger logger.Logger
Context context.Context
}
// NewOptions returns new Options
func NewOptions(opts ...Option) Options {
options := Options{
Logger: logger.DefaultLogger,
Logger: logger.DefaultLogger,
Context: context.Background(),
}
for _, o := range opts {
o(&options)