Only use the EntryFormatter for normal entries.

ConfChange entries also have a Data field but the application-supplied
formatter won't know what to do with them.
This commit is contained in:
Ben Darnell 2015-02-20 13:51:14 -05:00
parent 0ea2173a7e
commit b53dc0826e

View File

@ -84,10 +84,10 @@ func DescribeMessage(m pb.Message, f EntryFormatter) string {
// Entry for debugging.
func DescribeEntry(e pb.Entry, f EntryFormatter) string {
var formatted string
if f == nil {
formatted = fmt.Sprintf("%q", e.Data)
} else {
if e.Type == pb.EntryNormal && f != nil {
formatted = f(e.Data)
} else {
formatted = fmt.Sprintf("%q", e.Data)
}
return fmt.Sprintf("%d/%d %s %s", e.Term, e.Index, e.Type, formatted)
}