Improve error logging

Author: Pascal Minder

geoblock.go

@@ -277,6 +277,7 @@ func (a *GeoBlock) allowDenyCachedRequestIP(requestIPAddr *net.IP, req *http.Req
 	if !ok {
 		entry, err = a.createNewIPEntry(req, ipAddressString)
 		if err != nil && !(os.IsTimeout(err) && a.ignoreAPITimeout) {
+			a.infoLogger.Printf("%s: request denied [%s] due to error: %s", a.name, requestIPAddr, err)
 			return false, ""
 		} else if os.IsTimeout(err) && a.ignoreAPITimeout {
 			a.infoLogger.Printf("%s: request allowed [%s] due to API timeout", a.name, requestIPAddr)
@@ -295,16 +296,18 @@ func (a *GeoBlock) allowDenyCachedRequestIP(requestIPAddr *net.IP, req *http.Req
 	if time.Since(entry.Timestamp).Hours() >= numberOfHoursInMonth && a.forceMonthlyUpdate {
 		entry, err = a.createNewIPEntry(req, ipAddressString)
 		if err != nil {
+			a.infoLogger.Printf("%s: request denied [%s] due to error: %s", a.name, requestIPAddr, err)
 			return false, ""
 		}
 	}
 
 	// check if we are in black/white-list mode and allow/deny based on country code
-	isAllowed := (stringInSlice(entry.Country, a.countries) != a.blackListMode) ||
-		(entry.Country == unknownCountryCode && a.allowUnknownCountries)
+	isUnknownCountry := entry.Country == unknownCountryCode
+	isCountryAllowed := stringInSlice(entry.Country, a.countries) != a.blackListMode
+	isAllowed := isCountryAllowed || (isUnknownCountry && a.allowUnknownCountries)
 
 	if !isAllowed {
-		a.infoLogger.Printf("%s: request denied [%s] for country [%s]", a.name, requestIPAddr, entry.Country)
+		a.infoLogger.Printf("%s: request denied [%s] for country [%s] due to: unknown country=%t and allow unknown countries=%t or the country is not allowed=%t", a.name, requestIPAddr, entry.Country, isUnknownCountry, a.allowUnknownCountries, isCountryAllowed)
 		return false, entry.Country
 	}