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

[Core] Empty error message fix with certain trackers 

By design alert.msg will be empty if the error code is '-1' so use
a.e.message() to get the message as fallback. It was not used at
replacement because when error code is not '-1' then a.e.message()
will also include the error code, which we do not want.
This commit is contained in:
Calum Lind 2014-01-30 11:54:47 +00:00
parent 639eefcf1d
commit 00757af149
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deluge/core/torrentmanager.py
View File

@ -1043,13 +1043,19 @@ class TorrentManager(component.Component):
torrent.set_tracker_status(tracker_status) torrent.set_tracker_status(tracker_status)
def on_alert_tracker_error(self, alert): def on_alert_tracker_error(self, alert):
log.debug("on_alert_tracker_error") """Alert handler for libtorrent tracker_error_alert"""
error_message = decode_string(alert.msg)
# If alert.msg is empty then it's a '-1' code so fallback to a.e.message. Note that alert.msg
# cannot be replaced by a.e.message because the code is included in the string (for non-'-1').
if not error_message:
error_message = decode_string(alert.error.message())
log.debug("Tracker Error Alert: %s [%s]", decode_string(alert.message()), error_message)
try: try:
torrent = self.torrents[str(alert.handle.info_hash())] torrent = self.torrents[str(alert.handle.info_hash())]
except: except (RuntimeError, KeyError):
return return
tracker_status = "%s: %s" % (_("Error"), alert.msg)
torrent.set_tracker_status(tracker_status) torrent.set_tracker_status("Error: " + error_message)
def on_alert_storage_moved(self, alert): def on_alert_storage_moved(self, alert):
log.debug("on_alert_storage_moved") log.debug("on_alert_storage_moved")