Skip to content

Commit 245cd99

Browse files
committed
unshadow some errs
1 parent 00c2310 commit 245cd99

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

cmd/mistify-agent/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func main() {
5353
}).Fatal("failed to create agent context")
5454
}
5555

56-
if err := ctx.CreateJobLog(); err != nil {
56+
if err = ctx.CreateJobLog(); err != nil {
5757
log.WithFields(log.Fields{
5858
"error": err,
5959
"func": "ctx.CreateJobLog",

examples/simple-subagent/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func main() {
6363
}).Fatal(err)
6464
}
6565

66-
if err := server.RegisterService(&s); err != nil {
66+
if err = server.RegisterService(&s); err != nil {
6767
log.WithFields(log.Fields{
6868
"error": err,
6969
"func": "rpc.Server.RegisterService",

examples/test-rpc-service/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ func main() {
337337
}
338338

339339
test := &Test{}
340-
if err := s.RegisterService(test); err != nil {
340+
if err = s.RegisterService(test); err != nil {
341341
log.WithFields(log.Fields{
342342
"error": err,
343343
"func": "rpc.Server.RegisterService",

examples/webhook-post/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func main() {
120120
Timeout: time.Second * 5,
121121
},
122122
}
123-
if err := s.RegisterService(w); err != nil {
123+
if err = s.RegisterService(w); err != nil {
124124
log.WithFields(log.Fields{
125125
"error": err,
126126
"func": "rpc.Server.RegisterService",

guest.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func createGuest(w http.ResponseWriter, r *http.Request) {
131131
return
132132
}
133133

134-
if err := ctx.PersistGuest(g); err != nil {
134+
if err = ctx.PersistGuest(g); err != nil {
135135
hr.JSONError(http.StatusInternalServerError, err)
136136
return
137137
}
@@ -280,7 +280,7 @@ func generateGuestAction(actionName string) http.HandlerFunc {
280280
g := getRequestGuest(r)
281281
runner := getRequestRunner(r)
282282

283-
actionName := prefixedActionName(g.Type, actionName)
283+
actionName = prefixedActionName(g.Type, actionName)
284284
action, err := ctx.GetAction(actionName)
285285
if err != nil {
286286
hr.JSONError(http.StatusNotFound, err)

guestRunner.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,12 +189,12 @@ func (pq *PipelineQueue) Process() {
189189
LogRunnerError(pq.GuestID, pq.Name, pipeline.ID, err.Error())
190190
}
191191
if err := pipeline.Run(); err != nil {
192-
if err := pq.Context.JobLog.UpdateJob(pipeline.ID, pipeline.Action, Errored, err.Error()); err != nil {
192+
if err = pq.Context.JobLog.UpdateJob(pipeline.ID, pipeline.Action, Errored, err.Error()); err != nil {
193193
LogRunnerError(pq.GuestID, pq.Name, pipeline.ID, err.Error())
194194
}
195195
LogRunnerError(pq.GuestID, pq.Name, pipeline.ID, err.Error())
196196
} else {
197-
if err := pq.Context.JobLog.UpdateJob(pipeline.ID, pipeline.Action, Complete, ""); err != nil {
197+
if err = pq.Context.JobLog.UpdateJob(pipeline.ID, pipeline.Action, Complete, ""); err != nil {
198198
LogRunnerError(pq.GuestID, pq.Name, pipeline.ID, err.Error())
199199
}
200200
LogRunnerInfo(pq.GuestID, pq.Name, pipeline.ID, "Success")

rpc/client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func (c *Client) Do(method string, request interface{}, response interface{}) er
4545

4646
if resp.StatusCode >= http.StatusBadRequest {
4747
var buf bytes.Buffer
48-
if _, err := buf.ReadFrom(resp.Body); err != nil {
48+
if _, err = buf.ReadFrom(resp.Body); err != nil {
4949
return err
5050
}
5151
return errors.New(buf.String())
@@ -74,7 +74,7 @@ func (c *Client) DoRaw(request interface{}, rw http.ResponseWriter) {
7474

7575
if resp.StatusCode != http.StatusOK {
7676
buf := new(bytes.Buffer)
77-
if _, err := buf.ReadFrom(resp.Body); err != nil {
77+
if _, err = buf.ReadFrom(resp.Body); err != nil {
7878
http.Error(rw, err.Error(), http.StatusInternalServerError)
7979
return
8080
}

0 commit comments

Comments
 (0)