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

[Base] Fix incorrect use of defer.fail in component

This commit is contained in:
bendikro 2016-05-01 22:14:46 +02:00 committed by Calum Lind
parent 91ed621ec8
commit 1f191c3ce1
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
deluge/component.py
View File

@ -8,6 +8,7 @@
# #
import logging import logging
import traceback
from collections import defaultdict from collections import defaultdict
from twisted.internet import reactor from twisted.internet import reactor
@ -21,6 +22,17 @@ class ComponentAlreadyRegistered(Exception):
pass pass
class ComponentException(Exception):
def __init__(self, message, tb):
super(ComponentException, self).__init__(message)
self.tb = tb
def __str__(self):
s = super(ComponentException, self).__str__()
return "%s\n%s" % (s, "".join(self.tb))
class Component(object): class Component(object):
""" """
Component objects are singletons managed by the :class:`ComponentRegistry`. Component objects are singletons managed by the :class:`ComponentRegistry`.
@ -112,8 +124,8 @@ class Component(object):
elif self._component_state == "Started": elif self._component_state == "Started":
d = succeed(True) d = succeed(True)
else: else:
d = fail("Cannot start a component not in a Stopped state!") d = fail(ComponentException("Trying to start a component ('%s') not in stopped state. Current state: '%s'" %
(self._component_name, self._component_state), traceback.format_stack(limit=4)))
return d return d
def _component_stop(self): def _component_stop(self):
@ -157,8 +169,8 @@ class Component(object):
elif self._component_state == "Paused": elif self._component_state == "Paused":
d = succeed(None) d = succeed(None)
else: else:
d = fail("Cannot pause a component in a non-Started state!") d = fail(ComponentException("Trying to pause a component ('%s') not in started state. Current state: '%s'" %
(self._component_name, self._component_state), traceback.format_stack(limit=4)))
return d return d
def _component_resume(self): def _component_resume(self):
@ -169,8 +181,8 @@ class Component(object):
d = maybeDeferred(self._component_start_timer) d = maybeDeferred(self._component_start_timer)
d.addCallback(on_resume) d.addCallback(on_resume)
else: else:
d = fail("Component cannot be resumed from a non-Paused state!") d = fail(ComponentException("Trying to resume a component ('%s') not in paused state. Current state: '%s'" %
(self._component_name, self._component_state), traceback.format_stack(limit=4)))
return d return d
def _component_shutdown(self): def _component_shutdown(self):