diff options
| author | Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne@collabora.co.uk> | 2010-11-30 13:51:04 -0500 |
|---|---|---|
| committer | Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne@collabora.co.uk> | 2010-12-03 13:45:05 -0500 |
| commit | f8015f6b066a60217c653468a5f06b63e8443620 (patch) | |
| tree | 921259e3a3291f8874cdc46a1f3facb09c479e98 | |
| parent | 5fc7876db2ec94df79a96af3e0214113c57d37a8 (diff) | |
style: better logging messages
| -rw-r--r-- | papyon/msnp/base.py | 4 | ||||
| -rw-r--r-- | papyon/msnp2p/transport/switchboard.py | 9 | ||||
| -rw-r--r-- | papyon/service/SOAPService.py | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/papyon/msnp/base.py b/papyon/msnp/base.py index 1b049e7..8778325 100644 --- a/papyon/msnp/base.py +++ b/papyon/msnp/base.py @@ -117,8 +117,8 @@ class BaseProtocol(gobject.GObject): try: handler(command) except Exception, err: - logger.exception(err) - logger.error('Ignoring invalid command :' + unicode(command)) + logger.error(str(err)) + logger.error('Ignoring invalid command : ' + unicode(command)) else: self._error_handler(command) diff --git a/papyon/msnp2p/transport/switchboard.py b/papyon/msnp2p/transport/switchboard.py index fdf329c..f40de74 100644 --- a/papyon/msnp2p/transport/switchboard.py +++ b/papyon/msnp2p/transport/switchboard.py @@ -116,8 +116,7 @@ class SwitchboardP2PTransport(BaseP2PTransport, SwitchboardHandler): try: dest, dest_guid = parse_account(message.get_header('P2P-Dest')) except Exception, err: - logger.exception(err) - logger.warning("Couldn't parse destination GUID") + logger.warning("Couldn't parse destination GUID: %s" % err) return # if destination contains a GUID, the protocol should be TLPv2 @@ -125,14 +124,14 @@ class SwitchboardP2PTransport(BaseP2PTransport, SwitchboardHandler): version = 2 if dest_guid != self._client.machine_guid or \ peer_guid != self._peer_guid: - return # this chunk is not for us + logger.debug("Received chunk is not for this end point") + return try: chunk = MessageChunk.parse(version, message.body[:-4]) chunk.application_id = struct.unpack('>L', message.body[-4:])[0] except Exception, err: - logger.exception(err) - logger.warning("Couldn't build TLP chunk from switchboard message") + logger.warning("Invalid TLP chunk in SB message: %s" % err) return logger.debug("<<< %s" % repr(chunk)) diff --git a/papyon/service/SOAPService.py b/papyon/service/SOAPService.py index 6fa3868..65cc3b4 100644 --- a/papyon/service/SOAPService.py +++ b/papyon/service/SOAPService.py @@ -246,7 +246,7 @@ class SOAPService(object): logger.debug(">>> " + unicode(cleaned)) def _error_handler(self, transport, error): - logger.warning("Transport Error :" + str(error)) + logger.warning("Transport Error : " + str(error)) # try to process response if we received an HTTP error (status != 2xx) if isinstance(error, HTTPError): |