Make it uniform.

peer · Feb 19, 2025 · 6ceb851 · 6ceb851
1 parent 4f98c31
commit 6ceb851
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 7 deletions.
diff --git a/cmd/products/fooddata_central.go b/cmd/products/fooddata_central.go
@@ -599,6 +599,8 @@ func (f FoodDataCentral) Run(
 		return errE
 	}
 
+	config.Logger.Info().Int("total", len(foods)).Msg("retrieved FoodDataCentral data")
+
 	description := "FoodDataCentral processing"
 	progress := es.Progress(config.Logger, nil, nil, nil, description)
 	indexingSize.Add(int64(len(foods)))
@@ -612,10 +614,14 @@ func (f FoodDataCentral) Run(
 		}
 	}()
 
-	for _, food := range foods {
+	for i, food := range foods {
 		if ctx.Err() != nil {
 			return errors.WithStack(ctx.Err())
 		}
+		config.Logger.Debug().
+			Int("index", i).
+			Int("id", food.FDCID).
+			Msg("processing FoodDataCentral record")
 
 		ingredients, errE := getIngredients(f.IngredientsDir, food)
 		if errE != nil {

diff --git a/cmd/products/furs.go b/cmd/products/furs.go
@@ -147,7 +147,7 @@ func (d FURSDEJ) Run(
 		return errE
 	}
 
-	config.Logger.Info().Int("count", len(records)).Msg("retrieved FURS DEJ data")
+	config.Logger.Info().Int("total", len(records)).Msg("retrieved FURS DEJ data")
 
 	description := "FURS DEJ processing"
 	progress := es.Progress(config.Logger, nil, nil, nil, description)
@@ -169,7 +169,7 @@ func (d FURSDEJ) Run(
 		config.Logger.Debug().
 			Int("index", i).
 			Str("id", record.RegistrationNumber).
-			Msg("processing company record")
+			Msg("processing FURS DEJ record")
 
 		doc, errE := makeFursDoc(record)
 

diff --git a/cmd/products/furs_test.go b/cmd/products/furs_test.go
@@ -27,7 +27,7 @@ func TestProcessFursDejFile(t *testing.T) {
 	if errE != nil {
 		require.NoError(t, errE, "% -+#.1v", errE)
 	}
-	require.Len(t, records, 8, "Expected 8 records, but got %d", len(records))
+	require.Len(t, records, 8, "expected 8 records, but got %d", len(records))
 
 	assert.NotEmpty(t, records)
 

diff --git a/cmd/products/ljubljanske_mlekarne.go b/cmd/products/ljubljanske_mlekarne.go
@@ -169,6 +169,8 @@ func (n LjubljanskeMlekarne) Run(
 		products = products.Union(ps)
 	}
 
+	config.Logger.Info().Int("total", products.Cardinality()).Msg("retrieved Ljubljanske mlekarne data")
+
 	description := "Ljubljanske mlekarne processing"
 	progress := es.Progress(config.Logger, nil, nil, nil, description)
 	indexingSize.Add(int64(products.Cardinality()))
@@ -183,10 +185,14 @@ func (n LjubljanskeMlekarne) Run(
 	}()
 
 	// TODO: Use Go iterators once supported. See: https://github.com/deckarep/golang-set/issues/141
-	for _, productURL := range products.ToSlice() {
+	for i, productURL := range products.ToSlice() {
 		if ctx.Err() != nil {
 			return errors.WithStack(ctx.Err())
 		}
+		config.Logger.Debug().
+			Int("index", i).
+			Str("url", productURL).
+			Msg("processing Ljubljanske mlekarne record")
 
 		product, errE := indexer.GetWebData[LjubljanskeMlekarneProduct](ctx, httpClient, productURL, indexer.ExtractData)
 		if errE != nil {

diff --git a/cmd/products/natureta.go b/cmd/products/natureta.go
@@ -219,6 +219,8 @@ func (n Natureta) Run(
 		products.Append(ps.Products...)
 	}
 
+	config.Logger.Info().Int("total", products.Cardinality()).Msg("retrieved Natureta data")
+
 	description := "Natureta processing"
 	progress := es.Progress(config.Logger, nil, nil, nil, description)
 	indexingSize.Add(int64(products.Cardinality()))
@@ -233,10 +235,14 @@ func (n Natureta) Run(
 	}()
 
 	// TODO: Use Go iterators once supported. See: https://github.com/deckarep/golang-set/issues/141
-	for _, productURL := range products.ToSlice() {
+	for i, productURL := range products.ToSlice() {
 		if ctx.Err() != nil {
 			return errors.WithStack(ctx.Err())
 		}
+		config.Logger.Debug().
+			Int("index", i).
+			Str("url", productURL).
+			Msg("processing Natureta record")
 
 		product, errE := indexer.GetWebData[NaturetaProduct](ctx, httpClient, productURL, indexer.ExtractData)
 		if errE != nil {

diff --git a/cmd/products/zito.go b/cmd/products/zito.go
@@ -200,6 +200,8 @@ func (n Zito) Run(
 		products = products.Union(ps)
 	}
 
+	config.Logger.Info().Int("total", products.Cardinality()).Msg("retrieved Zito data")
+
 	description := "Zito processing"
 	progress := es.Progress(config.Logger, nil, nil, nil, description)
 	indexingSize.Add(int64(products.Cardinality()))
@@ -215,10 +217,14 @@ func (n Zito) Run(
 	}()
 
 	// TODO: Use Go iterators once supported. See: https://github.com/deckarep/golang-set/issues/141
-	for _, productURL := range products.ToSlice() {
+	for i, productURL := range products.ToSlice() {
 		if ctx.Err() != nil {
 			return errors.WithStack(ctx.Err())
 		}
+		config.Logger.Debug().
+			Int("index", i).
+			Str("url", productURL).
+			Msg("processing Zito record")
 
 		product, errE := indexer.GetWebData[ZitoProduct](ctx, httpClient, productURL, indexer.ExtractData)
 		if errE != nil {
@@ -228,6 +234,7 @@ func (n Zito) Run(
 		// Pages have HTML fragments they inject with JavaScript into the page.
 		productDetails, errE := indexer.ExtractData[ZitoProductDetails](strings.NewReader(product.Fragments))
 		if errE != nil {
+			errors.Details(errE)["url"] = productURL
 			return errE
 		}