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

Fix blocklist ignoring try_times. 

Make blocklist print error messages on failures.
This commit is contained in:
John Garland 2010-01-03 16:27:05 +00:00
parent a570e67a4d
commit b06f46ea7c
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
deluge/plugins/blocklist/blocklist/core.py
View File

@ -276,7 +276,6 @@ class Core(CorePluginBase):
if "Moved Permanently" in error_msg: if "Moved Permanently" in error_msg:
log.debug("Setting blocklist url to %s", location) log.debug("Setting blocklist url to %s", location)
self.config["url"] = location self.config["url"] = location
f.trap(f.type)
d = self.download_list(url=location) d = self.download_list(url=location)
d.addCallbacks(self.on_download_complete, self.on_download_error) d.addCallbacks(self.on_download_complete, self.on_download_error)
else: else:
@ -285,13 +284,13 @@ class Core(CorePluginBase):
self.up_to_date = True self.up_to_date = True
blocklist = deluge.configmanager.get_config_dir("blocklist.cache") blocklist = deluge.configmanager.get_config_dir("blocklist.cache")
d = threads.deferToThread(self.update_info, blocklist) d = threads.deferToThread(self.update_info, blocklist)
f.trap(f.type)
elif self.failed_attempts < self.config["try_times"]:
log.warning("Blocklist download failed!")
self.failed_attempts += 1
f.trap(f.type)
else: else:
log.error(error_msg) log.warning("Blocklist download failed: %s", error_msg)
if self.failed_attempts < self.config["try_times"]:
log.debug("Let's try again")
self.failed_attempts += 1
d = self.download_list()
d.addCallbacks(self.on_download_complete, self.on_download_error)
return d return d
def import_list(self, blocklist): def import_list(self, blocklist):
@ -379,8 +378,7 @@ class Core(CorePluginBase):
try_again = True try_again = True
elif self.filename != cache and os.path.exists(cache): elif self.filename != cache and os.path.exists(cache):
# If we have a backup and we haven't already used it # If we have a backup and we haven't already used it
e = f.trap(Exception) log.warning("Error reading blocklist: %s", f.getErrorMessage())
log.warning("Error reading blocklist: %s", e)
blocklist = cache blocklist = cache
try_again = True try_again = True