changeset 05c45bb18950 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=05c45bb18950 description: move some error/warning to info so it's not printed in stderr by default. Fixes #5609

diffstat:

src/common/xmpp/auth_nb.py | 20 ++++++++++---------- src/common/xmpp/client_nb.py | 4 ++-- src/common/xmpp/transports_nb.py | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-)

diffs (130 lines):

diff -r a4de7f9e6aff -r 05c45bb18950 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Tue Feb 16 09:27:19 2010 +0100 +++ b/src/common/xmpp/auth_nb.py Tue Feb 16 09:44:23 2010 +0100 @@ -179,7 +179,7 @@ ''' Used to determine if server supports SASL auth. Used internally. ''' if not feats.getTag('mechanisms', namespace=NS_SASL): self.startsasl='not-supported' - log.error('SASL not supported by server') + log.info('SASL not supported by server') return self.mecs = [] for mec in feats.getTag('mechanisms', namespace=NS_SASL).getTags( @@ -229,7 +229,7 @@ self.startsasl = SASL_IN_PROCESS raise NodeProcessed self.startsasl = SASL_FAILURE - log.error('I can only use DIGEST-MD5, GSSAPI and PLAIN mecanisms.') + log.info('I can only use DIGEST-MD5, GSSAPI and PLAIN mecanisms.') if self.on_sasl: self.on_sasl() return @@ -245,7 +245,7 @@ reason = challenge.getChildren()[0] except Exception: reason = challenge - log.error('Failed SASL authentification: %s' % reason) + log.info('Failed SASL authentification: %s' % reason) if len(self.mecs) > 0: # There are other mechanisms to test self.MechanismHandler() @@ -321,7 +321,7 @@ self._owner.send(str(Node('response', attrs={'xmlns':NS_SASL}))) else: self.startsasl = SASL_FAILURE - log.error('Failed SASL authentification: unknown challenge') + log.info('Failed SASL authentification: unknown challenge') if self.on_sasl: self.on_sasl() raise NodeProcessed @@ -397,7 +397,7 @@

def _on_username(self, resp): if not isResultNode(resp): - log.error('No result node arrived! Aborting...') + log.info('No result node arrived! Aborting...') return self.on_auth(None)

iq=Iq(typ='set',node=resp) @@ -428,7 +428,7 @@ query.setTagData('hash', hash_) self._method='0k' else: - log.warn("Sequre methods unsupported, performing plain text \ + log.info("Sequre methods unsupported, performing plain text \ authentication") query.setTagData('password', self.password) self._method = 'plain' @@ -442,7 +442,7 @@ self.owner._registered_name = self.owner.User+'@'+self.owner.Server+\ '/'+self.owner.Resource return self.on_auth(self._method) - log.error('Authentication failed!') + log.info('Authentication failed!') return self.on_auth(None)

@@ -473,7 +473,7 @@ attributes accordingly. ''' if not feats.getTag('bind', namespace=NS_BIND): - log.error('Server does not requested binding.') + log.info('Server does not requested binding.') # we try to bind resource anyway #self.bound='failure' self.bound = [] @@ -523,10 +523,10 @@ func=self._on_session) return if resp: - log.error('Binding failed: %s.' % resp.getTag('error')) + log.info('Binding failed: %s.' % resp.getTag('info')) self.on_bound(None) else: - log.error('Binding failed: timeout expired.') + log.info('Binding failed: timeout expired.') self.on_bound(None)

def _on_session(self, resp): diff -r a4de7f9e6aff -r 05c45bb18950 src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Tue Feb 16 09:27:19 2010 +0100 +++ b/src/common/xmpp/client_nb.py Tue Feb 16 09:44:23 2010 +0100 @@ -361,7 +361,7 @@ # try to negotiate TLS if self.incoming_stream_version() != '1.0': # if stream version is less than 1.0, we can't do more - log.warn('While connecting with type = "tls": stream version ' + + log.info('While connecting with type = "tls": stream version ' + 'is less than 1.0') self._on_connect() return @@ -371,7 +371,7 @@ log.info('TLS supported by remote server. Requesting TLS start.') self._tls_negotiation_handler() else: - log.warn('While connecting with type = "tls": TLS unsupported ' + + log.info('While connecting with type = "tls": TLS unsupported ' + 'by remote server') self._on_connect()

diff -r a4de7f9e6aff -r 05c45bb18950 src/common/xmpp/transports_nb.py --- a/src/common/xmpp/transports_nb.py Tue Feb 16 09:27:19 2010 +0100 +++ b/src/common/xmpp/transports_nb.py Tue Feb 16 09:44:23 2010 +0100 @@ -221,7 +221,7 @@ if hasattr(self, '_owner') and hasattr(self._owner, 'Dispatcher'): self.on_receive = self._owner.Dispatcher.ProcessNonBlocking else: - log.warning('No Dispatcher plugged. Received data will not be processed') + log.info('No Dispatcher plugged. Received data will not be processed') self.on_receive = None return self.on_receive = recv_handler @@ -441,7 +441,7 @@ self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() except socket.error, (errnum, errstr): - log.error('Error while disconnecting socket: %s' % errstr) + log.info('Error while disconnecting socket: %s' % errstr) self.fd = -1 NonBlockingTransport.disconnect(self, do_callback)