Add trace logging

msg_reader.go

@@ -14,6 +14,8 @@ type msgReader struct {
 	buf               [128]byte
 	msgBytesRemaining int32
 	err               error
+	logger            Logger
+	logLevel          int
 }
 
 // Err returns any error that the msgReader has experienced
@@ -23,6 +25,9 @@ func (r *msgReader) Err() error {
 
 // fatal tells r that a Fatal error has occurred
 func (r *msgReader) fatal(err error) {
+	if r.logLevel >= LogLevelTrace {
+		r.logger.Debug("msgReader.fatal", "error", err, "msgBytesRemaining", r.msgBytesRemaining)
+	}
 	r.err = err
 }
 
@@ -33,6 +38,10 @@ func (r *msgReader) rxMsg() (t byte, err error) {
 	}
 
 	if r.msgBytesRemaining > 0 {
+		if r.logLevel >= LogLevelTrace {
+			r.logger.Debug("msgReader.rxMsg discarding unread previous message", "msgBytesRemaining", r.msgBytesRemaining)
+		}
+
 		io.CopyN(ioutil.Discard, r.reader, int64(r.msgBytesRemaining))
 	}
 
@@ -59,6 +68,10 @@ func (r *msgReader) readByte() byte {
 		return 0
 	}
 
+	if r.logLevel >= LogLevelTrace {
+		r.logger.Debug("msgReader.readByte", "value", b, "byteAsString", string(b), "msgBytesRemaining", r.msgBytesRemaining)
+	}
+
 	return b
 }
 
@@ -80,7 +93,13 @@ func (r *msgReader) readInt16() int16 {
 		return 0
 	}
 
-	return int16(binary.BigEndian.Uint16(b))
+	n := int16(binary.BigEndian.Uint16(b))
+
+	if r.logLevel >= LogLevelTrace {
+		r.logger.Debug("msgReader.readInt16", "value", n, "msgBytesRemaining", r.msgBytesRemaining)
+	}
+
+	return n
 }
 
 func (r *msgReader) readInt32() int32 {
@@ -101,7 +120,13 @@ func (r *msgReader) readInt32() int32 {
 		return 0
 	}
 
-	return int32(binary.BigEndian.Uint32(b))
+	n := int32(binary.BigEndian.Uint32(b))
+
+	if r.logLevel >= LogLevelTrace {
+		r.logger.Debug("msgReader.readInt32", "value", n, "msgBytesRemaining", r.msgBytesRemaining)
+	}
+
+	return n
 }
 
 func (r *msgReader) readInt64() int64 {
@@ -122,7 +147,13 @@ func (r *msgReader) readInt64() int64 {
 		return 0
 	}
 
-	return int64(binary.BigEndian.Uint64(b))
+	n := int64(binary.BigEndian.Uint64(b))
+
+	if r.logLevel >= LogLevelTrace {
+		r.logger.Debug("msgReader.readInt64", "value", n, "msgBytesRemaining", r.msgBytesRemaining)
+	}
+
+	return n
 }
 
 func (r *msgReader) readOid() Oid {
@@ -147,7 +178,13 @@ func (r *msgReader) readCString() string {
 		return ""
 	}
 
-	return string(b[0 : len(b)-1])
+	s := string(b[0 : len(b)-1])
+
+	if r.logLevel >= LogLevelTrace {
+		r.logger.Debug("msgReader.readCString", "value", s, "msgBytesRemaining", r.msgBytesRemaining)
+	}
+
+	return s
 }
 
 // readString reads count bytes and returns as string
@@ -175,7 +212,13 @@ func (r *msgReader) readString(count int32) string {
 		return ""
 	}
 
-	return string(b)
+	s := string(b)
+
+	if r.logLevel >= LogLevelTrace {
+		r.logger.Debug("msgReader.readString", "value", s, "msgBytesRemaining", r.msgBytesRemaining)
+	}
+
+	return s
 }
 
 // readBytes reads count bytes and returns as []byte
@@ -198,5 +241,9 @@ func (r *msgReader) readBytes(count int32) []byte {
 		return nil
 	}
 
+	if r.logLevel >= LogLevelTrace {
+		r.logger.Debug("msgReader.readBytes", "value", b, "msgBytesRemaining", r.msgBytesRemaining)
+	}
+
 	return b
 }