From ccdbd266f984346b4d5d1a4953473ae436cf5f61 Mon Sep 17 00:00:00 2001
From: Clang <clangcn@gmail.com>
Date: Sun, 27 Mar 2016 14:54:09 +0800
Subject: [PATCH] 更新启动时端口占用检测

---
 ngrokd.init | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ngrokd.init b/ngrokd.init
index 7596606..d2108ce 100644
--- a/ngrokd.init
+++ b/ngrokd.init
@@ -89,6 +89,7 @@ fun_check_port(){
         [ -n "${strHttpsPort}" ] && netstat -ntlp | grep "\b:${https_port}\b"
         [ -n "${strRemotePort}" ] && netstat -ntlp | grep "\b:${remote_port}\b"
         [ -n "${strManagePort}" ] && netstat -ntlp | grep "\b:${manage_port}\b"
+        echo "start failed"
         return 1
     fi
 }
@@ -113,9 +114,9 @@ fun_start()
         echo "${ProgramName} (pid `pidof $NAME`) already running."
         return 0
     fi
+    echo -n "Starting ${ProgramName}..."
     fun_check_port
     fun_load_config
-    echo -n "Starting ${ProgramName}..."
     ${BIN} -domain="$dns" -httpAddr=":$http_port" -httpsAddr=":$https_port" -pass="$pass" -tlsCrt="$srtCRT" -tlsKey="$strKey" -tunnelAddr=":$remote_port"${log_level} > ${LOGFILE} 2>&1 &
     PID=`pidof ${NAME}`
     echo $PID > $PID_FILE
--
libgit2 0.21.0