fixup conditions
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
		
							
								
								
									
										8
									
								
								file.go
									
									
									
									
									
								
							
							
						
						
									
										8
									
								
								file.go
									
									
									
									
									
								
							| @@ -54,6 +54,10 @@ func (c *fileConfig) Init(opts ...options.Option) error { | ||||
| } | ||||
|  | ||||
| func (c *fileConfig) Load(ctx context.Context, opts ...options.Option) error { | ||||
| 	if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) { | ||||
| 		return nil | ||||
| 	} | ||||
|  | ||||
| 	if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail { | ||||
| 		return err | ||||
| 	} | ||||
| @@ -125,6 +129,10 @@ func (c *fileConfig) Load(ctx context.Context, opts ...options.Option) error { | ||||
| } | ||||
|  | ||||
| func (c *fileConfig) Save(ctx context.Context, opts ...options.Option) error { | ||||
| 	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) { | ||||
| 		return nil | ||||
| 	} | ||||
|  | ||||
| 	if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail { | ||||
| 		return err | ||||
| 	} | ||||
|   | ||||
							
								
								
									
										7
									
								
								go.mod
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								go.mod
									
									
									
									
									
								
							| @@ -4,7 +4,10 @@ go 1.20 | ||||
|  | ||||
| require ( | ||||
| 	github.com/imdario/mergo v0.3.16 | ||||
| 	go.unistack.org/micro/v4 v4.0.6 | ||||
| 	go.unistack.org/micro/v4 v4.0.15 | ||||
| ) | ||||
|  | ||||
| require github.com/google/uuid v1.3.0 // indirect | ||||
| require ( | ||||
| 	dario.cat/mergo v1.0.0 // indirect | ||||
| 	github.com/google/uuid v1.5.0 // indirect | ||||
| ) | ||||
|   | ||||
							
								
								
									
										6
									
								
								go.sum
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								go.sum
									
									
									
									
									
								
							| @@ -1,5 +1,9 @@ | ||||
| dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= | ||||
| dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= | ||||
| github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= | ||||
| github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= | ||||
| github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= | ||||
| github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= | ||||
| github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM= | ||||
| github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= | ||||
| github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= | ||||
| @@ -7,6 +11,8 @@ go.unistack.org/micro/v4 v4.0.1 h1:xo1IxbVfgh8i0eY0VeYa3cbb13u5n/Mxnp3FOgWD4Jo= | ||||
| go.unistack.org/micro/v4 v4.0.1/go.mod h1:p/J5UcSJjfHsWGT31uKoghQ5rUQZzQJBAFy+Z4+ZVMs= | ||||
| go.unistack.org/micro/v4 v4.0.6 h1:YFWvTh3VwyOd6NHYTQcf47n2TF5+p/EhpnbuBQX3qhk= | ||||
| go.unistack.org/micro/v4 v4.0.6/go.mod h1:bVEYTlPi0EsdgZZt311bIroDg9ict7ky3C87dSCCAGk= | ||||
| go.unistack.org/micro/v4 v4.0.15 h1:o4++RYX5guVPxfcJpP7VCj2Xr9BPFo6fj4+b5FStdEI= | ||||
| go.unistack.org/micro/v4 v4.0.15/go.mod h1:ZDgU9931vm2l7X6RN/6UuwRIVp24GRdmQ7dKmegArk4= | ||||
| gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||||
| gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= | ||||
| gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | ||||
|   | ||||
		Reference in New Issue
	
	Block a user