diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-02-09 15:59:17 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-02-09 15:59:17 +0000 |
| commit | e0fbba695861c1d660dddde1b50ccd045f7571b0 (patch) | |
| tree | b78c002ddb8cacd2d95c25c5580885fed5797320 /packaging/common | |
| parent | e47b685cc8c9c89606a0eb8d9cb6910b032fe25e (diff) | |
| download | rabbitmq-server-git-e0fbba695861c1d660dddde1b50ccd045f7571b0.tar.gz | |
Use setsid rather than nohup.
Diffstat (limited to 'packaging/common')
| -rw-r--r-- | packaging/common/rabbitmq-server.init | 4 | ||||
| -rwxr-xr-x | packaging/common/rabbitmq-server.ocf | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packaging/common/rabbitmq-server.init b/packaging/common/rabbitmq-server.init index e3f1d13f9f..aa34fabda0 100644 --- a/packaging/common/rabbitmq-server.init +++ b/packaging/common/rabbitmq-server.init @@ -40,8 +40,8 @@ start_rabbitmq () { else RETVAL=0 set +e - nohup $DAEMON > ${INIT_LOG_DIR}/startup_log \ - 2> ${INIT_LOG_DIR}/startup_err & + setsid sh -c "$DAEMON > ${INIT_LOG_DIR}/startup_log \ + 2> ${INIT_LOG_DIR}/startup_err" & $CONTROL wait >/dev/null 2>&1 case "$?" in 0) diff --git a/packaging/common/rabbitmq-server.ocf b/packaging/common/rabbitmq-server.ocf index f732265974..94999d0edf 100755 --- a/packaging/common/rabbitmq-server.ocf +++ b/packaging/common/rabbitmq-server.ocf @@ -248,7 +248,7 @@ rabbit_start() { export_vars - nohup $RABBITMQ_SERVER > ${RABBITMQ_LOG_BASE}/startup_log 2> ${RABBITMQ_LOG_BASE}/startup_err & + setsid sh -c "$RABBITMQ_SERVER > ${RABBITMQ_LOG_BASE}/startup_log 2> ${RABBITMQ_LOG_BASE}/startup_err" & # Wait for the server to come up. # Let the CRM/LRM time us out if required |