Commit Graph

50380 Commits

Author SHA1 Message Date
Thomas Jackson
ae0d92a059 Don't make a copy of the list to iterate (it might be very large). Instead keep a list of who to remove 2015-04-07 20:53:23 -07:00
Thomas Jackson
de21707673 cleanup 2015-04-07 20:53:23 -07:00
Thomas Jackson
b7f4fc25b4 Remove rep_hwm (doesn't do anything) 2015-04-07 20:53:23 -07:00
Thomas Jackson
fb107b0df2 Whitespace cleanup 2015-04-07 20:53:23 -07:00
Thomas Jackson
5492036411 Misc cleanup 2015-04-07 20:53:22 -07:00
Thomas Jackson
543c56d969 Revert register poller, we'll just have the minion exit 2015-04-07 20:53:22 -07:00
Thomas Jackson
6d372d7326 ReqChannel cleanup
- Remove recv_noblock from ReqServer channel
- keepalive
- epoll
2015-04-07 20:53:22 -07:00
Thomas Jackson
374d4154ab Re-work PubChannel
- add register_poller (since some people need to change the FD (on failure etc)
- remove recv_noblock
2015-04-07 20:53:22 -07:00
Thomas Jackson
fc83b44fae Major overhaul of tcp implementation
Now using the same crypto stuff as the zeromq implementation
2015-04-07 20:53:22 -07:00
Thomas Jackson
11195c4f2c Cleanup pubchannel polling
zmq poller returns either zmq socket objects of raw FDs. adding an API in the clients to differentiate
2015-04-07 20:53:22 -07:00
Thomas Jackson
5731a01209 Remove testing code 2015-04-07 20:53:22 -07:00
Thomas Jackson
4bd71f9448 More hacking to get tcp working 2015-04-07 20:53:22 -07:00
Thomas Jackson
6fb0ec1edc Initial addition of tcp channel 2015-04-07 20:53:22 -07:00
Thomas Jackson
0a0caf6304 Hacking to fix various things broken in rebase 2015-04-07 20:53:22 -07:00
Thomas Jackson
8e0316d613 Misc cleanup 2015-04-07 20:53:22 -07:00
Thomas Jackson
0ddd4ec04b Migrate _auth logic into the ReqServerChannel 2015-04-07 20:53:22 -07:00
Thomas Jackson
ea49cbc628 Change req_fun default to send (which is encrypted) 2015-04-07 20:53:21 -07:00
Thomas Jackson
422d1c28a3 Re-work req_channel in the master daemons, now we don't pass it down the stack, the master-side funcs need to return a dict of opts which specify which send_func to use 2015-04-07 20:53:21 -07:00
Thomas Jackson
8c66c4e857 Initial move of publisher into PubServerChannel 2015-04-07 20:53:21 -07:00
Thomas Jackson
f128e47240 Initial migration of master-side ReqChannels
This is an attempt to pull all transport/crypto logic out of the core master classes.

Once this is completed we should be able to re-use all of this code for all transport types
2015-04-07 20:53:21 -07:00
Thomas Jackson
5ae95fff58 Rename channel to client
A bit more clear since there are client and server-side classes
2015-04-07 20:53:21 -07:00
Thomas Jackson
1ffac59056 Add local channel to factory 2015-04-07 20:53:21 -07:00
Thomas Jackson
5e661b0cbc Pull all fallback cleanup into its own function 2015-04-07 20:53:21 -07:00
Thomas Jackson
10e3ec870f Remove old refs to _init_context_and_poller 2015-04-07 20:53:21 -07:00
Thomas Jackson
fef2e38888 Remove some noe-deprecated and unused functions 2015-04-07 20:53:21 -07:00
Thomas Jackson
2b0d1e5cd3 Refactor minion events to be their own class instead of spread throughout the minion classes 2015-04-07 20:53:21 -07:00
Thomas Jackson
21624eb20e Remove all final references to self.socket from minion.py 2015-04-07 20:53:21 -07:00
Thomas Jackson
d406b2e1da Add "socket" interface to pub_channel, so we can wire it into regular pollers 2015-04-07 20:53:21 -07:00
Thomas Jackson
7bbfba2797 More migration to PubChannel 2015-04-07 20:53:20 -07:00
Thomas Jackson
645eaf084b Cleanup print from debugging 2015-04-07 20:53:20 -07:00
Thomas Jackson
87fb069e05 Implement timeout for PubChannel.recv() 2015-04-07 20:53:20 -07:00
Thomas Jackson
3290c32659 Remove some unused imports 2015-04-07 20:53:20 -07:00
Thomas Jackson
064896d4d9 Update commented out version as well 2015-04-07 20:53:20 -07:00
Thomas Jackson
e376b283ef Refactor the start_daemon function 2015-04-07 20:53:20 -07:00
Thomas Jackson
403c81c2a6 Move daemon init and execution into the same process.
These daemon processes aren't all thread safe, so having the test suite init then fork is disingenuous since that isn't supported anyways.
2015-04-07 20:53:20 -07:00
Thomas Jackson
8996493152 Misc cleanup after rebase 2015-04-07 20:53:20 -07:00
Thomas Jackson
62d9d3cdad Switch remaining uses of sreq to channel 2015-04-07 20:53:20 -07:00
Thomas Jackson
7c93360a82 More work to remove minion.authenticate() 2015-04-07 20:53:20 -07:00
Thomas Jackson
fa94083acc Consolidate socketopts into channel 2015-04-07 20:53:07 -07:00
Thomas Jackson
e8b31057f8 Rebase in current develop, and add in recv_noblock 2015-04-07 20:53:07 -07:00
Thomas Jackson
ce04827fa4 A few hacks to get some basic pubchannel working 2015-04-07 20:53:07 -07:00
Thomas Jackson
3bf28b1bb5 Refactor channel classes to have separate pub/req channels 2015-04-07 20:51:26 -07:00
Justin Findlay
54ce98a92b Merge pull request #22438 from garethgreenaway/http_return_code_cleanup
HTTP Return Code Cleanup
2015-04-07 16:34:54 -06:00
Nicole Thomas
408cfb223f Merge pull request #22424 from jfindlay/network_tests
add wake-on-lan unit tests
2015-04-07 15:45:47 -06:00
Gareth J. Greenaway
e6b847eca8 Swapping out hardcoded HTTP return code numbers for their values from salt.ext.six.moves.http_client. Some typos in some documention for returners. 2015-04-07 14:17:24 -07:00
Thomas S Hatch
2ceea0e3c7 Merge pull request #22430 from cachedout/display_docs
Display documention when the CLI gets bad function args
2015-04-07 14:50:20 -06:00
Justin Findlay
2ef39ed380 add wake-on-lan unit tests 2015-04-07 14:41:28 -06:00
Thomas S Hatch
caff269555 Merge pull request #22421 from terminalmage/docker-ng
docker-ng module updates
2015-04-07 14:38:43 -06:00
Thomas S Hatch
5643c7f33b Merge pull request #22432 from cachedout/minion_lint
Minion lint
2015-04-07 14:12:45 -06:00
Thomas S Hatch
55f4348103 Merge pull request #22428 from garethgreenaway/adding_ps_beacon
ps beacon
2015-04-07 14:10:58 -06:00