valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,656 Commits 24 Branches 182 Tags 341 MiB
005f3b7e08
Commit Graph

44656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Jackson
005f3b7e08 Add missing import 2015-01-28 18:43:42 -08:00
Thomas Jackson
86eac002dc Consolidate some of the __init__ logic 2015-01-28 18:43:42 -08:00
Thomas Jackson
be813fe14b Consolidate to mixin funcs 2015-01-28 18:43:42 -08:00
Thomas Jackson
e14c3f1e8d Consolidate to mixins funcs 
Conflicts:

	salt/runner.py
 2015-01-28 18:43:42 -08:00
Thomas Jackson
f58c5b63a5 Consolidate more code between runner and wheel modules 2015-01-28 18:43:42 -08:00
Thomas Jackson
052a9686ec Make the callers of this function parse their args correctly 2015-01-28 18:43:42 -08:00
Thomas Jackson
f751429468 Pass in args/kwargs 2015-01-28 18:43:42 -08:00
Thomas Jackson
15c3637828 Clean up arg parsing in runner client 2015-01-28 18:43:42 -08:00
Thomas Jackson
9c983c3cb4 Add sleep to test runner 2015-01-28 18:43:42 -08:00
Thomas Jackson
43b16a87ce Clean up arg parsing (a little), since the low that is passed does not have a "kwargs" section 2015-01-28 18:43:42 -08:00
Thomas Jackson
4f16129375 replace l_fun with self.function[fun], since the local no longer exists 2015-01-28 18:43:42 -08:00
Thomas Jackson
9ea2a275f1 - Change event name for print 
- include old print in new evented print
- support having the args parsed and *not* parsed in low()

Conflicts:

	salt/client/mixins.py
 2015-01-28 18:43:42 -08:00
Thomas Jackson
b87f700456 add doc string 2015-01-28 18:43:42 -08:00
Thomas Jackson
8720f61061 Add stdout_print test function (to test overriding print func). Also include __jid_event__.fire_event (instead of __progress__) 2015-01-28 18:43:42 -08:00
Thomas Jackson
6f3f7850c8 Move get_async_returns to mixin 2015-01-28 18:43:42 -08:00
Thomas Jackson
79e5ad40ba Style cleanup 2015-01-28 18:43:41 -08:00
Thomas Jackson
8befb64bb1 include pid in async log line 2015-01-28 18:43:41 -08:00
Thomas Jackson
57b3a49534 Pylint cleanup 2015-01-28 18:43:41 -08:00
Thomas Jackson
2241444f88 Fix for #18256 
With this new setup of everything firing events, this seemed like a good time to tackle this infinite recursion from the reactor. What this does is pass a "user" (Reactor) to all jobs that the reactor starts. Then the reactor skips all events created by that username-- thereby only reacting to events not caused by itself.
 2015-01-28 18:43:41 -08:00
Thomas Jackson
e6c0d0f48e Remove RunnerEvent 2015-01-28 18:43:41 -08:00
Thomas Jackson
1fb880f4fa Add a convenience wrapper for __progress__ 2015-01-28 18:43:41 -08:00
Thomas Jackson
f5b2b36036 Switch to using utils.jid to generate jid 2015-01-28 18:43:41 -08:00
Thomas Jackson
4d576eacc0 Inject globals without the sys module 2015-01-28 18:43:41 -08:00
Thomas Jackson
d2522a8260 Swallow exceptions on __del__ of event 
This will avoid exception in interpreter shutdown such as:

```
Exception TypeError: 'an integer is required' in <bound method MasterEvent.__del__ of <salt.utils.event.MasterEvent object at 0x3ab2a50>> ignored
```

Most of which are because during interpreter shutdown there is no order gaurantee so things (such as the zmq lib) get unloaded even though the __del__ method has references to it
 2015-01-28 18:43:41 -08:00
Thomas Jackson
719e71e3da Refactor-- now all the event firing is done within low() 
This means that *all* runner/wheel executions will have events
 2015-01-28 18:43:41 -08:00
Thomas Jackson
7f8ae33da2 Add a "namespacedevent" object, this give a convinent wrapper for firing events within a specific namespace 2015-01-28 18:43:41 -08:00
Thomas Jackson
9dd4d48ea9 Move "low" to separate line-- everything else is 2015-01-28 18:43:41 -08:00
Thomas Jackson
93eada584d Misc cleanup 2015-01-28 18:43:41 -08:00
Thomas Jackson
afc072a66c Consolidate the cmd() func to just use low(), since its all redundant (and most of the old arg parsing was redundant) 2015-01-28 18:43:40 -08:00
Thomas Jackson
05cf77617b Make Async really async-- and always create another process to execute the runner 2015-01-28 18:43:40 -08:00
Thomas Jackson
d8e8de2a19 Caste jid as str (its an int all over), and change runner tag to correct prefix 
Conflicts:

	salt/utils/event.py
 2015-01-28 18:43:40 -08:00
Thomas Jackson
1dc6784662 Remove local multiprocessing, and use the aync client mixin 2015-01-28 18:43:40 -08:00
Thomas S Hatch
a71c06d334 Merge pull request #20098 from thatch45/journald_beacon 
Journald and WTMP beacons
 2015-01-28 15:44:53 -07:00
Thomas S Hatch
de0f231469 Merge pull request #20158 from rallytime/bp-20042 
Backport #20042 to 2015.2
 2015-01-28 15:05:15 -07:00
Thomas S Hatch
97285aadd0 Merge pull request #20152 from techhat/httpupdate 
Add function to update CA cert bundle
 2015-01-28 15:03:55 -07:00
Thomas S Hatch
9432dc1d67 Merge pull request #20148 from pille/issue-16293 
support --only-upgrade option in apt
 2015-01-28 15:01:34 -07:00
Thomas S Hatch
d86e5dd7fb Merge pull request #20135 from kev009/remove-restart_on_error 
Remove unused restart_on_error config
 2015-01-28 14:58:20 -07:00
Thomas S Hatch
328d7220e4 Merge pull request #20129 from whiteinge/events-token-regression-fix 
Fix regression with token handling in the /events URL
 2015-01-28 14:52:23 -07:00
Nicole Thomas
545b5f3ff4 Merge pull request #20160 from rallytime/fifteen_pylint 
Pylint fix for 2015.2
 2015-01-28 14:46:50 -07:00
rallytime
bd4322360a Moar pylint 2015-01-28 14:46:28 -07:00
Thomas S Hatch
9466dc25f3 lint 2015-01-28 14:41:26 -07:00
rallytime
e8144f57eb Pylint fix for 2015.2 2015-01-28 14:07:17 -07:00
Colton Myers
d912a845df Merge pull request #20075 from basepi/compound20074 
Finish out the matcher_args for compound matcher, Fixes #20074
 2015-01-28 13:49:53 -07:00
Jeremy Rosenbaum
5ba815e37f Allow relative paths for --config_dir with daemonized minions 2015-01-28 13:40:54 -07:00
Nicole Thomas
a717549c4e Merge pull request #20116 from rallytime/merge_forward_to_fifteen 
Merge 2014.7 into 2015.2
 2015-01-28 12:15:08 -07:00
Joseph Hall
f846925ba7 Document text_out and headers_out 2015-01-28 11:08:31 -07:00
Joseph Hall
d1746fa7fe Document updating CA bundles 2015-01-28 10:51:04 -07:00
Joseph Hall
4712e870be Allow execution module to update_ca_bundle 2015-01-28 10:50:40 -07:00
Joseph Hall
38e349f042 Allow runner to update_ca_bundle 2015-01-28 10:50:04 -07:00
Thomas S Hatch
19b7db40b8 Merge pull request #19914 from jfindlay/shell_false 
change python_shell default to False
 2015-01-28 10:41:16 -07:00