libervia-backend: src/core/sat

comparison src/core/sat_main.py @ 627:d207c2186519

core, bridge, jp, quick_frontend: SàT stop more gracefully if bridge can't be initialised: - new BridgeInitError and BridgeExceptionNoService are in core.exceptions - D-Bus NotSupported is catched in bridge, and launch a BridgeInitError - BridgeInitError stop SàT core, jp, and quick_frontends with an explanation message. fix bug 27

author	Goffi <goffi@goffi.org>
date	Fri, 21 Jun 2013 02:00:37 +0200
parents	84a6e83157c2
children	7ea6d5a86e58

comparison

equal deleted inserted replaced

-:190ccc6dc36c
+:d207c2186519
 import sys
 import os.path
 from sat.core.default_config import CONST
 from sat.core import xmpp
-from sat.core.exceptions import ProfileUnknownError, UnknownEntityError, ProfileNotInCacheError
+from sat.core import exceptions
 from sat.memory.memory import Memory
 from sat.tools.xml_tools import tupleList2dataForm
 from sat.tools.misc import TriggerManager
 from glob import glob
 if not os.path.exists(local_dir):
 os.makedirs(local_dir)
 self.trigger = TriggerManager()  # trigger are used to change SàT behaviour
-self.bridge = DBusBridge()
+try:
+self.bridge = DBusBridge()
+except exceptions.BridgeInitError:
+print (u"Bridge can't be initialised, can't start SàT core") # reactor is not launched yet, so we can't use error log
+sys.exit(1)
 self.bridge.register("getVersion", lambda: self.get_const('client_version'))
 self.bridge.register("getProfileName", self.memory.getProfileName)
 self.bridge.register("getProfilesList", self.memory.getProfilesList)
 self.bridge.register("getEntityData", lambda _jid, keys, profile: self.memory.getEntityData(jid.JID(_jid), keys, profile))
 self.bridge.register("createProfile", self.memory.createProfile)
 """
 profile = self.memory.getProfileName(profile_key)
 if not profile:
 error(_('Trying to connect a non-exsitant profile'))
-raise ProfileUnknownError(profile_key)
+raise exceptions.ProfileUnknownError(profile_key)
 if self.isConnected(profile):
 info(_("already connected !"))
 return defer.succeed("None")
 disconnected_cb(profile)
 def getContacts(self, profile_key):
 client = self.getClient(profile_key)
 if not client:
-raise ProfileUnknownError(_('Asking contacts for a non-existant profile'))
+raise exceptions.ProfileUnknownError(_('Asking contacts for a non-existant profile'))
 ret = []
 for item in client.roster.getItems():  # we get all items for client's roster
 # and convert them to expected format
 attr = client.roster.getAttributes(item)
 ret.append([item.jid.userhost(), attr, item.groups])
 return ret
 def getContactsFromGroup(self, group, profile_key):
 client = self.getClient(profile_key)
 if not client:
-raise ProfileUnknownError(_("Asking group's contacts for a non-existant profile"))
+raise exceptions.ProfileUnknownError(_("Asking group's contacts for a non-existant profile"))
 return client.roster.getJidsFromGroup(group)
 def purgeClient(self, profile):
 """Remove reference to a profile client and purge cache
 the garbage collector can then free the memory"""
 def getWaitingConf(self, profile_key=None):
 assert(profile_key)
 client = self.getClient(profile_key)
 if not client:
-raise ProfileNotInCacheError
+raise exceptions.ProfileNotInCacheError
 ret = []
 for conf_id in client._waiting_conf:
 conf_type, data = client._waiting_conf[conf_id][:2]
 ret.append((conf_id, conf_type, data))
 return ret
 elif not mess_data["to"].resource:  # if to JID has a resource, the type is not 'groupchat'
 # we may have a groupchat message, we check if the we know this jid
 try:
 entity_type = self.memory.getEntityData(mess_data["to"], ['type'], profile)["type"]
 #FIXME: should entity_type manage ressources ?
-except (UnknownEntityError, KeyError):
+except (exceptions.UnknownEntityError, KeyError):
 entity_type = "contact"
 if entity_type == "chatroom":
 mess_data["type"] = 'groupchat'
 else:
 @param data: data (depend of confirmation conf_type)
 @param cb: callback called with the answer
 """
 client = self.getClient(profile)
 if not client:
-raise ProfileUnknownError(_("Asking confirmation a non-existant profile"))
+raise exceptions.ProfileUnknownError(_("Asking confirmation a non-existant profile"))
 if conf_id in client._waiting_conf:
 error(_("Attempt to register two callbacks for the same confirmation"))
 else:
 client._waiting_conf[conf_id] = (conf_type, data, cb)
 self.bridge.askConfirmation(conf_id, conf_type, data, profile)
 def confirmationAnswer(self, conf_id, accepted, data, profile):
 """Called by frontends to answer confirmation requests"""
 client = self.getClient(profile)
 if not client:
-raise ProfileUnknownError(_("Confirmation answer from a non-existant profile"))
+raise exceptions.ProfileUnknownError(_("Confirmation answer from a non-existant profile"))
 debug(_("Received confirmation answer for conf_id [%(conf_id)s]: %(success)s") % {'conf_id': conf_id, 'success': _("accepted") if accepted else _("refused")})
 if conf_id not in client._waiting_conf:
 error(_("Received an unknown confirmation (%(id)s for %(profile)s)") % {'id': conf_id, 'profile': profile})
 else:
 cb = client._waiting_conf[conf_id][-1]
 def registerProgressCB(self, progress_id, CB, profile):
 """Register a callback called when progress is requested for id"""
 client = self.getClient(profile)
 if not client:
-raise ProfileUnknownError
+raise exceptions.ProfileUnknownError
 client._progress_cb_map[progress_id] = CB
 def removeProgressCB(self, progress_id, profile):
 """Remove a progress callback"""
 client = self.getClient(profile)
 if not client:
-raise ProfileUnknownError
+raise exceptions.ProfileUnknownError
 if progress_id not in client._progress_cb_map:
 error(_("Trying to remove an unknow progress callback"))
 else:
 del client._progress_cb_map[progress_id]
 data['position'] : current possition
 data['size'] : end_position
 """
 client = self.getClient(profile)
 if not profile:
-raise ProfileNotInCacheError
+raise exceptions.ProfileNotInCacheError
 data = {}
 try:
 client._progress_cb_map[progress_id](progress_id, data, profile)
 except KeyError:
 pass

Mercurial > libervia-backend

comparison src/core/sat_main.py @ 627:d207c2186519