backend: added warning message when jabberfr workaround is used + fixed missing warning method
This commit is contained in:
parent
21dbb4473a
commit
6921df69f5
2 changed files with 4 additions and 2 deletions
|
|
@ -37,7 +37,7 @@ from wokkel.xmppim import RosterItem
|
|||
|
||||
from sat.bridge.DBus import DBusBridge
|
||||
import logging
|
||||
from logging import debug, info, error
|
||||
from logging import debug, info, warning, error
|
||||
|
||||
import sys
|
||||
import os.path
|
||||
|
|
@ -539,6 +539,7 @@ class SAT(service.Service):
|
|||
defer_list = []
|
||||
for item in disco_result._items:
|
||||
if item.entity.full().count('.') == 1: #XXX: workaround for a bug on jabberfr, tmp
|
||||
warning(_('Using jabberfr workaround, be sure your domain has at least two levels (e.g. "example.tld", not "example" alone)'))
|
||||
continue
|
||||
args = [item.entity, profile]
|
||||
defer_list.append(disco_client.requestInfo(item.entity).addCallbacks(_check_entity_cb, _errback, args, None, args))
|
||||
|
|
|
|||
|
|
@ -640,7 +640,8 @@ class Memory:
|
|||
"""Helper method to get first available entity for a service"""
|
||||
entities = self.getServerServiceEntities(category, type, profile)
|
||||
if entities == None:
|
||||
warning(_("Entities not available, maybe they haven't been asked to server yet ?"))
|
||||
warning(_("Entities (%(category)s/%(type)s) not available, maybe they haven't been asked to server yet ?") % {"category":category,
|
||||
"type":type})
|
||||
return None
|
||||
else:
|
||||
return list(entities)[0] if entities else None
|
||||
|
|
|
|||
Loading…
Reference in a new issue