fix: wrapper option

go-god · Jan 10, 2022 · bbb41e2 · bbb41e2
1 parent 962c419
commit bbb41e2
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 16 deletions.
diff --git a/chanwrap/chan_wrap_impl.go b/chanwrap/chan_wrap_impl.go
@@ -15,10 +15,10 @@ type WrapImpl struct {
 }
 
 // New create wrapImpl entity
-func New(opts ...wrapper.Options) wrapper.Wrapper {
+func New(opts ...wrapper.Option) wrapper.Wrapper {
 	w := &WrapImpl{}
 
-	var option = &wrapper.Option{}
+	var option = &wrapper.Options{}
 	for _, o := range opts {
 		o(option)
 	}

diff --git a/chanwrap/chan_wrap_test.go b/chanwrap/chan_wrap_test.go
@@ -7,8 +7,14 @@ import (
 	"github.com/go-god/wrapper"
 )
 
+func mockRecovery() {
+	if err := recover(); err != nil {
+		log.Printf("exec recover:%v\n", err)
+	}
+}
+
 func TestWrapper(t *testing.T) {
-	var wg = New(wrapper.WithBufCap(2))
+	var wg = New(wrapper.WithBufCap(2), wrapper.WithRecover(mockRecovery))
 	wg.Wrap(func() {
 		log.Println("1111")
 	})

diff --git a/factory/wrap_factory.go b/factory/wrap_factory.go
@@ -6,7 +6,7 @@ import (
 	"github.com/go-god/wrapper/waitgroup"
 )
 
-type constructor func(opts ...wrapper.Options) wrapper.Wrapper
+type constructor func(opts ...wrapper.Option) wrapper.Wrapper
 
 const (
 	// WgWrapper waitGroup wrapper
@@ -21,15 +21,15 @@ var wrapperMap = map[string]constructor{
 }
 
 // New create wrapper interface
-func New(name string, opts ...wrapper.Options) wrapper.Wrapper {
+func New(name string, opts ...wrapper.Option) wrapper.Wrapper {
 	if w, ok := wrapperMap[name]; ok {
-		return w()
+		return w(opts...)
 	}
 
 	panic("wrapper type not exists")
 }
 
-// Register register gdi.Injector
+// Register register wrapper
 func Register(name string, c constructor) {
 	_, ok := wrapperMap[name]
 	if ok {

diff --git a/waitgroup/waitgroup_impl.go b/waitgroup/waitgroup_impl.go
@@ -14,12 +14,12 @@ type WrapImpl struct {
 }
 
 // New create wrapper entity
-func New(opts ...wrapper.Options) wrapper.Wrapper {
+func New(opts ...wrapper.Option) wrapper.Wrapper {
 	w := &WrapImpl{
 		recoveryFunc: grecover.DefaultRecovery,
 	}
 
-	var option = &wrapper.Option{}
+	var option = &wrapper.Options{}
 	for _, o := range opts {
 		o(option)
 	}

diff --git a/waitgroup/waitgroup_test.go b/waitgroup/waitgroup_test.go
@@ -3,6 +3,8 @@ package waitgroup
 import (
 	"log"
 	"testing"
+
+	"github.com/go-god/wrapper"
 )
 
 func mockRecovery() {
@@ -12,7 +14,7 @@ func mockRecovery() {
 }
 
 func TestWrapper(t *testing.T) {
-	var wg = New()
+	var wg = New(wrapper.WithRecover(mockRecovery))
 	wg.Wrap(func() {
 		log.Println("1111")
 	})

diff --git a/wrapper.go b/wrapper.go
@@ -13,24 +13,24 @@ type Wrapper interface {
 }
 
 // Option wrapper option
-type Option struct {
+type Options struct {
 	BufCap       int
 	RecoveryFunc func()
 }
 
 // Options option func
-type Options func(o *Option)
+type Option func(o *Options)
 
 // WithBufCap set buf cap
-func WithBufCap(c int) Options {
-	return func(o *Option) {
+func WithBufCap(c int) Option {
+	return func(o *Options) {
 		o.BufCap = c
 	}
 }
 
 // WithRecover set recover func
-func WithRecover(recoveryFunc func()) Options {
-	return func(o *Option) {
+func WithRecover(recoveryFunc func()) Option {
+	return func(o *Options) {
 		o.RecoveryFunc = recoveryFunc
 	}
 }