github
/
teleport
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust start order of web and core server.

pull/105/head
Apex Lu 2018-09-02 13:24:20 +08:00
parent 1924c890e8
commit 181b71fa8e
3 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dist/server/daemon/start.sh.in vendored
View File

@ -10,24 +10,6 @@ shell_ret=0
cd "$DAEMON_PATH" cd "$DAEMON_PATH"
if [ $SRV == all ] || [ $SRV == core ] ; then
echo -n "starting teleport core server ... "
result=$( ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | wc -l )
if [ $result -gt 0 ]; then
echo "already running, skip."
else
$DAEMON_PATH/bin/tp_core start
result=$( ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | wc -l )
if [ ! $result -gt 0 ]; then
echo -e "\e[31m[FAILED]\033[0m"
shell_ret=1
else
echo -e "\e[32m[done]\033[0m"
fi
fi
fi
if [ $SRV == all ] || [ $SRV == web ] ; then if [ $SRV == all ] || [ $SRV == web ] ; then
echo -n "starting teleport web ... " echo -n "starting teleport web ... "
result=$( ps ax | grep "$DAEMON_PATH/bin/tp_web start" | grep -v grep | wc -l ) result=$( ps ax | grep "$DAEMON_PATH/bin/tp_web start" | grep -v grep | wc -l )
@ -46,6 +28,24 @@ if [ $SRV == all ] || [ $SRV == web ] ; then
fi fi
fi fi
if [ $SRV == all ] || [ $SRV == core ] ; then
echo -n "starting teleport core server ... "
result=$( ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | wc -l )
if [ $result -gt 0 ]; then
echo "already running, skip."
else
$DAEMON_PATH/bin/tp_core start
result=$( ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | wc -l )
if [ ! $result -gt 0 ]; then
echo -e "\e[31m[FAILED]\033[0m"
shell_ret=1
else
echo -e "\e[32m[done]\033[0m"
fi
fi
fi
exit $shell_ret exit $shell_ret

16
dist/server/daemon/status.sh.in vendored
View File

@ -3,14 +3,6 @@
DAEMON_PATH={daemon_path} DAEMON_PATH={daemon_path}
shell_ret=0 shell_ret=0
result=$( ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | wc -l )
if [ $result -gt 0 ]; then
echo -e "teleport core server is \e[32mrunning\033[0m."
else
echo -e "teleport core server is \e[31mnot running\033[0m."
shell_ret=1
fi
result=$( ps ax | grep "$DAEMON_PATH/bin/tp_web start" | grep -v grep | wc -l ) result=$( ps ax | grep "$DAEMON_PATH/bin/tp_web start" | grep -v grep | wc -l )
if [ $result -gt 0 ]; then if [ $result -gt 0 ]; then
echo -e "teleport web server is \e[32mrunning\033[0m." echo -e "teleport web server is \e[32mrunning\033[0m."
@ -19,5 +11,13 @@ else
shell_ret=1 shell_ret=1
fi fi
result=$( ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | wc -l )
if [ $result -gt 0 ]; then
echo -e "teleport core server is \e[32mrunning\033[0m."
else
echo -e "teleport core server is \e[31mnot running\033[0m."
shell_ret=1
fi
exit $shell_ret exit $shell_ret

22
dist/server/daemon/stop.sh.in vendored
View File

@ -7,17 +7,6 @@ fi
DAEMON_PATH={daemon_path} DAEMON_PATH={daemon_path}
if [ $SRV == all ] || [ $SRV == core ] ; then
echo -n "stoping teleport core server ... "
result=$( ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | wc -l )
if [ $result -gt 0 ]; then
ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | kill `awk '{{print $1}}'`
echo 'done.'
else
echo "not running, skip."
fi
fi
if [ $SRV == all ] || [ $SRV == web ] ; then if [ $SRV == all ] || [ $SRV == web ] ; then
echo -n "stoping teleport web ... " echo -n "stoping teleport web ... "
result=$( ps ax | grep "$DAEMON_PATH/bin/tp_web start" | grep -v grep | wc -l ) result=$( ps ax | grep "$DAEMON_PATH/bin/tp_web start" | grep -v grep | wc -l )
@ -29,5 +18,16 @@ if [ $SRV == all ] || [ $SRV == web ] ; then
fi fi
fi fi
if [ $SRV == all ] || [ $SRV == core ] ; then
echo -n "stoping teleport core server ... "
result=$( ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | wc -l )
if [ $result -gt 0 ]; then
ps ax | grep "$DAEMON_PATH/bin/tp_core start" | grep -v grep | kill `awk '{{print $1}}'`
echo 'done.'
else
echo "not running, skip."
fi
fi
exit 0 exit 0