Bennett/g0v0-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化ip库获取逻辑

Browse Source
This commit is contained in:
咕谷酱
2025-09-19 17:03:45 +08:00
parent 08ff35509e
commit b834799a2d
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/helpers/geoip_helper.py
View File

@@ -104,16 +104,29 @@ class GeoIPHelper:
return max(files, key=os.path.getmtime) if files else None return max(files, key=os.path.getmtime) if files else None
def update(self, force=False): def update(self, force=False):
from app.log import logger
for ed in self.editions: for ed in self.editions:
eid = EDITIONS[ed] eid = EDITIONS[ed]
path = self._latest_file(eid) path = self._latest_file(eid)
need = force or not path need = force or not path
if path: if path:
age_days = (time.time() - os.path.getmtime(path)) / 86400 age_days = (time.time() - os.path.getmtime(path)) / 86400
if age_days >= self.max_age_days: if age_days >= self.max_age_days:
need = True need = True
logger.info(f"[GeoIP] {eid} database is {age_days:.1f} days old (max: {self.max_age_days}), will download new version")
else:
logger.info(f"[GeoIP] {eid} database is {age_days:.1f} days old, still fresh (max: {self.max_age_days})")
else:
logger.info(f"[GeoIP] {eid} database not found, will download")
if need: if need:
logger.info(f"[GeoIP] Downloading {eid} database...")
path = self._download_and_extract(eid) path = self._download_and_extract(eid)
logger.info(f"[GeoIP] {eid} database downloaded successfully")
else:
logger.info(f"[GeoIP] Using existing {eid} database")
old = self._readers.get(ed) old = self._readers.get(ed)
if old: if old:

3
app/service/init_geoip.py
View File

@@ -20,8 +20,9 @@ async def init_geoip():
logger.info("[GeoIP] Initializing GeoIP database...") logger.info("[GeoIP] Initializing GeoIP database...")
# Run the synchronous update method in a background thread # Run the synchronous update method in a background thread
# force=False means only download if files don't exist or are expired
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()
await loop.run_in_executor(None, geoip.update) await loop.run_in_executor(None, lambda: geoip.update(force=False))
logger.info("[GeoIP] GeoIP database initialization completed") logger.info("[GeoIP] GeoIP database initialization completed")
except Exception as e: except Exception as e: