use tendermint/log15

alert/log.go

@@ -1,7 +1,7 @@
 package alert
 
 import (
-	"gopkg.in/inconshreveable/log15.v2"
+	"github.com/tendermint/log15"
 )
 
 var log = log15.New("module", "alert")

binary/log.go

@@ -1,7 +1,7 @@
 package binary
 
 import (
-	"gopkg.in/inconshreveable/log15.v2"
+	"github.com/tendermint/log15"
 )
 
 var log = log15.New("module", "binary")

binary/reflect.go

@@ -88,6 +88,8 @@ func RegisterType(info *TypeInfo) *TypeInfo {
 
 func readReflect(rv reflect.Value, rt reflect.Type, r Unreader, n *int64, err *error) {
 
+	log.Debug("Read reflect", "type", rt)
+
 	// First, create a new struct if rv is nil pointer.
 	if rt.Kind() == reflect.Ptr && rv.IsNil() {
 		newRv := reflect.New(rt.Elem())

cmd/log.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"gopkg.in/inconshreveable/log15.v2"
+	"github.com/tendermint/log15"
 )
 
 var log = log15.New("module", "main")

consensus/log.go

@@ -1,7 +1,7 @@
 package consensus
 
 import (
-	"gopkg.in/inconshreveable/log15.v2"
+	"github.com/tendermint/log15"
 )
 
 var log = log15.New("module", "consensus")

consensus/reactor.go

@@ -650,6 +650,7 @@ func DecodeMessage(bz []byte) (msgType byte, msg interface{}, err error) {
 		msg = ReadBinary(&CommitStepMessage{}, r, n, &err)
 	// Messages of data
 	case msgTypeProposal:
+		r.ReadByte() // Consume the byte
 		msg = ReadBinary(&Proposal{}, r, n, &err)
 	case msgTypePart:
 		msg = ReadBinary(&PartMessage{}, r, n, &err)

mempool/log.go

@@ -1,7 +1,7 @@
 package mempool
 
 import (
-	"gopkg.in/inconshreveable/log15.v2"
+	"github.com/tendermint/log15"
 )
 
 var log = log15.New("module", "mempool")

p2p/connection.go

@@ -13,7 +13,7 @@ import (
 	flow "code.google.com/p/mxk/go1/flowcontrol"
 	. "github.com/tendermint/tendermint/binary"
 	. "github.com/tendermint/tendermint/common"
-	"gopkg.in/inconshreveable/log15.v2"
+	"github.com/tendermint/log15"
 )
 
 const (

p2p/log.go

@@ -1,7 +1,7 @@
 package p2p
 
 import (
-	"gopkg.in/inconshreveable/log15.v2"
+	"github.com/tendermint/log15"
 )
 
 var log = log15.New("module", "p2p")

p2p/upnp/log.go

@@ -1,7 +1,7 @@
 package upnp
 
 import (
-	"gopkg.in/inconshreveable/log15.v2"
+	"github.com/tendermint/log15"
 )
 
 var log = log15.New("module", "upnp")

rpc/log.go

@@ -1,7 +1,7 @@
 package rpc
 
 import (
-	"gopkg.in/inconshreveable/log15.v2"
+	"github.com/tendermint/log15"
 )
 
 var log = log15.New("module", "rpc")

state/log.go

@@ -1,7 +1,7 @@
 package state
 
 import (
-	"gopkg.in/inconshreveable/log15.v2"
+	"github.com/tendermint/log15"
 )
 
 var log = log15.New("module", "state")