codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Core] Remove old geoip.dat code and fix log line

This commit is contained in:
Calum Lind 2016-11-03 11:35:30 +00:00
parent ac011d7f55
commit a87ce825ad
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
deluge/core/preferencesmanager.py
View File

@ -455,19 +455,16 @@ class PreferencesManager(component.Component):
log.debug("%s: %s", key, value) log.debug("%s: %s", key, value)
self.session_set_setting("anonymous_mode", value) self.session_set_setting("anonymous_mode", value)
def _on_set_geoip_db_location(self, key, geoip_db): def _on_set_geoip_db_location(self, key, geoipdb_path):
log.debug("%s: %s", key, geoip_db) log.debug("%s: %s", key, geoipdb_path)
# Load the GeoIP DB for country look-ups if available # Load the GeoIP DB for country look-ups if available
deluge_geoip_db = deluge.common.resource_filename("deluge", os.path.join("data", "GeoIP.dat")) if os.path.exists(geoipdb_path):
for geoip_path in (geoip_db, deluge_geoip_db): try:
if os.path.exists(geoip_path): self.core.geoip_instance = GeoIP.open(geoipdb_path, GeoIP.GEOIP_STANDARD)
try: except AttributeError:
self.core.geoip_instance = GeoIP.open(geoip_path, GeoIP.GEOIP_STANDARD) log.warning("GeoIP Unavailable")
except AttributeError:
log.warning("GeoIP Unavailable")
break
else: else:
log.warning("Unable to find GeoIP database file: %s") log.warning("Unable to find GeoIP database file: %s", geoipdb_path)
def _on_set_cache_size(self, key, value): def _on_set_cache_size(self, key, value):
log.debug("%s: %s", key, value) log.debug("%s: %s", key, value)