Commit Graph

44536 Commits

Author SHA1 Message Date
Thomas Jackson
229cb0b09a Add missing import 2015-01-10 16:31:58 -08:00
Thomas Jackson
ff32601aff Consolidate some of the __init__ logic 2015-01-10 16:31:58 -08:00
Thomas Jackson
f6f8a248b4 Consolidate to mixin funcs 2015-01-10 16:31:58 -08:00
Thomas Jackson
2ba4b32b22 Consolidate to mixins funcs 2015-01-10 16:31:58 -08:00
Thomas Jackson
ab6de6246c Consolidate more code between runner and wheel modules 2015-01-10 16:31:32 -08:00
Thomas Jackson
f1bb69478c Make the callers of this function parse their args correctly 2015-01-10 16:31:32 -08:00
Thomas Jackson
a9a9dd5c56 Pass in args/kwargs 2015-01-10 16:31:32 -08:00
Thomas Jackson
b809c09b74 Clean up arg parsing in runner client 2015-01-10 16:31:32 -08:00
Thomas Jackson
b58bf7daac Add sleep to test runner 2015-01-10 16:31:31 -08:00
Thomas Jackson
2251f56692 Clean up arg parsing (a little), since the low that is passed does not have a "kwargs" section 2015-01-10 16:31:31 -08:00
Thomas Jackson
5649b1b59b replace l_fun with self.function[fun], since the local no longer exists 2015-01-10 16:31:31 -08:00
Thomas Jackson
cfa82992a7 - Change event name for print
- include old print in new evented print
- support having the args parsed and *not* parsed in low()
2015-01-10 16:31:31 -08:00
Thomas Jackson
3c28d13136 add doc string 2015-01-10 16:31:31 -08:00
Thomas Jackson
1823f499c0 Add stdout_print test function (to test overriding print func). Also include __jid_event__.fire_event (instead of __progress__) 2015-01-10 16:31:31 -08:00
Thomas Jackson
abb3222aba Inject a "print" function into runners, and clean up (a little) the event printout handling. 2015-01-10 16:31:31 -08:00
Thomas Jackson
520d541e06 Cleanup suffix determination 2015-01-10 16:31:31 -08:00
Thomas Jackson
65ed000ba0 Move get_async_returns to mixin 2015-01-10 16:31:31 -08:00
Thomas Jackson
eaff834cb7 Style cleanup 2015-01-10 16:31:00 -08:00
Thomas Jackson
e2c3c7e7e3 include pid in async log line 2015-01-10 16:31:00 -08:00
Thomas Jackson
33d1a51db9 Pylint cleanup 2015-01-10 16:30:01 -08:00
Thomas Jackson
30c3e57957 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-10 16:30:01 -08:00
Thomas Jackson
1843eb0ba6 Remove RunnerEvent 2015-01-10 16:30:01 -08:00
Thomas Jackson
b8dc9a3d98 Add a convenience wrapper for __progress__ 2015-01-10 16:30:01 -08:00
Thomas Jackson
6e8d25f973 Switch to using utils.jid to generate jid 2015-01-10 16:30:01 -08:00
Thomas Jackson
11c417b79a Inject globals without the sys module 2015-01-10 16:30:01 -08:00
Thomas Jackson
b010bca839 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-10 16:30:01 -08:00
Thomas Jackson
4da4ef4218 Refactor-- now all the event firing is done within low()
This means that *all* runner/wheel executions will have events
2015-01-10 16:30:01 -08:00
Thomas Jackson
bd7312dca4 Add a "namespacedevent" object, this give a convinent wrapper for firing events within a specific namespace 2015-01-10 16:30:00 -08:00
Thomas Jackson
3397922ba0 Move "low" to separate line-- everything else is 2015-01-10 16:30:00 -08:00
Thomas Jackson
f455281fd4 Misc cleanup 2015-01-10 16:30:00 -08:00
Thomas Jackson
89cbd19dce Consolidate the cmd() func to just use low(), since its all redundant (and most of the old arg parsing was redundant) 2015-01-10 16:30:00 -08:00
Thomas Jackson
4ed4acaeb9 Make Async really async-- and always create another process to execute the runner 2015-01-10 16:30:00 -08:00
Thomas Jackson
c17462d062 Caste jid as str (its an int all over), and change runner tag to correct prefix 2015-01-10 16:30:00 -08:00
Thomas Jackson
5e59781ae8 Remove local multiprocessing, and use the aync client mixin 2015-01-10 16:30:00 -08:00
Mike Place
0e935486de Merge pull request #19605 from jacksontj/develop
Fixes for develop
2015-01-10 08:54:59 -07:00
Thomas Jackson
925afac98d Temporarily change this test to work around race condition in the runnerclient
@rallytime If you have some list of tests that are disabled that shouldn't be, this is one for the list :)
2015-01-10 00:18:16 -08:00
Thomas Jackson
df3655dc45 Don't spin waiting for runner return, just use get_event (it has a poller) 2015-01-10 00:17:50 -08:00
Thomas Jackson
6d29d661b4 Join the async process, otherwise we leave zombies (which looks like a memory leak). 2015-01-10 00:01:18 -08:00
Nicole Thomas
f2b63b816e Merge pull request #19601 from rallytime/pylint
Fix pylint on develop branch
2015-01-09 21:05:59 -07:00
rallytime
d5d0e75f38 Fix pylint on develop branch 2015-01-09 20:54:36 -07:00
Mike Place
710c455b9b Merge pull request #19600 from cachedout/cleanup_jboss
Typ fix
2015-01-09 18:15:18 -07:00
Mike Place
dfb8810afc Typo 2015-01-09 18:14:52 -07:00
Thomas S Hatch
8ec6d4a257 Merge pull request #19561 from favadi/clean_file
add pkgrepo.managed clean_file option
2015-01-09 17:51:35 -07:00
Thomas S Hatch
98cc0f88b4 Merge pull request #19585 from cachedout/async_flag_for_test_run
Async flag for test run
2015-01-09 17:50:52 -07:00
Thomas S Hatch
cad85fd81b Merge pull request #19583 from basepi/merge-forward-develop
Merge forward from 2015.2 to develop
2015-01-09 17:49:43 -07:00
Thomas S Hatch
02251ae8fa Merge pull request #19582 from manonthemat/develop
url fix of dependency in installation guide
2015-01-09 17:47:46 -07:00
Thomas S Hatch
6cce713a76 Merge pull request #19581 from jacksontj/develop
Remove clear() method
2015-01-09 17:44:14 -07:00
Thomas S Hatch
f8f7867461 Merge pull request #19595 from thatch45/Trax-air-fix-azure-cloud-service
Merge #19580 with fixes
2015-01-09 17:39:01 -07:00
Thomas S Hatch
20555c9c38 Merge branch 'develop' into Trax-air-fix-azure-cloud-service
Conflicts:
	salt/cloud/clouds/msazure.py
2015-01-09 17:37:48 -07:00
Thomas S Hatch
83fab2739d lint (and single quotes when I see them :) ) 2015-01-09 17:35:25 -07:00