From bbd0703f769bac618c0dec22ebf2d14b0a5df5b8 Mon Sep 17 00:00:00 2001
From: Jan Lehnardt <jan@apache.org>
Date: Fri, 25 Jun 2010 18:50:03 +0000
Subject: make erl start options and ./bin/couchdb -h output more robust

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@958073 13f79535-47bb-0310-9956-ffa450edef68
---
 bin/couchdb.tpl.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'bin/couchdb.tpl.in')

diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
index f6dc4090..94d47439 100644
--- a/bin/couchdb.tpl.in
+++ b/bin/couchdb.tpl.in
@@ -15,6 +15,7 @@
 BACKGROUND=false
 DEFAULT_CONFIG_DIR=%localconfdir%/default.d
 DEFAULT_CONFIG_FILE=%localconfdir%/%defaultini%
+ERL_START_OPTIONS="-sasl errlog_type error +K true +A 4"
 HEART_BEAT_TIMEOUT=11
 HEART_COMMAND="%bindir%/%couchdb_command_name% -k"
 INTERACTIVE=false
@@ -63,7 +64,7 @@ The $basename command runs the %package_name% server.
 
 Erlang is called with:
 
-    -sasl errlog_type error +K true
+    $ERL_START_OPTIONS
 
 Erlang inherits the environment of this command.
 
@@ -221,7 +222,7 @@ start_couchdb () {
         touch $PID_FILE
         interactive_option="+Bd -noinput"
     fi
-    command="%ERL% $interactive_option -sasl errlog_type error +K true +A 4 \ 
+    command="%ERL% $interactive_option $ERL_START_OPTIONS \
         -env ERL_LIBS %localerlanglibdir% -couch_ini $start_arguments -s couch"
     if test "$BACKGROUND" = "true" -a "$RECURSED" = "false"; then
         $0 $background_start_arguments -b -r $RESPAWN_TIMEOUT -p $PID_FILE \
-- 
cgit v1.2.3