correcting hooks calling #376
| @@ -109,7 +109,7 @@ func (m *memoryBroker) Init(opts ...broker.Option) error { | ||||
| 	m.funcSubscribe = m.fnSubscribe | ||||
| 	m.funcBatchSubscribe = m.fnBatchSubscribe | ||||
|  | ||||
| 	m.opts.Hooks.EachNext(func(hook options.Hook) { | ||||
| 	m.opts.Hooks.EachPrev(func(hook options.Hook) { | ||||
| 		switch h := hook.(type) { | ||||
| 		case broker.HookPublish: | ||||
| 			m.funcPublish = h(m.funcPublish) | ||||
|   | ||||
| @@ -59,7 +59,7 @@ func (b *NoopBroker) Init(opts ...Option) error { | ||||
| 	b.funcSubscribe = b.fnSubscribe | ||||
| 	b.funcBatchSubscribe = b.fnBatchSubscribe | ||||
|  | ||||
| 	b.opts.Hooks.EachNext(func(hook options.Hook) { | ||||
| 	b.opts.Hooks.EachPrev(func(hook options.Hook) { | ||||
| 		switch h := hook.(type) { | ||||
| 		case HookPublish: | ||||
| 			b.funcPublish = h(b.funcPublish) | ||||
|   | ||||
| @@ -194,7 +194,7 @@ func (n *noopClient) Init(opts ...Option) error { | ||||
| 	n.funcPublish = n.fnPublish | ||||
| 	n.funcBatchPublish = n.fnBatchPublish | ||||
|  | ||||
| 	n.opts.Hooks.EachNext(func(hook options.Hook) { | ||||
| 	n.opts.Hooks.EachPrev(func(hook options.Hook) { | ||||
| 		switch h := hook.(type) { | ||||
| 		case HookCall: | ||||
| 			n.funcCall = h(n.funcCall) | ||||
|   | ||||
| @@ -37,7 +37,7 @@ func (c *defaultConfig) Init(opts ...Option) error { | ||||
| 	c.funcLoad = c.fnLoad | ||||
| 	c.funcSave = c.fnSave | ||||
|  | ||||
| 	c.opts.Hooks.EachNext(func(hook options.Hook) { | ||||
| 	c.opts.Hooks.EachPrev(func(hook options.Hook) { | ||||
| 		switch h := hook.(type) { | ||||
| 		case HookLoad: | ||||
| 			c.funcLoad = h(c.funcLoad) | ||||
|   | ||||
| @@ -723,7 +723,7 @@ func (n *noopServer) createSubHandler(sb *subscriber, opts Options) broker.Handl | ||||
| 				return nil | ||||
| 			} | ||||
|  | ||||
| 			opts.Hooks.EachNext(func(hook options.Hook) { | ||||
| 			opts.Hooks.EachPrev(func(hook options.Hook) { | ||||
| 				if h, ok := hook.(HookSubHandler); ok { | ||||
| 					fn = h(fn) | ||||
| 				} | ||||
|   | ||||
| @@ -9,6 +9,7 @@ import ( | ||||
| 	"go.unistack.org/micro/v3/client" | ||||
| 	"go.unistack.org/micro/v3/codec" | ||||
| 	"go.unistack.org/micro/v3/logger" | ||||
| 	"go.unistack.org/micro/v3/options" | ||||
| 	"go.unistack.org/micro/v3/server" | ||||
| ) | ||||
|  | ||||
| @@ -84,3 +85,40 @@ func TestNoopSub(t *testing.T) { | ||||
| 		} | ||||
| 	}() | ||||
| } | ||||
|  | ||||
| func TestHooks_Wrap(t *testing.T) { | ||||
| 	n := 5 | ||||
| 	fn1 := func(next server.FuncSubHandler) server.FuncSubHandler { | ||||
| 		return func(ctx context.Context, msg server.Message) (err error) { | ||||
| 			n *= 2 | ||||
| 			return next(ctx, msg) | ||||
| 		} | ||||
| 	} | ||||
| 	fn2 := func(next server.FuncSubHandler) server.FuncSubHandler { | ||||
| 		return func(ctx context.Context, msg server.Message) (err error) { | ||||
| 			n -= 10 | ||||
| 			return next(ctx, msg) | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	hs := &options.Hooks{} | ||||
| 	hs.Append(server.HookSubHandler(fn1), server.HookSubHandler(fn2)) | ||||
|  | ||||
| 	var fn = func(ctx context.Context, msg server.Message) error { | ||||
| 		return nil | ||||
| 	} | ||||
|  | ||||
| 	hs.EachPrev(func(hook options.Hook) { | ||||
| 		if h, ok := hook.(server.HookSubHandler); ok { | ||||
| 			fn = h(fn) | ||||
| 		} | ||||
| 	}) | ||||
|  | ||||
| 	if err := fn(nil, nil); err != nil { | ||||
| 		t.Fatal(err) | ||||
| 	} | ||||
|  | ||||
| 	if n != 0 { | ||||
| 		t.Fatalf("uncorrected hooks call") | ||||
| 	} | ||||
| } | ||||
|   | ||||
| @@ -123,7 +123,7 @@ func (m *memoryStore) Init(opts ...store.Option) error { | ||||
| 	m.funcList = m.fnList | ||||
| 	m.funcDelete = m.fnDelete | ||||
|  | ||||
| 	m.opts.Hooks.EachNext(func(hook options.Hook) { | ||||
| 	m.opts.Hooks.EachPrev(func(hook options.Hook) { | ||||
| 		switch h := hook.(type) { | ||||
| 		case store.HookRead: | ||||
| 			m.funcRead = h(m.funcRead) | ||||
|   | ||||
| @@ -54,7 +54,7 @@ func (n *noopStore) Init(opts ...Option) error { | ||||
| 	n.funcList = n.fnList | ||||
| 	n.funcDelete = n.fnDelete | ||||
|  | ||||
| 	n.opts.Hooks.EachNext(func(hook options.Hook) { | ||||
| 	n.opts.Hooks.EachPrev(func(hook options.Hook) { | ||||
| 		switch h := hook.(type) { | ||||
| 		case HookRead: | ||||
| 			n.funcRead = h(n.funcRead) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user