mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-06 16:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Core] Improve logging in update_state

Browse source
This commit is contained in:
Calum Lind 2015-12-11 11:52:59 +00:00
commit 6ffe5cd2a4
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
deluge/core/torrent.py
View file

@ -223,8 +223,6 @@ class Torrent(object):
self.forcing_recheck = False self.forcing_recheck = False
self.forcing_recheck_paused = False self.forcing_recheck_paused = False
log.debug("Torrent object created.")
## Options methods ## ## Options methods ##
def set_options(self, options): def set_options(self, options):
OPTIONS_FUNCS = { OPTIONS_FUNCS = {
@ -391,34 +389,30 @@ class Torrent(object):
"""Updates the state based on what libtorrent's state for the torrent is""" """Updates the state based on what libtorrent's state for the torrent is"""
# Set the initial state based on the lt state # Set the initial state based on the lt state
LTSTATE = deluge.common.LT_TORRENT_STATE LTSTATE = deluge.common.LT_TORRENT_STATE
ltstate = int(self.handle.status().state) status = self.handle.status()
ltstate = status.state
# Set self.state to the ltstate right away just incase we don't hit some # Set self.state to the ltstate right away just incase we don't hit some of the logic below
# of the logic below
old_state = self.state old_state = self.state
if ltstate in LTSTATE: self.state = LTSTATE.get(int(ltstate), str(ltstate))
self.state = LTSTATE[ltstate]
else:
self.state = str(ltstate)
is_paused = self.handle.is_paused()
session_paused = component.get("Core").session.is_paused()
log.debug("set_state_based_on_ltstate: %s with session.is_paused: %s", self.state, session_paused) is_paused = self.handle.is_paused()
is_auto_managed = self.handle.is_auto_managed()
session_paused = component.get("Core").session.is_paused()
# First we check for an error from libtorrent, and set the state to that # First we check for an error from libtorrent, and set the state to that
# if any occurred. # if any occurred.
if self.forced_error: if self.forced_error:
self.state = "Error" self.state = "Error"
log.debug("Torrent Error state message: %s", self.forced_error.error_message)
self.set_status_message("Error: " + self.forced_error.error_message) self.set_status_message("Error: " + self.forced_error.error_message)
elif len(self.handle.status().error) > 0: elif status.error:
# This is an error'd torrent # This is an error'd torrent
self.state = "Error" self.state = "Error"
self.set_status_message(self.handle.status().error) self.set_status_message(status.error)
if is_paused: if is_paused:
self.handle.auto_managed(False) self.handle.auto_managed(False)
else: else:
if is_paused and self.handle.is_auto_managed() and not session_paused: if is_paused and is_auto_managed and not session_paused:
self.state = "Queued" self.state = "Queued"
elif is_paused or session_paused: elif is_paused or session_paused:
self.state = "Paused" self.state = "Paused"
@ -433,6 +427,10 @@ class Torrent(object):
self.state = "Allocating" self.state = "Allocating"
if self.state != old_state: if self.state != old_state:
log.debug("Using torrent state from lt: %s, auto_managed: %s, paused: %s, session_paused: %s",
ltstate, is_auto_managed, is_paused, session_paused)
log.debug("Torrent %s set from %s to %s: '%s'",
self.torrent_id, old_state, self.state, self.statusmsg)
component.get("EventManager").emit(TorrentStateChangedEvent(self.torrent_id, self.state)) component.get("EventManager").emit(TorrentStateChangedEvent(self.torrent_id, self.state))
def set_state(self, state): def set_state(self, state):