go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-10-30 23:47:59 +02:00
Code Issues Releases Activity

chroe: chore update (#3367)

Browse Source
This commit is contained in:
yonwoo9
2024-07-22 19:37:54 +08:00
committed by GitHub
parent 7eb39d0c39
commit 5bb067a38d
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/config/polaris/config.go
View File

@@ -80,9 +80,6 @@ func (s *source) Load() ([]*config.KeyValue, error) {
return nil, err
}
if err != nil {
return nil, err
}
content := configFile.GetContent()
k := s.options.fileName

8
contrib/errortracker/sentry/sentry.go
View File

@@ -28,28 +28,28 @@ type options struct {
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 {
return func(opts *options) {
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 {
return func(opts *options) {
opts.waitForDelivery = waitForDelivery
}
}
// Timeout for the event delivery requests.
// WithTimeout timeout for the event delivery requests.
func WithTimeout(timeout time.Duration) Option {
return func(opts *options) {
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 {
return func(opts *options) {
opts.tags = kvs

2
contrib/registry/discovery/discovery.go
View File

@@ -199,7 +199,7 @@ func (d *Discovery) serverProc() {
apps, err := d.polls(ctx)
if err != nil {
d.switchNode()
if ctx.Err() == context.Canceled {
if errors.Is(ctx.Err(), context.Canceled) {
ctx = nil
continue
}

3
contrib/registry/zookeeper/register.go
View File

@@ -2,6 +2,7 @@ package zookeeper
import (
"context"
"errors"
"path"
"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()
if flags&zk.FlagEphemeral == zk.FlagEphemeral {
err = r.conn.Delete(path, stat.Version)
if err != nil && err != zk.ErrNoNode {
if err != nil && !errors.Is(err, zk.ErrNoNode) {
return err
}
exists = false