output on error

2 files changed, 18 insertions, 8 deletions

diff --git a/load.go b/load.go
index 1fbd2ca..751a14c 100644
--- a/load.go
+++ b/load.go
@@ -29,7 +29,7 @@ func ReLoad(pb proto.Message) error {
 		err = SaveToFilename(pb, fullname)
 		return err
 	}
-	if errors.Is(err, VersionMismatch) || (newver != pbver) {
+	if err != nil {
 		fmt.Println("")
 		fmt.Printf("VERSION new '%s' != cur PB '%s'\n", newver, pbver)
 		fmt.Println("")
@@ -42,12 +42,11 @@ func ReLoad(pb proto.Message) error {
 		// upon further study, always die here is better than not
 		s := fmt.Sprintf("protobuf version wrong. delete or fix %s", fullname)
 		panic(s)
-	}
-	if err != nil {
 		// return to let the application figure this out
-		return err
+		// return err
 	}
-	return nil
+	err = LoadFromFilename(pb, fullname)
+	return err
 }
 
 func LoadFromFilename(pb proto.Message, fullname string) error {
diff --git a/versionCheck.go b/versionCheck.go
index 1beb7a5..006d77a 100644
--- a/versionCheck.go
+++ b/versionCheck.go
@@ -2,6 +2,7 @@ package config
 
 import (
 	"errors"
+	"log"
 
 	"go.wit.com/lib/protobuf/filepb"
 	"google.golang.org/protobuf/proto"
@@ -28,25 +29,35 @@ func VersionCheckFile(pb proto.Message, filename string) (string, string, error)
 
 	newVersion, err = GetString(pb, "version")
 	if err != nil {
+		log.Printf("VersionCheckFile() filename (%s)\n", filename)
+		log.Printf("VersionCheckFile() err (%v)\n", err)
 		return newVersion, "", err
 	}
 
 	newUuid, err = GetString(pb, "uuid")
 	if err != nil {
-		return newVersion, newUuid, err
+		log.Printf("VersionCheckFile() filename (%s)\n", filename)
+		log.Printf("VersionCheckFile() err (%v)\n", err)
+		return newUuid, "", err
 	}
 
 	oldVersion, oldUuid, err := filepb.IdentifyPB(filename)
 	if err != nil {
-		return newVersion, newUuid, err
+		log.Printf("VersionCheckFile() filename (%s)\n", filename)
+		log.Printf("VersionCheckFile() err (%v)\n", err)
+		return newVersion, oldVersion, err
 	}
 
 	if newVersion != oldVersion {
+		log.Printf("VersionCheckFile() filename (%s)\n", filename)
+		log.Printf("VersionCheckFile() Version (%s) ne (%s)\n", newVersion, oldVersion)
 		return newVersion, oldVersion, errors.New("version mismatch")
 	}
 
 	if newUuid != oldUuid {
-		return newVersion, oldVersion, errors.New("UUID mismatch")
+		log.Printf("VersionCheckFile() filename (%s)\n", filename)
+		log.Printf("VersionCheckFile() UUID (%s) ne (%s)\n", newUuid, oldUuid)
+		return newUuid, oldUuid, errors.New("UUID mismatch")
 	}
 
 	return newVersion, oldVersion, nil