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

change the service module to use cross calling instead of subprocess

Browse Source
This commit is contained in:
Thomas S Hatch 2011-10-24 23:24:10 -06:00
parent 914e1948a4
commit 114638ebbc
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
salt/modules/service.py
View File

@ -2,7 +2,6 @@
Top level package command wrapper, used to translate the os detected by the
grains to the correct service manager
'''
import subprocess
import os
grainmap = {
@ -22,7 +21,7 @@ def start(name):
'''
cmd = os.path.join(grainmap[__grains__['os']],
name + ' start')
return not subprocess.call(cmd, shell=True)
return not __salt__['cmd.retcode'](cmd)
def stop(name):
'''
@ -33,7 +32,7 @@ def stop(name):
'''
cmd = os.path.join(grainmap[__grains__['os']],
name + ' stop')
return not subprocess.call(cmd, shell=True)
return not __salt__['cmd.retcode'](cmd)
def restart(name):
'''
@ -44,7 +43,7 @@ def restart(name):
'''
cmd = os.path.join(grainmap[__grains__['os']],
name + ' restart')
return not subprocess.call(cmd, shell=True)
return not __salt__['cmd.retcode'](cmd)
def status(name, sig=None):
'''
@ -58,6 +57,4 @@ def status(name, sig=None):
sig = name if not sig else sig
cmd = "{0[ps]} | grep {1} | grep -v grep | awk '{{print $2}}'".format(
__grains__, sig)
return subprocess.Popen(cmd,
shell=True,
stdout=subprocess.PIPE).communicate()[0].strip()
return __salt__['cmd.run'](cmd).strip()