Merge pull request #80 from printfcoder/master

fix some bugs
stack-labs · Jan 27, 2021 · da96552 · da96552
2 parents 741a637 + 7a719c4
commit da96552
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/service/stack/stack_init.go b/service/stack/stack_init.go
@@ -140,6 +140,20 @@ func (s *stackService) initComponents() error {
 	s.opts.SelectorOptions = append(s.opts.SelectorOptions, sel.Registry(s.opts.Registry))
 	s.opts.BrokerOptions = append(s.opts.BrokerOptions, br.Registry(s.opts.Registry))
 
+	// set wrappers
+	for _, wrapper := range s.opts.HandlerWrapper {
+		s.opts.ServerOptions = append(s.opts.ServerOptions, ser.WrapHandler(wrapper))
+	}
+	for _, wrapper := range s.opts.CallWrapper {
+		s.opts.ClientOptions = append(s.opts.ClientOptions, cl.WrapCall(wrapper))
+	}
+	for _, wrapper := range s.opts.ClientWrapper {
+		s.opts.ClientOptions = append(s.opts.ClientOptions, cl.Wrap(wrapper))
+	}
+	for _, wrapper := range s.opts.SubscriberWrapper {
+		s.opts.ServerOptions = append(s.opts.ServerOptions, ser.WrapSubscriber(wrapper))
+	}
+
 	if err := s.opts.Auth.Init(s.opts.AuthOptions...); err != nil {
 		return fmt.Errorf("Error configuring auth: %v ", err)
 	}
@@ -171,6 +185,9 @@ func (s *stackService) initComponents() error {
 	// wrap client to inject From-Service header on any calls
 	// todo wrap not here
 	s.opts.Client = wrapper.FromService(s.Name(), s.opts.Client)
+	for i := len(s.opts.ClientWrapper); i > 0; i-- {
+		s.opts.Client = s.opts.ClientWrapper[i-1](s.opts.Client)
+	}
 	if err := s.opts.Client.Init(s.opts.ClientOptions...); err != nil {
 		return fmt.Errorf("Error configuring client: %v ", err)
 	}

diff --git a/service/web/web.go b/service/web/web.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/stack-labs/stack-rpc/service"
+	"github.com/stack-labs/stack-rpc/util/log"
 )
 
 func NewOptions(opts ...service.Option) []service.Option {
@@ -41,6 +42,7 @@ func setHandle(sOpts *service.Options) error {
 		if sOpts.Context.Value(handlerFuncsKey{}) != nil {
 			if handlers, ok := sOpts.Context.Value(handlerFuncsKey{}).([]HandlerFunc); ok {
 				for _, handler := range handlers {
+					log.Debugf("handler url, root: [%s], route: [%s]", rootPath, handler.Route)
 					muxTmp.HandleFunc(path.Join(rootPath, handler.Route), handler.Func)
 				}
 			}

diff --git a/util/stackctl/new/new.go b/util/stackctl/new/new.go
@@ -241,7 +241,7 @@ func run(ctx *cli.Context) {
 				{"main.go", tmpl.MainFNC},
 				{"generate.go", tmpl.GenerateFile},
 				{"plugin.go", tmpl.Plugin},
-				{"stack_config.yml", tmpl.StackConfig},
+				{"stack.yml", tmpl.StackConfig},
 				{"handler/" + alias + ".go", tmpl.HandlerFNC},
 				{"subscriber/" + alias + ".go", tmpl.SubscriberFNC},
 				{"proto/" + alias + "/" + alias + ".proto", tmpl.ProtoFNC},
@@ -278,7 +278,7 @@ func run(ctx *cli.Context) {
 				{"main.go", tmpl.MainSRV},
 				{"generate.go", tmpl.GenerateFile},
 				{"plugin.go", tmpl.Plugin},
-				{"stack_config.yml", tmpl.StackConfig},
+				{"stack.yml", tmpl.StackConfig},
 				{"handler/" + alias + ".go", tmpl.HandlerSRV},
 				{"subscriber/" + alias + ".go", tmpl.SubscriberSRV},
 				{"proto/" + alias + "/" + alias + ".proto", tmpl.ProtoSRV},
@@ -315,7 +315,7 @@ func run(ctx *cli.Context) {
 				{"main.go", tmpl.MainAPI},
 				{"generate.go", tmpl.GenerateFile},
 				{"plugin.go", tmpl.Plugin},
-				{"stack_config.yml", tmpl.StackConfig},
+				{"stack.yml", tmpl.StackConfig},
 				{"client/" + alias + ".go", tmpl.WrapperAPI},
 				{"handler/" + alias + ".go", tmpl.HandlerAPI},
 				{"proto/" + alias + "/" + alias + ".proto", tmpl.ProtoAPI},
@@ -355,7 +355,7 @@ func run(ctx *cli.Context) {
 			Files: []file{
 				{"main.go", tmpl.MainWEB},
 				{"plugin.go", tmpl.Plugin},
-				{"stack_config.yml", tmpl.StackConfig},
+				{"stack.yml", tmpl.StackConfig},
 				{"handler/handler.go", tmpl.HandlerWEB},
 				{"html/index.html", tmpl.HTMLWEB},
 				{"Dockerfile", tmpl.DockerWEB},