diff options
| author | horus_arch | 2018-02-17 12:06:05 +0100 |
|---|---|---|
| committer | horus_arch | 2018-02-17 12:06:05 +0100 |
| commit | 9ebf51364773dae6db4c0c47d77710c9f1a37b51 (patch) | |
| tree | f01ba3b503920ef3301cdae0ceeb402e294d0d83 | |
| parent | 13724d7e56299213e9b10eef6f315569127b53f2 (diff) | |
| download | alkobote-9ebf51364773dae6db4c0c47d77710c9f1a37b51.tar.gz | |
Minor refactoring. (crawler)
| -rw-r--r-- | crawler/log.go | 53 | ||||
| -rw-r--r-- | crawler/sanitize.go | 14 |
2 files changed, 30 insertions, 37 deletions
diff --git a/crawler/log.go b/crawler/log.go index 3a6afa0..7d8e707 100644 --- a/crawler/log.go +++ b/crawler/log.go @@ -45,21 +45,7 @@ func Println(err error, msg string) { func PrintlnOffer(offer Angebot, msg string) { - log.WithFields( - log.Fields{ - "Name": offer.Name, - "Shop": offer.Shop, - "ABV": offer.Abv, - "Volume": offer.Volume, - "Url": offer.Url, - "Original Price": offer.Original_price, - "Discounted Price": offer.Discounted_price, - "Base Price": offer.Base_price, - "Image_url": offer.Image_url, - "Spirit Type": offer.Spirit_type, - "Valid Until": offer.Valid_until, - }, - ).Println(msg) + log.WithFields(getFields(offer)).Println(msg) } func Debug(err error, msg string) { @@ -76,19 +62,26 @@ func Debug(err error, msg string) { func DebugOffer(offer Angebot, msg string) { - log.WithFields( - log.Fields{ - "Name": offer.Name, - "Shop": offer.Shop, - "ABV": offer.Abv, - "Volume": offer.Volume, - "Url": offer.Url, - "Original Price": offer.Original_price, - "Discounted Price": offer.Discounted_price, - "Base Price": offer.Base_price, - "Image_url": offer.Image_url, - "Spirit Type": offer.Spirit_type, - "Valid Until": offer.Valid_until, - }, - ).Debug(msg) + log.WithFields(getFields(offer)).Debug(msg) +} + +func WarnOffer(offer Angebot, msg string) { + + log.WithFields(getFields(offer)).Warn(msg) +} + +func getFields(offer Angebot) log.Fields { + return log.Fields{ + "Name": offer.Name, + "Shop": offer.Shop, + "ABV": offer.Abv, + "Volume": offer.Volume, + "Url": offer.Url, + "Original Price": offer.Original_price, + "Discounted Price": offer.Discounted_price, + "Base Price": offer.Base_price, + "Image_url": offer.Image_url, + "Spirit Type": offer.Spirit_type, + "Valid Until": offer.Valid_until, + } } diff --git a/crawler/sanitize.go b/crawler/sanitize.go index 4f76c69..3d61c46 100644 --- a/crawler/sanitize.go +++ b/crawler/sanitize.go @@ -15,31 +15,31 @@ func sanitize_offer(angebote []Angebot, shop Shop) []Angebot { offer.Name = sanitize_name(offer.Name) if offer.Abv == 0 { - DebugOffer(offer, "Sanitizer: Abv is zero") + WarnOffer(offer, "Sanitizer: Abv is zero") continue } if offer.Volume == 0 { - DebugOffer(offer, "Sanitizer: Volume is zero") + WarnOffer(offer, "Sanitizer: Volume is zero") continue } if offer.Discounted_price == 0 { - DebugOffer(offer, "Sanitizer: Discounted price is zero") + WarnOffer(offer, "Sanitizer: Discounted price is zero") continue } if offer.Original_price == 0 { - DebugOffer(offer, "Sanitizer: Original price is zero") + WarnOffer(offer, "Sanitizer: Original price is zero") continue } if offer.Base_price == 0 { - DebugOffer(offer, "Sanitizer: Base price is zero") + WarnOffer(offer, "Sanitizer: Base price is zero") continue } if offer.Url == "" { - DebugOffer(offer, "Sanitizer: URL is empty") + WarnOffer(offer, "Sanitizer: URL is empty") continue } if offer.Image_url == "" { - DebugOffer(offer, "Sanitizer: Image-URL is empty") + WarnOffer(offer, "Sanitizer: Image-URL is empty") continue } |