diff options
| author | Holger Levsen <holger@layer-acht.org> | 2016-09-15 08:38:15 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-09-15 08:38:15 +0200 |
| commit | 5edfaad69c4cde743ea18d81121e6394a5586dd5 (patch) | |
| tree | 721e1505c356d029835a7444bb8daea4963ffc98 /hosts | |
| parent | a239d09e1ed2624d3a02dd42f3291ace2a3ed867 (diff) | |
| download | jenkins.debian.net-5edfaad69c4cde743ea18d81121e6394a5586dd5.tar.xz | |
merge change from jenkins 2.7.4
Diffstat (limited to 'hosts')
| -rwxr-xr-x | hosts/jenkins/etc/init.d/jenkins | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hosts/jenkins/etc/init.d/jenkins b/hosts/jenkins/etc/init.d/jenkins index 4b266c45..51783a81 100755 --- a/hosts/jenkins/etc/init.d/jenkins +++ b/hosts/jenkins/etc/init.d/jenkins @@ -134,7 +134,7 @@ do_start() # get_running() { - return `ps -U $JENKINS_USER --no-headers -f | egrep -e '(java|daemon)' | grep -c . ` + return `ps -U $JENKINS_USER --no-headers -f | egrep -e '(java)' | grep -v defunct | grep -c . ` } force_stop() |