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

Use context logging more to ensure context vars are present in log lines (#1039)

Browse Source
This commit is contained in:
Owen Cliffe
2018-06-06 15:14:29 +01:00
committed by Reed Allman
parent 19bc5cf852
commit c6abc8bf64
8 changed files with 56 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
grpcutil/dial.go
View File

@@ -10,8 +10,7 @@ import (
"net"
"time"
"github.com/sirupsen/logrus"
"github.com/fnproject/fn/api/common"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
)
@@ -23,23 +22,24 @@ func DialWithBackoff(ctx context.Context, address string, creds credentials.Tran
// uses grpc connection backoff protocol https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md
func dial(ctx context.Context, address string, creds credentials.TransportCredentials, timeoutDialer time.Duration, opts ...grpc.DialOption) (*grpc.ClientConn, error) {
dialer := func(address string, timeout time.Duration) (net.Conn, error) {
log := common.Logger(ctx).WithField("grpc_addr", address)
ctx, cancel := context.WithTimeout(ctx, timeout)
defer cancel()
conn, err := (&net.Dialer{Cancel: ctx.Done(), Timeout: timeoutDialer}).Dial("tcp", address)
if err != nil {
logrus.WithError(err).WithField("grpc_addr", address).Warn("Failed to dial grpc connection")
log.WithError(err).Warn("Failed to dial grpc connection")
return nil, err
}
if creds == nil {
logrus.WithField("grpc_addr", address).Warn("Created insecure grpc connection")
log.Warn("Created insecure grpc connection")
return conn, nil
}
conn, _, err = creds.ClientHandshake(ctx, address, conn)
if err != nil {
logrus.WithError(err).WithField("grpc_addr", address).Warn("Failed grpc TLS handshake")
log.Warn("Failed grpc TLS handshake")
return nil, err
}
return conn, nil