Changeset 00757a

Timestamp:

11/05/2015 10:23:35 PM (10 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Children:

83cecc

Parents:

639eef

git-author:

Calum Lind <calumlind+deluge@gmail.com> (01/30/2014 11:54:47 AM)

git-committer:

Calum Lind <calumlind+deluge@gmail.com> (11/05/2015 10:23:35 PM)

Message:

[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.

File:

• deluge/core/torrentmanager.py (modified) (1 diff)

deluge/core/torrentmanager.py

@@ -1044 +1044 @@
 
     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:
             torrent = self.torrents[str(alert.handle.info_hash())]
-        except:
-            return
-        tracker_status = "%s: %s" % (_("Error"), alert.msg)
-        torrent.set_tracker_status(tracker_status)
+        except (RuntimeError, KeyError):
+            return
+
+        torrent.set_tracker_status("Error: " + error_message)
 
     def on_alert_storage_moved(self, alert):