summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalum Lind <calumlind+deluge@gmail.com>2016-09-28 10:36:06 +0100
committerCalum Lind <calumlind+deluge@gmail.com>2016-09-28 10:36:06 +0100
commit6c73105a7307508c8267614bfe0be9a34b9bfb36 (patch)
treece0ba3184a84feef7d664e74401e6a3f07861236
parente66be42c81ca5e41b3bee88bf21db523bee8397f (diff)
downloaddeluge-6c73105a7307508c8267614bfe0be9a34b9bfb36.tar.gz
deluge-6c73105a7307508c8267614bfe0be9a34b9bfb36.tar.bz2
deluge-6c73105a7307508c8267614bfe0be9a34b9bfb36.zip
[#2882] [Core] Nicer log message about missing GeoIP support in lt 1.1.1
-rw-r--r--deluge/core/preferencesmanager.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/deluge/core/preferencesmanager.py b/deluge/core/preferencesmanager.py
index 03a672e4e..7cb049d14 100644
--- a/deluge/core/preferencesmanager.py
+++ b/deluge/core/preferencesmanager.py
@@ -498,9 +498,11 @@ class PreferencesManager(component.Component):
if geoip_db:
try:
self.session.load_country_db(str(geoip_db))
- except Exception, e:
+ except RuntimeError, e:
log.error("Unable to load geoip database!")
log.exception(e)
+ except AttributeError:
+ log.warning("GeoIP Unavailable")
def _on_cache_size(self, key, value):
log.debug("%s: %s", key, value)