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
Joseph Hall
7a805e5db1
Allow user to merge extra files to the end of the CA bundle
2015-01-28 09:55:49 -07:00
Joseph Hall
a619de5444
Change from /srv/salt to file_roots
2015-01-28 09:37:34 -07:00
Mike Place
c86b5c8189
Merge pull request #20151 from rallytime/fix_sock_path_len_test
...
Add extension_modules to mocked __opts__ in test_sock_path_len
2015-01-28 09:30:35 -07:00
Joseph Hall
8d5ff1907d
Add function to update CA cert bundle
2015-01-28 09:22:38 -07:00
rallytime
592ff1c748
Add extension_modules to mocked __opts__ in test_sock_path_len
2015-01-28 09:20:26 -07:00
pille
13f7fe1d8e
support --only-upgrade option in apt
...
fixes #16293
2015-01-28 15:30:55 +01:00
Mike Place
1a73c46a58
Merge pull request #20137 from whiteinge/schedule-file-open-traceback
...
Wrap opening _schedule.conf file in the try..except
2015-01-27 20:14:18 -07:00
Seth House
f4a0a95f9a
Wrap opening _schedule.conf file in the try..except
...
Otherwise tracebacks if the file does not exist.
2015-01-27 20:11:54 -07:00
Kevin Bowling
23155964f5
Remove unused restart_on_error config
2015-01-27 19:24:29 -07:00
Nicole Thomas
4f3a7ca937
Merge pull request #20132 from thatch45/schedule_fix
...
use a get with a fallback
2015-01-27 18:21:45 -07:00
Thomas S Hatch
94d90c1455
use a get with a fallback
2015-01-27 17:01:12 -07:00
Seth House
f900179e48
Added token and salt_token as param docs
...
Also un-emphasized this way of passing the token in examples since it is
the lesser-used form of authenticating with this endpoint.
2015-01-27 15:57:07 -07:00
Thomas S Hatch
c619db5df4
Merge pull request #20119 from thatch45/schedule_meta
...
update the schedule to include timezone data if metadata is passed
2015-01-27 14:54:32 -07:00
Thomas S Hatch
c620cefddc
update simple types filter to handle tuples
2015-01-27 14:52:15 -07:00
jfindlay
83f47546cb
Merge pull request #1 from rallytime/shell_false
...
Fix some of the mocking on cmdmod_test
2015-01-27 14:24:58 -07:00
