david/jcl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Store error in account instead of just a boolean (in_error)

Browse Source 
darcs-hash:20071204163906-86b55-a552731ba162d51b7a6451027bb5991594348611.gz
This commit is contained in:
David Rousselie
2007-12-04 17:39:06 +01:00
parent edc152010e
commit 05c3358feb
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/jcl/jabber/component.py
View File

@@ -573,11 +573,11 @@ class AccountManager(object):
return result return result
def send_error_from_account(self, _account, exception): def send_error_from_account(self, _account, exception):
"""Send an error message only one time until _account.in_error """Send an error message only one time until _account.error
has been reset to False""" has been reset to None"""
result = [] result = []
if _account.in_error == False: if _account.error == None:
_account.in_error = True _account.error = str(exception)
result.append(Message(from_jid=_account.jid, result.append(Message(from_jid=_account.jid,
to_jid=_account.user.jid, to_jid=_account.user.jid,
stanza_type="error", stanza_type="error",

9
src/jcl/jabber/presence.py
View File

@@ -83,13 +83,14 @@ class AccountPresenceHandler(Handler):
class AccountPresenceAvailableHandler(AccountPresenceHandler): class AccountPresenceAvailableHandler(AccountPresenceHandler):
def get_account_presence(self, stanza, lang_class, _account): def get_account_presence(self, stanza, lang_class, _account):
show_status = account.ONLINE show_status = account.ONLINE
if _account.in_error: if _account.error is not None:
show_status = account.DND show_status = account.DND
elif not _account.enabled: elif not _account.enabled:
show_status = account.XA show_status = account.XA
return self.component.account_manager.send_presence_available(_account, return self.component.account_manager.send_presence_available(\
show_status, _account,
lang_class) show_status,
lang_class)
class RootPresenceHandler(AccountPresenceHandler): class RootPresenceHandler(AccountPresenceHandler):
filter = jabber.get_accounts_root_filter filter = jabber.get_accounts_root_filter

5
src/jcl/jabber/tests/component.py
View File

@@ -2781,6 +2781,7 @@ class JCLComponent_TestCase(JCLTestCase):
name="account11", name="account11",
jid="account11@jcl.test.com") jid="account11@jcl.test.com")
exception = Exception("test exception") exception = Exception("test exception")
self.assertEqual(_account.error, None)
self.comp.send_error(_account, exception) self.comp.send_error(_account, exception)
self.assertEqual(len(self.comp.stream.sent), 1) self.assertEqual(len(self.comp.stream.sent), 1)
error_sent = self.comp.stream.sent[0] error_sent = self.comp.stream.sent[0]
@@ -2790,6 +2791,7 @@ class JCLComponent_TestCase(JCLTestCase):
self.assertEqual(error_sent.get_subject(), _account.default_lang_class.error_subject) self.assertEqual(error_sent.get_subject(), _account.default_lang_class.error_subject)
self.assertEqual(error_sent.get_body(), _account.default_lang_class.error_body \ self.assertEqual(error_sent.get_body(), _account.default_lang_class.error_body \
% (exception)) % (exception))
self.assertEqual(_account.error, "test exception")
model.db_disconnect() model.db_disconnect()
def test_send_error_second(self): def test_send_error_second(self):
@@ -2799,9 +2801,10 @@ class JCLComponent_TestCase(JCLTestCase):
_account = Account(user=User(jid="user1@test.com"), _account = Account(user=User(jid="user1@test.com"),
name="account11", name="account11",
jid="account11@jcl.test.com") jid="account11@jcl.test.com")
_account.in_error = True _account.error = "test exception"
exception = Exception("test exception") exception = Exception("test exception")
self.comp.send_error(_account, exception) self.comp.send_error(_account, exception)
self.assertEqual(_account.error, "test exception")
self.assertEqual(len(self.comp.stream.sent), 0) self.assertEqual(len(self.comp.stream.sent), 0)
def test_send_stanzas(self): def test_send_stanzas(self):

2
src/jcl/jabber/tests/presence.py
View File

@@ -246,7 +246,7 @@ class AccountPresenceAvailableHandler_TestCase(JCLTestCase):
account11 = Account(user=user1, account11 = Account(user=user1,
name="account11", name="account11",
jid="account11@jcl.test.com") jid="account11@jcl.test.com")
account11.in_error = True account11.error = "Error"
account12 = Account(user=user1, account12 = Account(user=user1,
name="account12", name="account12",
jid="account12@jcl.test.com") jid="account12@jcl.test.com")

2
src/jcl/model/account.py
View File

@@ -91,7 +91,7 @@ class Account(InheritableSQLObject):
name = StringCol() name = StringCol()
jid = StringCol() jid = StringCol()
_status = StringCol(default=OFFLINE, dbName="status") _status = StringCol(default=OFFLINE, dbName="status")
in_error = BoolCol(default=False) error = StringCol(default=None)
legacy_jids = MultipleJoin('LegacyJID') legacy_jids = MultipleJoin('LegacyJID')
enabled = BoolCol(default=True) enabled = BoolCol(default=True)
lastlogin = DateTimeCol(default=datetime.datetime.today()) lastlogin = DateTimeCol(default=datetime.datetime.today())