Merge branch 'root-v1.21-and-main' into release/dcs/v1.21

unfoldingWord · Jan 18, 2024 · 098d442 · 098d442
2 parents 1082299 + 7b98261
commit 098d442
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/modules/dcs/sb100.go b/modules/dcs/sb100.go
@@ -30,14 +30,14 @@ func GetSBDataFromBlob(blob *git.Blob) (*SBMetadata100, error) {
 
 	sb100 := &SBMetadata100{}
 	if err := json.Unmarshal(buf, sb100); err != nil {
-		log.Error("ERROR: %v", err)
+		log.Error("SBMetadata100{} Unmarshal: %v", err)
 		return nil, err
 	}
 
 	// Now make a generic map of the buffer to store in the database table
 	sb100.Metadata = map[string]interface{}{}
 	if err := json.Unmarshal(buf, &sb100.Metadata); err != nil {
-		log.Error("ERROR: %v", err)
+		log.Error("sb100 map[string]interface{}{} Unmarshal: %v", err)
 		return nil, err
 	}
 

diff --git a/routers/web/repo/door43metadata.go b/routers/web/repo/door43metadata.go
@@ -29,7 +29,7 @@ func Door43Metadatas(ctx *context.Context) {
 		OrderBy("is_repo_metadata DESC, ref_type ASC, release_date_unix DESC").
 		Find(&dms)
 	if err != nil {
-		log.Error("ERROR: %v", err)
+		log.Error("Find(dms): %v", err)
 	}
 
 	ctx.Data["PageIsMetadata"] = true

diff --git a/services/convert/catalog.go b/services/convert/catalog.go
@@ -39,12 +39,12 @@ func ToIngredient(project map[string]interface{}) *api.Ingredient {
 // ToCatalogEntry converts a Door43Metadata to an api.CatalogEntry
 func ToCatalogEntry(ctx context.Context, dm *repo.Door43Metadata, perm access_model.Permission) *api.CatalogEntry {
 	if err := dm.LoadRepo(ctx); err != nil {
-		log.Error("ToCatalogEntry: dm.LoadAttributes() ERROR: %v", err)
+		log.Error("dm.LoadAttributes(): %v", err)
 		return nil
 	}
 
 	if err := dm.Repo.LoadOwner(ctx); err != nil {
-		log.Error("ToCatalogEntry: dm.Repo.GetOwner() ERROR: %v", err)
+		log.Error("dm.Repo.GetOwner(): %v", err)
 		return nil
 	}