From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: location@lists.ipfire.org Subject: [PATCH] location-importer.in: emit warnings due to unknown country code for valid networks only Date: Mon, 03 May 2021 19:14:29 +0200 Message-ID: <831d1a84-1489-2a55-942d-1bad147497cb@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0513921921792097169==" List-Id: --===============0513921921792097169== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=C3=BCller --- 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 =20 - # 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 plaus= ibility 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 invali= d 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("inetn= um"))) + 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 =3D excluded= .country", "%s" % single_network, inetnum.get("country"), --=20 2.26.2 --===============0513921921792097169==--