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 | d11305029e2d5d587b14e22cc5f04d957aa8777c (patch) | |
| tree | b78c002ddb8cacd2d95c25c5580885fed5797320 | |
| parent | 2deb9a58ebc6bf078af6c136aa2f4a5f5a105103 (diff) | |
| download | rabbitmq-server-d11305029e2d5d587b14e22cc5f04d957aa8777c.tar.gz | |
Use setsid rather than nohup.
| -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 e3f1d13f..aa34fabd 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 f7322659..94999d0e 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 |