config: add helper funcs

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

codec/codec.go

@@ -25,7 +25,7 @@ var (
 
 var (
 	// DefaultMaxMsgSize specifies how much data codec can handle
-	DefaultMaxMsgSize int = 1024 * 1024 * 4 // 4Mb
+	DefaultMaxMsgSize = 1024 * 1024 * 4 // 4Mb
 	// DefaultCodec is the global default codec
 	DefaultCodec Codec = NewCodec()
 	// DefaultTagName specifies struct tag name to control codec Marshal/Unmarshal

config/config.go

@@ -64,3 +64,53 @@ func Load(ctx context.Context, cs []Config, opts ...LoadOption) error {
 	}
 	return nil
 }
+
+var (
+	DefaultAfterLoad = func(ctx context.Context, c Config) error {
+		for _, fn := range c.Options().AfterLoad {
+			if err := fn(ctx, c); err != nil {
+				c.Options().Logger.Errorf(ctx, "%s AfterLoad err: %v", c.String(), err)
+				if !c.Options().AllowFail {
+					return err
+				}
+			}
+		}
+		return nil
+	}
+
+	DefaultAfterSave = func(ctx context.Context, c Config) error {
+		for _, fn := range c.Options().AfterSave {
+			if err := fn(ctx, c); err != nil {
+				c.Options().Logger.Errorf(ctx, "%s AfterSave err: %v", c.String(), err)
+				if !c.Options().AllowFail {
+					return err
+				}
+			}
+		}
+		return nil
+	}
+
+	DefaultBeforeLoad = func(ctx context.Context, c Config) error {
+		for _, fn := range c.Options().BeforeLoad {
+			if err := fn(ctx, c); err != nil {
+				c.Options().Logger.Errorf(ctx, "%s BeforeLoad err: %v", c.String(), err)
+				if !c.Options().AllowFail {
+					return err
+				}
+			}
+		}
+		return nil
+	}
+
+	DefaultBeforeSave = func(ctx context.Context, c Config) error {
+		for _, fn := range c.Options().BeforeSave {
+			if err := fn(ctx, c); err != nil {
+				c.Options().Logger.Errorf(ctx, "%s BeforeSavec err: %v", c.String(), err)
+				if !c.Options().AllowFail {
+					return err
+				}
+			}
+		}
+		return nil
+	}
+)

config/default.go

@@ -27,10 +27,8 @@ func (c *defaultConfig) Init(opts ...Option) error {
 }
 
 func (c *defaultConfig) Load(ctx context.Context, opts ...LoadOption) error {
-	for _, fn := range c.opts.BeforeLoad {
+	if err := DefaultBeforeLoad(ctx, c); err != nil {
-		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
+		return err
-			return err
-		}
 	}
 
 	options := NewLoadOptions(opts...)
@@ -48,20 +46,26 @@ func (c *defaultConfig) Load(ctx context.Context, opts ...LoadOption) error {
 	}
 
 	src, err := rutil.Zero(dst)
-	if err == nil {
+	if err != nil {
-		if err = fillValues(reflect.ValueOf(src), c.opts.StructTag); err == nil {
+		if !c.opts.AllowFail {
-			err = mergo.Merge(dst, src, mopts...)
-		}
-	}
-
-	if err != nil && !c.opts.AllowFail {
-		return err
-	}
-
-	for _, fn := range c.opts.AfterLoad {
-		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
 			return err
 		}
+		return DefaultAfterLoad(ctx, c)
+	}
+
+	if err = fillValues(reflect.ValueOf(src), c.opts.StructTag); err == nil {
+		err = mergo.Merge(dst, src, mopts...)
+	}
+
+	if err != nil {
+		c.opts.Logger.Errorf(ctx, "default load error: %v", err)
+		if !c.opts.AllowFail {
+			return err
+		}
+	}
+
+	if err := DefaultAfterLoad(ctx, c); err != nil {
+		return err
 	}
 
 	return nil
@@ -247,16 +251,12 @@ func fillValues(valueOf reflect.Value, tname string) error {
 }
 
 func (c *defaultConfig) Save(ctx context.Context, opts ...SaveOption) error {
-	for _, fn := range c.opts.BeforeSave {
+	if err := DefaultBeforeSave(ctx, c); err != nil {
-		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
+		return err
-			return err
-		}
 	}
 
-	for _, fn := range c.opts.AfterSave {
+	if err := DefaultAfterSave(ctx, c); err != nil {
-		if err := fn(ctx, c); err != nil && !c.opts.AllowFail {
+		return err
-			return err
-		}
 	}
 
 	return nil

flow/default.go

@@ -20,13 +20,13 @@ type microFlow struct {
 }
 
 type microWorkflow struct {
-	id   string
-	g    *dag.AcyclicGraph
-	init bool
-	sync.RWMutex
 	opts   Options
+	g      *dag.AcyclicGraph
 	steps  map[string]Step
+	id     string
 	status Status
+	sync.RWMutex
+	init bool
 }
 
 func (w *microWorkflow) ID() string {
@@ -424,11 +424,11 @@ func (f *microFlow) WorkflowLoad(ctx context.Context, id string) (Workflow, erro
 }
 
 type microCallStep struct {
+	rsp     *Message
+	req     *Message
 	opts    StepOptions
 	service string
 	method  string
-	rsp     *Message
-	req     *Message
 	status  Status
 }
 
@@ -508,10 +508,10 @@ func (s *microCallStep) Execute(ctx context.Context, req *Message, opts ...Execu
 }
 
 type microPublishStep struct {
-	opts   StepOptions
-	topic  string
 	req    *Message
 	rsp    *Message
+	opts   StepOptions
+	topic  string
 	status Status
 }
 

flow/options.go

@@ -120,10 +120,10 @@ type ExecuteOptions struct {
 	Context context.Context
 	// Start step
 	Start string
-	// Reverse execution
-	Reverse bool
 	// Timeout for execution
 	Timeout time.Duration
+	// Reverse execution
+	Reverse bool
 	// Async enables async execution
 	Async bool
 }

server/subscriber.go

@@ -34,13 +34,13 @@ type handler struct {
 }
 
 type subscriber struct {
-	opts       SubscriberOptions
 	typ        reflect.Type
 	subscriber interface{}
 	rcvr       reflect.Value
 	topic      string
-	handlers   []*handler
 	endpoints  []*register.Endpoint
+	handlers   []*handler
+	opts       SubscriberOptions
 }
 
 // Is this an exported - upper case - name?

store/wrapper.go

@@ -69,9 +69,9 @@ func (w *NamespaceStore) String() string {
 
 // type NamespaceWrapper struct{}
 
-//func NewNamespaceWrapper() Wrapper {
+// func NewNamespaceWrapper() Wrapper {
 //	return &NamespaceWrapper{}
-//}
+// }
 
 /*
 func (w *OmitWrapper) Logf(fn LogfFunc) LogfFunc {