Commit graph

221 commits

Author SHA1 Message Date
Thom Nichols
62da57a6c2 Merge branch 'master' of git://github.com/macdiesel/SleekXMPP into hacks 2010-07-01 17:50:45 -04:00
Thom Nichols
ba9633f8f7 Merge branch 'hacks' of github.com:tomstrummer/SleekXMPP into hacks 2010-07-01 17:06:50 -04:00
Tom Nichols
065a164223 proper logging. 2010-07-01 16:47:08 -04:00
Tom Nichols
cd2017b8b0 catch XML parse errors & don't attempt to reconnect. Also removed 'connecting' state from setStream method 2010-07-01 16:46:37 -04:00
Tom Nichols
dd9f33b7d9 removed some superfluous debug logging 2010-07-01 15:11:02 -04:00
Tom Nichols
0a23f84ec3 fix for statemachine where operations would unintentionally block if the lock was acquired in a long-running transition 2010-07-01 15:10:22 -04:00
Brian Beggs
f477ccf533 Merge remote branch 'tom/hacks' 2010-07-01 10:01:52 -04:00
Brian Beggs
d62a30b0f8 digest-md5 authentication now works with unicode-literals import. Re-added the __future__ imports that were removed. 2010-07-01 09:46:12 -04:00
Brian Beggs
d763795b2c Merge remote branch 'fritzy/master'
Conflicts:
	sleekxmpp/__init__.py
	sleekxmpp/basexmpp.py
	sleekxmpp/stanza/error.py
2010-07-01 09:17:45 -04:00
Brian Beggs
fff54eaf2f temporary removed future support for sleek to support digest-md5 auth 2010-07-01 08:44:39 -04:00
Brian Beggs
488d5b29d4 fixed typo 2010-06-30 14:48:45 -04:00
Brian Beggs
9bdb297fe2 basic checking for digest-md5 to make sure the necessary components are there to complete auth. If not a failed_auth event is dispatched and the socket disconnected. 2010-06-30 14:44:57 -04:00
Brian Beggs
fa7f72d0af Fixed a defect where handlers for SASL authentication were being added multiple times. This caused issues when trying to reconnect. A handler for the auth mech would get added each reconnection attempt, causing digest-md5, success and failure to be called x times for each x number of retries.
Handlers for sasl authentication as well as success and failure are now added during the __init__ method.
2010-06-30 14:30:18 -04:00
Brian Beggs
c538ffae79 digest-md5 auth now works, had to remove from __future__ import unicode_literals to get it working correctly. Also some improvments for the prioroity message sending. 2010-06-30 13:54:53 -04:00
Thom Nichols
5d87a54913 Merge branch 'hacks' of github.com:tomstrummer/SleekXMPP into hacks 2010-06-29 16:48:15 -04:00
Tom Nichols
8bdfa77024 Merge branch 'hacks' of git@github.com:tomstrummer/SleekXMPP into hacks 2010-06-28 11:10:34 -04:00
Tom Nichols
15ac3e9fba race condition where we were transitioning to 'disconnected' and immediately reconnecting in another thread before the socket.close call occurred. Now we're locking the state machine until the disconnect routine completes. 2010-06-28 11:06:26 -04:00
Tom Nichols
e8d37b409c make the scheduler a daemon thread to prevent hanging when the main thread exits. 2010-06-28 11:04:18 -04:00
Tom Nichols
898f96f265 print the traceback if we can't load a plugin for some reason 2010-06-28 11:03:46 -04:00
Thom Nichols
bbf1cb8ba2 output traceback when plugin load fails 2010-06-25 16:31:38 -04:00
Thom Nichols
d22f6a2aa5 make scheduler thread a daemon to prevent shutdown hanging 2010-06-25 16:30:45 -04:00
Brian Beggs
c0a6291fea More digest-md5 changes 2010-06-21 09:23:56 -04:00
Brian Beggs
f5d0466462 working on digest-md5 authentication 2010-06-18 09:51:29 -04:00
Brian Beggs
f659e3081e Merge remote branch 'tom/hacks' 2010-06-10 10:52:58 -04:00
Tom Nichols
4fccd77685 Merge branch 'hacks' of git@github.com:tomstrummer/SleekXMPP into hacks 2010-06-08 10:40:15 -04:00
Thom Nichols
bf2bf29fc6 fixed mis-named variable, doc typo and using conformant Condition methods. 2010-06-08 09:02:51 -04:00
Thom Nichols
34dc236126 added documentation for transition_ctx and removed some superfluous comment lines 2010-06-07 14:41:42 -04:00
Thom Nichols
9464736551 added __str__ 2010-06-07 13:58:15 -04:00
Thom Nichols
47f1fb1690 context manager now returns a boolean 'result' as the context variable to indicate whether the transition timed out or if you are actually locked when entering the context body 2010-06-07 13:43:37 -04:00
Thom Nichols
66cf0c2021 context manager is working but there's a fatal flaw: inside the body of the 'with' statement, there's no way to tell whether or not the transition occurred or timed out. 2010-06-07 13:16:02 -04:00
Thom Nichols
e7c37c4ec5 connect uses the new function-on-state-transition so when the connect method returns you are guaranteed to be either in the 'connected' or 'disconnected' state. Could remove the 'connecting' state except uses it. 2010-06-04 17:00:51 -04:00
Brian Beggs
1aa34cb0fc Merge remote branch 'tom/hacks' 2010-06-04 12:52:52 -04:00
Thom Nichols
919c8c5633 tweaked connectTCP call slightly to reduce possibility of 'connecting' state limbo 2010-06-03 15:21:26 -04:00
Thom Nichols
f54501a346 added function execution on transition, and more unit tests. 2010-06-03 14:12:06 -04:00
Thom Nichols
d20cd6b3e6 added function execution on transition, and more unit tests. 2010-06-03 13:51:11 -04:00
Brian Beggs
3f96226e29 Added additional logging when a plugin fails to import correctly. 2010-06-03 10:02:55 -04:00
Brian Beggs
71d72f431f Merge remote branch 'tom/hacks' 2010-06-03 09:54:48 -04:00
Thom Nichols
da6e1e47dc whups, somehow I lost the 'connecting' lock in connect() 2010-06-03 08:09:09 -04:00
Thom Nichols
2f0f18a8c6 added function to retrieve the current state 2010-06-03 08:07:56 -04:00
Thom Nichols
1c32668e18 fixed quiesce algorithm; state transition if connect fails; note about use_tls instance variable. 2010-06-03 07:47:27 -04:00
Tom Nichols
77bff9cce7 Merge branch 'hacks' of git@github.com:tomstrummer/SleekXMPP into hacks 2010-06-02 15:45:51 -04:00
Thom Nichols
1f3cfb98f1 Merge branch 'master' into hacks 2010-06-02 14:18:46 -04:00
Thom Nichols
4295a66c70 reconnection quiesce logic 2010-06-02 14:18:09 -04:00
Thom Nichols
8227affd7f removed unnecessary flags and arguments from disconnect method 2010-06-02 14:17:36 -04:00
Thom Nichols
3a2f989c5e Merge branch 'master' into hacks 2010-06-02 14:15:07 -04:00
Nathan Fritz
85a2715c7d hack fix for session before bind 2010-06-03 01:30:24 +08:00
Nathan Fritz
b03e6168a8 if binding and session are advertised in the same go, do session first 2010-06-03 01:30:23 +08:00
Brian Beggs
2a43f59a58 added try/catch block to plugin loading 2010-06-03 01:29:49 +08:00
Brian Beggs
184f7cb8a4 moddified plugin loading so plugins located outside of the plugins directory in sleek may be loaded. Added optional argument pluginModule that is a string that represents the module the desired plugin should be loaded from.
An exception on plugin loading now also will not cause the program to exit.  The exception is caught and loading of other plugins contains.
2010-06-03 01:29:49 +08:00
Brian Beggs
e1aa4d0b93 Added .pydevproject to the .gitignore 2010-06-03 01:29:48 +08:00