Skip to content

Commit 5e76472

Browse files
CMGSanrs
CMGS
authored and
anrs
committed
add error replace errorf in some func
1 parent 45c7e5e commit 5e76472

23 files changed

+93
-87
lines changed

‎client/utils/servicepusher.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func (p *EndpointPusher) addCheck(endpoints []string) {
8282
func (p *EndpointPusher) pollReachability(ctx context.Context, endpoint string) {
8383
parts := strings.Split(endpoint, ":")
8484
if len(parts) != 2 {
85-
log.Errorf(ctx, nil, "[EruResolver] wrong format of endpoint: %s", endpoint)
85+
log.Errorf(ctx, types.ErrInvalidType, "[EruResolver] wrong format of endpoint: %s", endpoint)
8686
return
8787
}
8888

‎cluster/calcium/build.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ func (c *Calcium) BuildImage(ctx context.Context, opts *types.BuildOptions) (ch
2020
logger := log.WithField("Calcium", "BuildImage").WithField("opts", opts)
2121
// Disable build API if scm not set
2222
if c.source == nil {
23-
logger.Errorf(ctx, types.ErrSCMNotSet, "")
23+
logger.Error(ctx, types.ErrSCMNotSet)
2424
return nil, types.ErrSCMNotSet
2525
}
2626
// select nodes
2727
node, err := c.selectBuildNode(ctx)
2828
if err != nil {
29-
logger.Errorf(ctx, err, "")
29+
logger.Error(ctx, err)
3030
return nil, err
3131
}
3232

@@ -44,15 +44,15 @@ func (c *Calcium) BuildImage(ctx context.Context, opts *types.BuildOptions) (ch
4444
case types.BuildFromExist:
4545
refs, node, resp, err = c.buildFromExist(ctx, opts)
4646
default:
47-
logger.Errorf(ctx, types.ErrUnknownBuildType, "")
47+
logger.Error(ctx, types.ErrUnknownBuildType)
4848
return nil, types.ErrUnknownBuildType
4949
}
5050
if err != nil {
51-
logger.Errorf(ctx, err, "")
51+
logger.Error(ctx, err)
5252
return nil, err
5353
}
5454
ch, err = c.pushImageAndClean(ctx, resp, node, refs)
55-
logger.Errorf(ctx, err, "")
55+
logger.Error(ctx, err)
5656
return ch, err
5757
}
5858

@@ -171,7 +171,7 @@ func (c *Calcium) pushImageAndClean(ctx context.Context, resp io.ReadCloser, nod
171171
log.Infof(ctx, "[BuildImage] Push image %s", tag)
172172
rc, err := node.Engine.ImagePush(ctx, tag)
173173
if err != nil {
174-
logger.Errorf(ctx, err, "")
174+
logger.Error(ctx, err)
175175
ch <- &types.BuildImageMessage{Error: err.Error()}
176176
continue
177177
}

‎cluster/calcium/calcium.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func New(ctx context.Context, config types.Config, t *testing.T) (*Calcium, erro
3939
// set store
4040
store, err := store.NewStore(config, t)
4141
if err != nil {
42-
log.Errorf(ctx, err, "")
42+
log.Error(ctx, err)
4343
return nil, err
4444
}
4545

@@ -65,7 +65,7 @@ func New(ctx context.Context, config types.Config, t *testing.T) (*Calcium, erro
6565
// set resource plugin manager
6666
rmgr, err := resources.NewPluginsManager(config)
6767
if err != nil {
68-
log.Errorf(ctx, err, "")
68+
log.Error(ctx, err)
6969
return nil, err
7070
}
7171

@@ -96,18 +96,18 @@ func New(ctx context.Context, config types.Config, t *testing.T) (*Calcium, erro
9696

9797
cal.wal, err = enableWAL(config, cal, store)
9898
if err != nil {
99-
log.Errorf(ctx, err, "")
99+
log.Error(ctx, err)
100100
return nil, err
101101
}
102102

103103
cal.identifier, err = config.Identifier()
104104
if err != nil {
105-
log.Errorf(ctx, err, "")
105+
log.Error(ctx, err)
106106
return nil, err
107107
}
108108

109109
_ = pool.Invoke(func() { cal.InitMetrics(ctx) })
110-
log.Errorf(ctx, err, "")
110+
log.Error(ctx, err)
111111
return cal, err
112112
}
113113

‎cluster/calcium/control.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func (c *Calcium) ControlWorkload(ctx context.Context, ids []string, t string, f
5151
logger.Infof(ctx, "%v", "[ControlWorkload] Hook Output:")
5252
logger.Infof(ctx, "%v", string(utils.MergeHookOutputs(message)))
5353
}
54-
logger.Errorf(ctx, err, "")
54+
logger.Error(ctx, err)
5555
ch <- &types.ControlWorkloadMessage{
5656
WorkloadID: id,
5757
Error: err,

‎cluster/calcium/copy.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
func (c *Calcium) Copy(ctx context.Context, opts *types.CopyOptions) (chan *types.CopyMessage, error) {
1313
logger := log.WithField("Calcium", "Copy").WithField("opts", opts)
1414
if err := opts.Validate(); err != nil {
15-
logger.Errorf(ctx, err, "")
15+
logger.Error(ctx, err)
1616
return nil, err
1717
}
1818

@@ -34,7 +34,7 @@ func (c *Calcium) Copy(ctx context.Context, opts *types.CopyOptions) (chan *type
3434
workload, err := c.GetWorkload(ctx, id)
3535
if err != nil {
3636
for _, path := range paths {
37-
logger.Errorf(ctx, err, "")
37+
logger.Error(ctx, err)
3838
ch <- &types.CopyMessage{
3939
ID: id,
4040
Path: path,

‎cluster/calcium/create.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
func (c *Calcium) CreateWorkload(ctx context.Context, opts *types.DeployOptions) (chan *types.CreateWorkloadMessage, error) {
2424
logger := log.WithField("Calcium", "CreateWorkload").WithField("opts", opts)
2525
if err := opts.Validate(); err != nil {
26-
logger.Errorf(ctx, err, "")
26+
logger.Error(ctx, err)
2727
return nil, err
2828
}
2929

@@ -32,7 +32,7 @@ func (c *Calcium) CreateWorkload(ctx context.Context, opts *types.DeployOptions)
3232
// Count 要大于0
3333
if opts.Count <= 0 {
3434
err := types.NewDetailedErr(types.ErrBadCount, opts.Count)
35-
logger.Errorf(ctx, err, "")
35+
logger.Error(ctx, err)
3636
return nil, err
3737
}
3838

@@ -97,7 +97,7 @@ func (c *Calcium) doCreateWorkloads(ctx context.Context, opts *types.DeployOptio
9797
func(ctx context.Context) (err error) {
9898
defer func() {
9999
if err != nil {
100-
logger.Errorf(ctx, err, "")
100+
logger.Error(ctx, err)
101101
ch <- &types.CreateWorkloadMessage{Error: err}
102102
}
103103
}()
@@ -156,7 +156,7 @@ func (c *Calcium) doCreateWorkloads(ctx context.Context, opts *types.DeployOptio
156156
})
157157
return c.rmgr.RollbackAlloc(ctx, nodename, resourceArgsToRollback)
158158
}); e != nil {
159-
logger.Errorf(ctx, e, "")
159+
logger.Error(ctx, e)
160160
err = e
161161
}
162162
}
@@ -227,7 +227,7 @@ func (c *Calcium) doDeployWorkloadsOnNode(ctx context.Context,
227227
node, err := c.doGetAndPrepareNode(ctx, nodename, opts.Image)
228228
if err != nil {
229229
for i := 0; i < deploy; i++ {
230-
logger.Errorf(ctx, err, "")
230+
logger.Error(ctx, err)
231231
ch <- &types.CreateWorkloadMessage{Error: err}
232232
}
233233
return utils.Range(deploy), err
@@ -250,7 +250,7 @@ func (c *Calcium) doDeployWorkloadsOnNode(ctx context.Context,
250250
defer func() {
251251
if e != nil {
252252
err = e
253-
logger.Errorf(ctx, err, "")
253+
logger.Error(ctx, err)
254254
createMsg.Error = err
255255
appendLock.Lock()
256256
indices = append(indices, idx)

‎cluster/calcium/image.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ import (
1515
func (c *Calcium) CacheImage(ctx context.Context, opts *types.ImageOptions) (chan *types.CacheImageMessage, error) {
1616
logger := log.WithField("Calcium", "CacheImage").WithField("opts", opts)
1717
if err := opts.Validate(); err != nil {
18-
logger.Errorf(ctx, err, "")
18+
logger.Error(ctx, err)
1919
return nil, err
2020
}
2121

2222
nodes, err := c.filterNodes(ctx, &types.NodeFilter{Podname: opts.Podname, Includes: opts.Nodenames})
2323
if err != nil {
24-
logger.Errorf(ctx, err, "")
24+
logger.Error(ctx, err)
2525
return nil, err
2626
}
2727

2828
if len(nodes) == 0 {
29-
logger.Errorf(ctx, types.ErrPodNoNodes, "")
29+
logger.Error(ctx, types.ErrPodNoNodes)
3030
return nil, types.ErrPodNoNodes
3131
}
3232

@@ -49,7 +49,7 @@ func (c *Calcium) CacheImage(ctx context.Context, opts *types.ImageOptions) (cha
4949
Message: "",
5050
}
5151
if err := pullImage(ctx, node, image); err != nil {
52-
logger.Errorf(ctx, err, "")
52+
logger.Error(ctx, err)
5353
m.Success = false
5454
m.Message = err.Error()
5555
}
@@ -66,18 +66,18 @@ func (c *Calcium) CacheImage(ctx context.Context, opts *types.ImageOptions) (cha
6666
func (c *Calcium) RemoveImage(ctx context.Context, opts *types.ImageOptions) (chan *types.RemoveImageMessage, error) {
6767
logger := log.WithField("Calcium", "RemoveImage").WithField("opts", opts)
6868
if err := opts.Validate(); err != nil {
69-
logger.Errorf(ctx, err, "")
69+
logger.Error(ctx, err)
7070
return nil, err
7171
}
7272

7373
nodes, err := c.filterNodes(ctx, &types.NodeFilter{Podname: opts.Podname, Includes: opts.Nodenames})
7474
if err != nil {
75-
logger.Errorf(ctx, err, "")
75+
logger.Error(ctx, err)
7676
return nil, err
7777
}
7878

7979
if len(nodes) == 0 {
80-
logger.Errorf(ctx, types.ErrPodNoNodes, "")
80+
logger.Error(ctx, types.ErrPodNoNodes)
8181
return nil, types.ErrPodNoNodes
8282
}
8383

@@ -99,7 +99,7 @@ func (c *Calcium) RemoveImage(ctx context.Context, opts *types.ImageOptions) (ch
9999
Messages: []string{},
100100
}
101101
if removeItems, err := node.Engine.ImageRemove(ctx, image, false, true); err != nil {
102-
logger.Errorf(ctx, err, "")
102+
logger.Error(ctx, err)
103103
m.Messages = append(m.Messages, err.Error())
104104
} else {
105105
m.Success = true
@@ -129,12 +129,12 @@ func (c *Calcium) ListImage(ctx context.Context, opts *types.ImageOptions) (chan
129129

130130
nodes, err := c.filterNodes(ctx, &types.NodeFilter{Podname: opts.Podname, Includes: opts.Nodenames})
131131
if err != nil {
132-
logger.Errorf(ctx, err, "")
132+
logger.Error(ctx, err)
133133
return nil, err
134134
}
135135

136136
if len(nodes) == 0 {
137-
logger.Errorf(ctx, types.ErrPodNoNodes, "")
137+
logger.Error(ctx, types.ErrPodNoNodes)
138138
return nil, types.ErrPodNoNodes
139139
}
140140

@@ -155,7 +155,7 @@ func (c *Calcium) ListImage(ctx context.Context, opts *types.ImageOptions) (chan
155155
Error: nil,
156156
}
157157
if images, err := node.Engine.ImageList(ctx, opts.Filter); err != nil {
158-
logger.Errorf(ctx, err, "")
158+
logger.Error(ctx, err)
159159
msg.Error = err
160160
} else {
161161
for _, image := range images {

‎cluster/calcium/lambda.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func (c *Calcium) RunAndWait(ctx context.Context, opts *types.DeployOptions, inC
2525

2626
logger := log.WithField("Calcium", "RunAndWait").WithField("opts", opts)
2727
if err := opts.Validate(); err != nil {
28-
logger.Errorf(ctx, err, "")
28+
logger.Error(ctx, err)
2929
return workloadIDs, nil, err
3030
}
3131
opts.Lambda = true
@@ -68,7 +68,7 @@ func (c *Calcium) RunAndWait(ctx context.Context, opts *types.DeployOptions, inC
6868

6969
commit, err := c.wal.Log(eventCreateLambda, message.WorkloadID)
7070
if err != nil {
71-
logger.Errorf(ctx, err, "")
71+
logger.Error(ctx, err)
7272
return &types.AttachWorkloadMessage{
7373
WorkloadID: message.WorkloadID,
7474
Data: []byte(fmt.Sprintf("Create wal failed: %s, %+v", message.WorkloadID, err)),

‎cluster/calcium/log.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func (c *Calcium) LogStream(ctx context.Context, opts *types.LogStreamOptions) (
1717
defer close(ch)
1818
workload, err := c.GetWorkload(ctx, opts.ID)
1919
if err != nil {
20-
logger.Errorf(ctx, err, "")
20+
logger.Error(ctx, err)
2121
ch <- &types.LogStreamMessage{ID: opts.ID, Error: err}
2222
return
2323
}
@@ -31,7 +31,7 @@ func (c *Calcium) LogStream(ctx context.Context, opts *types.LogStreamOptions) (
3131
Stdout: true,
3232
Stderr: true,
3333
})
34-
logger.Errorf(ctx, err, "")
34+
logger.Error(ctx, err)
3535
if err != nil {
3636
ch <- &types.LogStreamMessage{ID: opts.ID, Error: err}
3737
return

‎cluster/calcium/network.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ func (c *Calcium) ListNetworks(ctx context.Context, podname string, driver strin
1717
networks := []*enginetypes.Network{}
1818
nodes, err := c.store.GetNodesByPod(ctx, &types.NodeFilter{Podname: podname})
1919
if err != nil {
20-
logger.Errorf(ctx, err, "")
20+
logger.Error(ctx, err)
2121
return networks, err
2222
}
2323

2424
if len(nodes) == 0 {
2525
err := types.NewDetailedErr(types.ErrPodNoNodes, podname)
26-
logger.Errorf(ctx, err, "")
26+
logger.Error(ctx, err)
2727
return networks, err
2828
}
2929

@@ -35,7 +35,7 @@ func (c *Calcium) ListNetworks(ctx context.Context, podname string, driver strin
3535
node := nodes[0]
3636

3737
networks, err = node.Engine.NetworkList(ctx, drivers)
38-
logger.Errorf(ctx, err, "")
38+
logger.Error(ctx, err)
3939
return networks, err
4040
}
4141

@@ -44,12 +44,12 @@ func (c *Calcium) ConnectNetwork(ctx context.Context, network, target, ipv4, ipv
4444
logger := log.WithField("Calcium", "ConnectNetwork").WithField("network", network).WithField("target", target).WithField("ipv4", ipv4).WithField("ipv6", ipv6)
4545
workload, err := c.GetWorkload(ctx, target)
4646
if err != nil {
47-
logger.Errorf(ctx, err, "")
47+
logger.Error(ctx, err)
4848
return nil, err
4949
}
5050

5151
networks, err := workload.Engine.NetworkConnect(ctx, network, target, ipv4, ipv6)
52-
logger.Errorf(ctx, err, "")
52+
logger.Error(ctx, err)
5353
return networks, err
5454
}
5555

@@ -58,11 +58,11 @@ func (c *Calcium) DisconnectNetwork(ctx context.Context, network, target string,
5858
logger := log.WithField("Calcium", "DisconnectNetwork").WithField("network", network).WithField("target", target).WithField("force", force)
5959
workload, err := c.GetWorkload(ctx, target)
6060
if err != nil {
61-
logger.Errorf(ctx, err, "")
61+
logger.Error(ctx, err)
6262
return err
6363
}
6464
if err = workload.Engine.NetworkDisconnect(ctx, network, target, force); err != nil {
65-
logger.Errorf(ctx, err, "")
65+
logger.Error(ctx, err)
6666
}
6767
return err
6868
}

0 commit comments

Comments
 (0)