Updated geoip to check history before doing lookup
This commit is contained in:
parent
39c5196349
commit
512f94d7f6
1 changed files with 59 additions and 35 deletions
26
log.py
26
log.py
|
@ -108,6 +108,31 @@ class logsManager:
|
|||
|
||||
try:
|
||||
|
||||
conn = pyodbc.connect(self.conn_str)
|
||||
cursor = conn.cursor()
|
||||
timeThreshold = datetime.now() - timedelta(days=1)
|
||||
|
||||
cursor.execute("SELECT blockedipaddress, hostname, city, region, country, loc, org, postal, timezone FROM monutil_geoip WHERE logtime >= ?", timeThreshold)
|
||||
|
||||
rows = cursor.fetchall()
|
||||
|
||||
geoinfo = []
|
||||
|
||||
for row in rows:
|
||||
geoinfo = {
|
||||
"ip": row.blockedipaddress,
|
||||
"hostname": row.hostname,
|
||||
"city": row.city,
|
||||
"region": row.region,
|
||||
"country": row.country,
|
||||
"loc": row.loc,
|
||||
"org": row.org,
|
||||
"postal": row.postal,
|
||||
"timezone": row.timezone,
|
||||
}
|
||||
|
||||
if not geoinfo:
|
||||
|
||||
if 'delayUntil' in locals() and datetime.now() < delayUntil:
|
||||
|
||||
print("Rate limit exceeded. Please wait before trying again.")
|
||||
|
@ -146,7 +171,6 @@ class logsManager:
|
|||
"timezone": data.get("timezone"),
|
||||
}
|
||||
|
||||
|
||||
return geoinfo
|
||||
|
||||
except Exception as e:
|
||||
|
|
Loading…
Reference in a new issue