mirror of
https://github.com/juewuy/ShellCrash.git
synced 2026-03-11 07:51:45 +00:00
~修复因.start_error失败标记导致的部分bug
This commit is contained in:
@@ -37,7 +37,7 @@ case "$1" in
|
|||||||
start)
|
start)
|
||||||
[ -n "$(pidof CrashCore)" ] && $0 stop #禁止多实例
|
[ -n "$(pidof CrashCore)" ] && $0 stop #禁止多实例
|
||||||
stop_firewall #清理路由策略
|
stop_firewall #清理路由策略
|
||||||
rm -f "CRASHDIR"/.start_error #移除自启失败标记
|
rm -f "$CRASHDIR"/\.start_error #移除自启失败标记
|
||||||
#使用不同方式启动服务
|
#使用不同方式启动服务
|
||||||
if [ "$firewall_area" = "5" ]; then #主旁转发
|
if [ "$firewall_area" = "5" ]; then #主旁转发
|
||||||
. "$CRASHDIR"/starts/fw_start.sh
|
. "$CRASHDIR"/starts/fw_start.sh
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
[ ! -f "$TMPDIR" ] && mkdir -p "$TMPDIR"
|
[ ! -f "$TMPDIR" ] && mkdir -p "$TMPDIR"
|
||||||
|
|
||||||
#当上次启动失败时终止自启动
|
#当上次启动失败时终止自启动
|
||||||
[ -f "CRASHDIR"/.start_error ] && exit 1
|
[ -f "$CRASHDIR"/.start_error ] && exit 1
|
||||||
#加载工具
|
#加载工具
|
||||||
. "$CRASHDIR"/libs/check_cmd.sh
|
. "$CRASHDIR"/libs/check_cmd.sh
|
||||||
. "$CRASHDIR"/libs/check_target.sh
|
. "$CRASHDIR"/libs/check_target.sh
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
[ -z "$CRASHDIR" ] && CRASHDIR=$( cd $(dirname $0);cd ..;pwd)
|
[ -z "$CRASHDIR" ] && CRASHDIR=$( cd $(dirname $0);cd ..;pwd)
|
||||||
PIDFILE="/tmp/ShellCrash/$1.pid"
|
PIDFILE="/tmp/ShellCrash/$1.pid"
|
||||||
|
|
||||||
|
[ -f "$CRASHDIR"/.start_error ] && [ ! -f /tmp/ShellCrash/crash_start_time ] && exit 1 #当启动失败后禁止开机自启动
|
||||||
|
|
||||||
if [ -f "$PIDFILE" ]; then
|
if [ -f "$PIDFILE" ]; then
|
||||||
PID="$(cat "$PIDFILE")"
|
PID="$(cat "$PIDFILE")"
|
||||||
if [ -n "$PID" ] && [ -d "/proc/$PID" ]; then
|
if [ -n "$PID" ] && [ -d "/proc/$PID" ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user