You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@couchdb.apache.org by ja...@apache.org on 2010/06/25 20:50:03 UTC

svn commit: r958073 - /couchdb/trunk/bin/couchdb.tpl.in

Author: jan
Date: Fri Jun 25 18:50:03 2010
New Revision: 958073

URL: http://svn.apache.org/viewvc?rev=958073&view=rev
Log:
make erl start options and ./bin/couchdb -h output more robust

Modified:
    couchdb/trunk/bin/couchdb.tpl.in

Modified: couchdb/trunk/bin/couchdb.tpl.in
URL: http://svn.apache.org/viewvc/couchdb/trunk/bin/couchdb.tpl.in?rev=958073&r1=958072&r2=958073&view=diff
==============================================================================
--- couchdb/trunk/bin/couchdb.tpl.in (original)
+++ couchdb/trunk/bin/couchdb.tpl.in Fri Jun 25 18:50:03 2010
@@ -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_
 
 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 \