diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2016-03-23 13:17:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-03-23 13:17:07 +0000 |
| commit | bbce3eedef9c23757a621c1b0e1fb651bf278dfb (patch) | |
| tree | 0c37ff586dc4e781ea171a7a2fae140d23cdf155 | |
| parent | f770fb90cae6fed096658b480bbf236fef424735 (diff) | |
| parent | 359784285460e067d0aad154b366187665a1f2e7 (diff) | |
Merge "jenkins-jnlp-connect.sh: monit config file was always updated"
| -rwxr-xr-x | utils/jenkins-jnlp-connect.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/jenkins-jnlp-connect.sh b/utils/jenkins-jnlp-connect.sh index ec31a4aa7..10ac50b0a 100755 --- a/utils/jenkins-jnlp-connect.sh +++ b/utils/jenkins-jnlp-connect.sh @@ -100,8 +100,8 @@ if [[ -f $monitconfdir/jenkins ]]; then #test for diff if [[ "$(diff $monitconfdir/jenkins <(echo "\ check process jenkins with pidfile /var/run/$jenkinsuser/jenkins_jnlp_pid -start program = \"usr/bin/sudo -u $jenkinsuser /bin/bash -c 'cd $dir; export started_monit=true; $0 $@'\" -stop program = \" /bin/bash -c '/bin/kill \$(/bin/cat /var/run/$jenkinsuser/jenkins_jnlp_pid)'\"\ +start program = \"/usr/bin/sudo -u $jenkinsuser /bin/bash -c 'cd $dir; export started_monit=true; $0 $@'\" +stop program = \"/bin/bash -c '/bin/kill \$(/bin/cat /var/run/$jenkinsuser/jenkins_jnlp_pid)'\"\ ") )" ]]; then echo "Updating monit config..." makemonit $@ |