Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gajim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
John Smith
gajim
Commits
9d9ef1da
Commit
9d9ef1da
authored
15 years ago
by
Yann Leboulanger
Browse files
Options
Downloads
Patches
Plain Diff
move some error/warning to info so it's not printed in stderr by default. Fixes #5609
parent
04db6692
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/common/xmpp/auth_nb.py
+10
-10
10 additions, 10 deletions
src/common/xmpp/auth_nb.py
src/common/xmpp/client_nb.py
+2
-2
2 additions, 2 deletions
src/common/xmpp/client_nb.py
src/common/xmpp/transports_nb.py
+2
-2
2 additions, 2 deletions
src/common/xmpp/transports_nb.py
with
14 additions
and
14 deletions
src/common/xmpp/auth_nb.py
+
10
−
10
View file @
9d9ef1da
...
...
@@ -187,7 +187,7 @@ class SASL(PlugIn):
"""
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
(
...
...
@@ -245,7 +245,7 @@ class SASL(PlugIn):
self
.
startsasl
=
SASL_IN_PROCESS
raise
NodeProcessed
self
.
startsasl
=
SASL_FAILURE
log
.
error
(
'
I can only use EXTERNAL, DIGEST-MD5, GSSAPI and PLAIN
'
log
.
info
(
'
I can only use EXTERNAL, DIGEST-MD5, GSSAPI and PLAIN
'
'
mecanisms.
'
)
if
self
.
on_sasl
:
self
.
on_sasl
()
...
...
@@ -264,7 +264,7 @@ class SASL(PlugIn):
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
()
...
...
@@ -340,7 +340,7 @@ class SASL(PlugIn):
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
...
...
@@ -419,7 +419,7 @@ class NonBlockingNonSASL(PlugIn):
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
)
...
...
@@ -450,7 +450,7 @@ class NonBlockingNonSASL(PlugIn):
query
.
setTagData
(
'
hash
'
,
hash_
)
self
.
_method
=
'
0k
'
else
:
log
.
warn
(
"
Se
q
ure methods unsupported, performing plain text
\
log
.
warn
(
"
Se
c
ure methods unsupported, performing plain text
\
authentication
"
)
query
.
setTagData
(
'
password
'
,
self
.
password
)
self
.
_method
=
'
plain
'
...
...
@@ -464,7 +464,7 @@ class NonBlockingNonSASL(PlugIn):
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
)
...
...
@@ -496,7 +496,7 @@ class NonBlockingBind(PlugIn):
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
=
[]
...
...
@@ -548,10 +548,10 @@ class NonBlockingBind(PlugIn):
func
=
self
.
_on_session
)
return
if
resp
:
log
.
error
(
'
Binding failed: %s.
'
%
resp
.
getTag
(
'
error
'
))
log
.
info
(
'
Binding failed: %s.
'
%
resp
.
getTag
(
'
error
'
))
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
):
...
...
This diff is collapsed.
Click to expand it.
src/common/xmpp/client_nb.py
+
2
−
2
View file @
9d9ef1da
...
...
@@ -372,7 +372,7 @@ class NonBlockingClient:
# 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
...
...
@@ -382,7 +382,7 @@ class NonBlockingClient:
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
()
...
...
This diff is collapsed.
Click to expand it.
src/common/xmpp/transports_nb.py
+
2
−
2
View file @
9d9ef1da
...
...
@@ -223,7 +223,7 @@ class NonBlockingTransport(PlugIn):
if
hasattr
(
self
,
'
_owner
'
)
and
hasattr
(
self
.
_owner
,
'
Dispatcher
'
):
self
.
on_receive
=
self
.
_owner
.
Dispatcher
.
ProcessNonBlocking
else
:
log
.
warn
ing
(
'
No Dispatcher plugged. Received data will not be processed
'
)
log
.
warn
(
'
No Dispatcher plugged. Received data will not be processed
'
)
self
.
on_receive
=
None
return
self
.
on_receive
=
recv_handler
...
...
@@ -453,7 +453,7 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject):
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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment