bump go-streamrpc to 0.2, cleanup logging

logging should be user-friendly in INFO mode
This commit is contained in:
Christian Schwarz
2018-08-31 16:26:11 +02:00
parent f387e23214
commit b95e983d0d
11 changed files with 60 additions and 39 deletions
+3 -4
View File
@@ -18,9 +18,8 @@ func WithLogger(ctx context.Context, log Logger) context.Context {
}
func getLogger(ctx context.Context) Logger {
l, ok := ctx.Value(contextKeyLogger).(Logger)
if !ok {
l = logger.NewNullLogger()
if l, ok := ctx.Value(contextKeyLogger).(Logger); ok {
return l
}
return l
return logger.NewNullLogger()
}
+8
View File
@@ -230,6 +230,8 @@ func (e *Receiver) Receive(ctx context.Context, req *pdu.ReceiveReq, sendStream
return errors.New("receive to filesystem denied")
}
getLogger(ctx).Debug("incoming Receive")
// create placeholder parent filesystems as appropriate
var visitErr error
f := zfs.NewDatasetPathForest()
@@ -276,6 +278,11 @@ func (e *Receiver) Receive(ctx context.Context, req *pdu.ReceiveReq, sendStream
getLogger(ctx).Debug("start receive command")
if err := zfs.ZFSRecv(lp.ToString(), sendStream, args...); err != nil {
getLogger(ctx).
WithError(err).
WithField("args", args).
Error("zfs receive failed")
sendStream.Close()
return err
}
return nil
@@ -418,6 +425,7 @@ func (s Remote) Receive(ctx context.Context, r *pdu.ReceiveReq, sendStream io.Re
return err
}
rb, rs, err := s.c.RequestReply(ctx, RPCReceive, bytes.NewBuffer(b), sendStream)
getLogger(ctx).WithField("err", err).Debug("Remote.Receive RequestReplyReturned")
if err != nil {
return err
}