[PATCH] location-importer.in: emit warnings due to unknown country code for valid networks only

[PATCH] location-importer.in: emit warnings due to unknown country code for valid networks only

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 1931 bytes --]

This reduces log spam in case of processing RIR database, checking for
networks with unknown country codes assigned. If we would not have
written into the database, there is no need to warn about them.

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
 src/python/location-importer.in | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/python/location-importer.in b/src/python/location-importer.in
index 1e08458..e5f55af 100644
--- a/src/python/location-importer.in
+++ b/src/python/location-importer.in
@@ -623,16 +623,19 @@ class CLI(object):
 		if not inetnum or not "country" in inetnum:
 			return
 
-		# Skip objects with unknown country codes
-		if validcountries and inetnum.get("country") not in validcountries:
-			log.warning("Skipping network with bogus country '%s': %s" % \
-				(inetnum.get("country"), inetnum.get("inet6num") or inetnum.get("inetnum")))
-			return
-
 		# Iterate through all networks enumerated from above, check them for plausibility and insert
 		# them into the database, if _check_parsed_network() succeeded
 		for single_network in inetnum.get("inet6num") or inetnum.get("inetnum"):
 			if self._check_parsed_network(single_network):
+
+				# Skip objects with unknown country codes - to avoid log spam for invalid or too small
+				# networks, this check is - kinda ugly - done at this point
+				if validcountries and inetnum.get("country") not in validcountries:
+					log.warning("Skipping network with bogus country '%s': %s" % \
+						(inetnum.get("country"), inetnum.get("inet6num") or inetnum.get("inetnum")))
+					break
+
+				# Everything is fine here, run INSERT statement...
 				self.db.execute("INSERT INTO _rirdata(network, country) \
 					VALUES(%s, %s) ON CONFLICT (network) DO UPDATE SET country = excluded.country",
 					"%s" % single_network, inetnum.get("country"),
-- 
2.26.2