alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix lost error

Browse Source
This commit is contained in:
Travis Reeder
2017-10-25 14:41:18 +02:00
parent de04562b8e
commit d30bcb0397
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/agent/call.go
View File

@@ -325,13 +325,13 @@ func (c *call) Start(ctx context.Context, t callTrigger) error {
return nil return nil
} }
func (c *call) End(ctx context.Context, err error, t callTrigger) error { func (c *call) End(ctx context.Context, errIn error, t callTrigger) error {
span, ctx := opentracing.StartSpanFromContext(ctx, "agent_call_end") span, ctx := opentracing.StartSpanFromContext(ctx, "agent_call_end")
defer span.Finish() defer span.Finish()
c.CompletedAt = strfmt.DateTime(time.Now()) c.CompletedAt = strfmt.DateTime(time.Now())
switch err { switch errIn {
case nil: case nil:
c.Status = "success" c.Status = "success"
case context.DeadlineExceeded: case context.DeadlineExceeded:
@@ -360,13 +360,11 @@ func (c *call) End(ctx context.Context, err error, t callTrigger) error {
// NOTE call this after InsertLog or the buffer will get reset // NOTE call this after InsertLog or the buffer will get reset
c.stderr.Close() c.stderr.Close()
err := t.fireAfterCall(ctx, c.Model())
err = t.fireAfterCall(ctx, c.Model())
if err != nil { if err != nil {
return fmt.Errorf("AfterCall: %v", err) return fmt.Errorf("AfterCall: %v", err)
} }
return err return errIn
} }
func fakeHandler(http.ResponseWriter, *http.Request, Params) {} func fakeHandler(http.ResponseWriter, *http.Request, Params) {}