Merge pull request #725 from rqlite/better-command-decode-panic

Better command decoding panic message
rqlite · Jan 5, 2021 · 10a24cf · 10a24cf
2 parents 9ca75f3 + 4f0c309
commit 10a24cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/command/legacy/command.go b/command/legacy/command.go
@@ -17,10 +17,10 @@ const (
 
 var (
 	// ErrNotLegacyCommand  is returned when a command is not legacy encoded.
-	ErrNotLegacyCommand = errors.New("not legacy command")
+	ErrNotLegacyCommand = errors.New("not legacy JSON-encoded command")
 
 	// ErrUnknownCommandType is returned when an unknown command type is encountered.
-	ErrUnknownCommandType = errors.New("unknown command type")
+	ErrUnknownCommandType = errors.New("unknown JSON-encoded command type")
 
 	// ErrUnsupportedType is returned when a request contains an unsupported type.
 	ErrUnsupportedType = errors.New("unsupported type")

diff --git a/store/store.go b/store/store.go
@@ -854,8 +854,8 @@ func (s *Store) Apply(l *raft.Log) interface{} {
 	var c command.Command
 
 	if err := legacy.Unmarshal(l.Data, &c); err != nil {
-		if err = command.Unmarshal(l.Data, &c); err != nil {
-			panic(fmt.Sprintf("failed to unmarshal cluster command: %s", err.Error()))
+		if err2 := command.Unmarshal(l.Data, &c); err2 != nil {
+			panic(fmt.Sprintf("failed to unmarshal cluster command: %s (legacy unmarshal: %s)", err2.Error(), err.Error()))
 		}
 	}