Skip to content

Commit 2de1c2c

Browse files
committed
only check cache and add for lookup if not bogon
1 parent e595a4b commit 2de1c2c

File tree

2 files changed

+15
-21
lines changed

2 files changed

+15
-21
lines changed

ipinfo/handler.py

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,11 @@ def getBatchDetails(
201201
details["bogon"] = True
202202
result[ip_address] = Details(details)
203203
else:
204-
lookup_addresses.append(ip_address)
205-
206-
try:
207-
cached_ipaddr = self.cache[cache_key(ip_address)]
208-
result[ip_address] = cached_ipaddr
209-
except KeyError:
210-
lookup_addresses.append(ip_address)
204+
try:
205+
cached_ipaddr = self.cache[cache_key(ip_address)]
206+
result[ip_address] = cached_ipaddr
207+
except KeyError:
208+
lookup_addresses.append(ip_address)
211209

212210
# all in cache - return early.
213211
if len(lookup_addresses) == 0:
@@ -322,13 +320,11 @@ def getBatchDetailsIter(
322320
details["bogon"] = True
323321
yield Details(details)
324322
else:
325-
lookup_addresses.append(ip_address)
326-
327-
try:
328-
cached_ipaddr = self.cache[cache_key(ip_address)]
329-
result[ip_address] = cached_ipaddr
330-
except KeyError:
331-
lookup_addresses.append(ip_address)
323+
try:
324+
cached_ipaddr = self.cache[cache_key(ip_address)]
325+
result[ip_address] = cached_ipaddr
326+
except KeyError:
327+
lookup_addresses.append(ip_address)
332328

333329
# all in cache - exit early.
334330
if len(lookup_addresses) == 0:

ipinfo/handler_async.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -353,13 +353,11 @@ async def getBatchDetailsIter(
353353
details = {"ip": ip_address, "bogon": True}
354354
yield Details(details)
355355
else:
356-
lookup_addresses.append(ip_address)
357-
358-
try:
359-
cached_ipaddr = self.cache[cache_key(ip_address)]
360-
results[ip_address] = cached_ipaddr
361-
except KeyError:
362-
lookup_addresses.append(ip_address)
356+
try:
357+
cached_ipaddr = self.cache[cache_key(ip_address)]
358+
results[ip_address] = cached_ipaddr
359+
except KeyError:
360+
lookup_addresses.append(ip_address)
363361

364362
if not lookup_addresses:
365363
yield results.items()

0 commit comments

Comments
 (0)