Skip to content

Commit

Permalink
adding trace level logging to RPC layer
Browse files Browse the repository at this point in the history
  • Loading branch information
erikstmartin committed Sep 19, 2013
1 parent ffbc03b commit 514a209
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
12 changes: 12 additions & 0 deletions rpc/bsonrpc/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ func NewClientCodec(conn io.ReadWriteCloser) (codec rpc.ClientCodec) {
}

func (cc *ccodec) WriteRequest(req *rpc.Request, v interface{}) (err error) {
log.Println(log.TRACE, "RPC Server Entered: WriteRequest")
defer log.Println(log.TRACE, "RPC Server Leaving: WriteRequest")

err = cc.enc.Encode(req)
if err != nil {
log.Println(log.ERROR, "RPC Client Error enconding request rpc request: ", err)
Expand All @@ -44,6 +47,9 @@ func (cc *ccodec) WriteRequest(req *rpc.Request, v interface{}) (err error) {
}

func (cc *ccodec) ReadResponseHeader(res *rpc.Response) (err error) {
log.Println(log.TRACE, "RPC Server Entered: ReadResponseHeader")
defer log.Println(log.TRACE, "RPC Server Leaving: ReadResponseHeader")

err = cc.dec.Decode(res)

if err != nil {
Expand All @@ -53,6 +59,9 @@ func (cc *ccodec) ReadResponseHeader(res *rpc.Response) (err error) {
}

func (cc *ccodec) ReadResponseBody(v interface{}) (err error) {
log.Println(log.TRACE, "RPC Server Entered: ReadResponseBody")
defer log.Println(log.TRACE, "RPC Server Leaving: ReadResponseBody")

if v == nil {
err = errors.New("Response object cannot be nil")
if err != nil {
Expand All @@ -70,6 +79,9 @@ func (cc *ccodec) ReadResponseBody(v interface{}) (err error) {
}

func (cc *ccodec) Close() (err error) {
log.Println(log.TRACE, "RPC Server Entered: Close")
defer log.Println(log.TRACE, "RPC Server Leaving: Close")

err = cc.conn.Close()

if err != nil {
Expand Down
12 changes: 12 additions & 0 deletions rpc/bsonrpc/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ func NewServerCodec(conn io.ReadWriteCloser) (codec rpc.ServerCodec) {
}

func (sc *scodec) ReadRequestHeader(rq *rpc.Request) (err error) {
log.Println(log.TRACE, "RPC Server Entered: ReadRequestHeader")
defer log.Println(log.TRACE, "RPC Server Leaving: ReadRequestHeader")

err = sc.dec.Decode(rq)
if err != nil && err != io.EOF {
log.Println(log.ERROR, "RPC Server Error decoding request header: ", err)
Expand All @@ -35,6 +38,9 @@ func (sc *scodec) ReadRequestHeader(rq *rpc.Request) (err error) {
}

func (sc *scodec) ReadRequestBody(v interface{}) (err error) {
log.Println(log.TRACE, "RPC Server Entered: ReadRequestBody")
defer log.Println(log.TRACE, "RPC Server Leaving: ReadRequestBody")

err = sc.dec.Decode(v)
if err != nil {
log.Println(log.ERROR, "RPC Server Error decoding request body: ", err)
Expand All @@ -43,6 +49,9 @@ func (sc *scodec) ReadRequestBody(v interface{}) (err error) {
}

func (sc *scodec) WriteResponse(rs *rpc.Response, v interface{}) (err error) {
log.Println(log.TRACE, "RPC Server Entered: WriteResponse")
defer log.Println(log.TRACE, "RPC Server Leaving: WriteResponse")

err = sc.enc.Encode(rs)
if err != nil {
log.Println(log.ERROR, "RPC Server Error encoding rpc response: ", err)
Expand All @@ -57,6 +66,9 @@ func (sc *scodec) WriteResponse(rs *rpc.Response, v interface{}) (err error) {
}

func (sc *scodec) Close() (err error) {
log.Println(log.TRACE, "RPC Server Entered: Close")
defer log.Println(log.TRACE, "RPC Server Leaving: Close")

err = sc.conn.Close()
if err != nil {
log.Println(log.ERROR, "RPC Server Error closing connection: ", err)
Expand Down

0 comments on commit 514a209

Please sign in to comment.