mirror of
				https://github.com/go-kratos/kratos.git
				synced 2025-10-30 23:47:59 +02:00 
			
		
		
		
	chroe: chore update (#3367)
This commit is contained in:
		| @@ -80,9 +80,6 @@ func (s *source) Load() ([]*config.KeyValue, error) { | |||||||
| 		return nil, err | 		return nil, err | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	if err != nil { |  | ||||||
| 		return nil, err |  | ||||||
| 	} |  | ||||||
| 	content := configFile.GetContent() | 	content := configFile.GetContent() | ||||||
| 	k := s.options.fileName | 	k := s.options.fileName | ||||||
|  |  | ||||||
|   | |||||||
| @@ -28,28 +28,28 @@ type options struct { | |||||||
| 	tags            map[string]interface{} | 	tags            map[string]interface{} | ||||||
| } | } | ||||||
|  |  | ||||||
| // Repanic configures whether Sentry should repanic after recovery, in most cases it should be set to true. | // WithRepanic repanic configures whether Sentry should repanic after recovery, in most cases it should be set to true. | ||||||
| func WithRepanic(repanic bool) Option { | func WithRepanic(repanic bool) Option { | ||||||
| 	return func(opts *options) { | 	return func(opts *options) { | ||||||
| 		opts.repanic = repanic | 		opts.repanic = repanic | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|  |  | ||||||
| // WaitForDelivery configures whether you want to block the request before moving forward with the response. | // WithWaitForDelivery waitForDelivery configures whether you want to block the request before moving forward with the response. | ||||||
| func WithWaitForDelivery(waitForDelivery bool) Option { | func WithWaitForDelivery(waitForDelivery bool) Option { | ||||||
| 	return func(opts *options) { | 	return func(opts *options) { | ||||||
| 		opts.waitForDelivery = waitForDelivery | 		opts.waitForDelivery = waitForDelivery | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|  |  | ||||||
| // Timeout for the event delivery requests. | // WithTimeout timeout for the event delivery requests. | ||||||
| func WithTimeout(timeout time.Duration) Option { | func WithTimeout(timeout time.Duration) Option { | ||||||
| 	return func(opts *options) { | 	return func(opts *options) { | ||||||
| 		opts.timeout = timeout | 		opts.timeout = timeout | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
|  |  | ||||||
| // Global tags injection, the value type must be string or log.Valuer | // WithTags global tags injection, the value type must be string or log.Valuer | ||||||
| func WithTags(kvs map[string]interface{}) Option { | func WithTags(kvs map[string]interface{}) Option { | ||||||
| 	return func(opts *options) { | 	return func(opts *options) { | ||||||
| 		opts.tags = kvs | 		opts.tags = kvs | ||||||
|   | |||||||
| @@ -199,7 +199,7 @@ func (d *Discovery) serverProc() { | |||||||
| 		apps, err := d.polls(ctx) | 		apps, err := d.polls(ctx) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			d.switchNode() | 			d.switchNode() | ||||||
| 			if ctx.Err() == context.Canceled { | 			if errors.Is(ctx.Err(), context.Canceled) { | ||||||
| 				ctx = nil | 				ctx = nil | ||||||
| 				continue | 				continue | ||||||
| 			} | 			} | ||||||
|   | |||||||
| @@ -2,6 +2,7 @@ package zookeeper | |||||||
|  |  | ||||||
| import ( | import ( | ||||||
| 	"context" | 	"context" | ||||||
|  | 	"errors" | ||||||
| 	"path" | 	"path" | ||||||
| 	"time" | 	"time" | ||||||
|  |  | ||||||
| @@ -143,7 +144,7 @@ func (r *Registry) ensureName(path string, data []byte, flags int32) error { | |||||||
| 	// fixes a race condition if the server crashes without using CreateProtectedEphemeralSequential() | 	// fixes a race condition if the server crashes without using CreateProtectedEphemeralSequential() | ||||||
| 	if flags&zk.FlagEphemeral == zk.FlagEphemeral { | 	if flags&zk.FlagEphemeral == zk.FlagEphemeral { | ||||||
| 		err = r.conn.Delete(path, stat.Version) | 		err = r.conn.Delete(path, stat.Version) | ||||||
| 		if err != nil && err != zk.ErrNoNode { | 		if err != nil && !errors.Is(err, zk.ErrNoNode) { | ||||||
| 			return err | 			return err | ||||||
| 		} | 		} | ||||||
| 		exists = false | 		exists = false | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user