Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-18 22:15:20 +02:00
Code Releases Activity

Merge pull request #801 from nanoz/patch-1

Browse Source 
feat(ejabberdctl): Foreground option for docker
This commit is contained in:
Paweł Chmielowski 2015-10-29 19:46:18 +01:00
commit 2814dd2cb8
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ejabberdctl.template
View File

@ -228,6 +228,21 @@ iexlive()
--erl \"$ERLANG_OPTS\" --erl $ARGS --erl \"$@\"" --erl \"$ERLANG_OPTS\" --erl $ARGS --erl \"$@\""
} }
# start server in the foreground
foreground()
{
check_start
$EXEC_CMD "$ERL \
$NAME $ERLANG_NODE \
-noinput \
-pa $EJABBERD_EBIN_PATH \
$MNESIA_OPTS \
$KERNEL_OPTS \
$EJABBERD_OPTS \
-s ejabberd \
$ERLANG_OPTS $ARGS \"$@\""
}
debugwarning() debugwarning()
{ {
if [ "$EJABBERD_BYPASS_WARNINGS" != "true" ] ; then if [ "$EJABBERD_BYPASS_WARNINGS" != "true" ] ; then
@ -300,11 +315,12 @@ help()
{ {
echo "" echo ""
echo "Commands to start an ejabberd node:" echo "Commands to start an ejabberd node:"
echo " start Start an ejabberd node in server mode" echo " start Start an ejabberd node in server mode"
echo " debug Attach an interactive Erlang shell to a running ejabberd node" echo " debug Attach an interactive Erlang shell to a running ejabberd node"
echo " iexdebug Attach an interactive Elixir shell to a running ejabberd node" echo " iexdebug Attach an interactive Elixir shell to a running ejabberd node"
echo " live Start an ejabberd node in live (interactive) mode" echo " live Start an ejabberd node in live (interactive) mode"
echo " iexlive Start an ejabberd node in live (interactive) mode, within an Elixir shell" echo " iexlive Start an ejabberd node in live (interactive) mode, within an Elixir shell"
echo " foreground Start an ejabberd node in server mode (attached)"
echo "" echo ""
echo "Optional parameters when starting an ejabberd node:" echo "Optional parameters when starting an ejabberd node:"
echo " --config-dir dir Config ejabberd: $ETC_DIR" echo " --config-dir dir Config ejabberd: $ETC_DIR"
@ -468,6 +484,7 @@ case $ARGS in
' iexdebug') iexdebug;; ' iexdebug') iexdebug;;
' live') live;; ' live') live;;
' iexlive') iexlive;; ' iexlive') iexlive;;
' foreground') foreground;;
' ping'*) ping ${ARGS# ping};; ' ping'*) ping ${ARGS# ping};;
' etop') etop;; ' etop') etop;;
' started') wait_for_status 0 30 2;; # wait 30x2s before timeout ' started') wait_for_status 0 30 2;; # wait 30x2s before timeout