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

fn: add details to runner finish logging (#1271)

Browse Source 
Adding http-status/fn-http-status details in runner finish
logger.
This commit is contained in:
Tolga Ceylan
2018-10-15 12:15:08 -07:00
committed by GitHub
parent 50643cfe23
commit 44e366d195
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/agent/runner_client.go
View File

@@ -7,6 +7,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"io" "io"
"net/http"
"time" "time"
"google.golang.org/grpc" "google.golang.org/grpc"
@@ -21,6 +22,7 @@ import (
"github.com/fnproject/fn/grpcutil" "github.com/fnproject/fn/grpcutil"
pb_empty "github.com/golang/protobuf/ptypes/empty" pb_empty "github.com/golang/protobuf/ptypes/empty"
"github.com/sirupsen/logrus"
) )
var ( var (
@@ -302,6 +304,7 @@ func receiveFromRunner(ctx context.Context, protocolClient pb.RunnerProtocol_Eng
defer close(done) defer close(done)
log := common.Logger(ctx).WithField("runner_addr", runnerAddress) log := common.Logger(ctx).WithField("runner_addr", runnerAddress)
statusCode := int32(0)
isPartialWrite := false isPartialWrite := false
DataLoop: DataLoop:
@@ -325,6 +328,7 @@ DataLoop:
w.Header().Set(header.Key, header.Value) w.Header().Set(header.Key, header.Value)
} }
if meta.Http.StatusCode > 0 { if meta.Http.StatusCode > 0 {
statusCode = meta.Http.StatusCode
w.WriteHeader(int(meta.Http.StatusCode)) w.WriteHeader(int(meta.Http.StatusCode))
} }
default: default:
@@ -349,7 +353,7 @@ DataLoop:
// Finish messages required for finish/finalize the processing. // Finish messages required for finish/finalize the processing.
case *pb.RunnerMsg_Finished: case *pb.RunnerMsg_Finished:
log.Infof("Call finished Success=%v %v", body.Finished.Success, body.Finished.Details) logCallFinish(log, body, w.Header(), statusCode)
recordFinishStats(ctx, body.Finished) recordFinishStats(ctx, body.Finished)
if !body.Finished.Success { if !body.Finished.Success {
err := parseError(body.Finished) err := parseError(body.Finished)
@@ -382,4 +386,13 @@ DataLoop:
} }
} }
func logCallFinish(log logrus.FieldLogger, msg *pb.RunnerMsg_Finished, headers http.Header, httpStatus int32) {
log.WithFields(logrus.Fields{
"RunnerSuccess": msg.Finished.GetSuccess(),
"RunnerErrorCode": msg.Finished.GetErrorCode(),
"RunnerHttpStatus": httpStatus,
"FnHttpStatus": headers.Get("Fn-Http-Status"),
}).Infof("Call finished Details=%v ErrorStr=%v", msg.Finished.GetDetails(), msg.Finished.GetErrorStr())
}
var _ pool.Runner = &gRPCRunner{} var _ pool.Runner = &gRPCRunner{}