dever 5 years ago
parent
commit
30dbdd88df
5 changed files with 24 additions and 12 deletions
  1. 2 1
      src/shell/autossh/daemon
  2. 2 1
      src/shell/autossh/start
  3. 7 5
      src/shell/ngrok/daemon
  4. 11 4
      src/shell/ngrok/expect
  5. 2 1
      src/shell/ngrok/start

+ 2 - 1
src/shell/autossh/daemon

@@ -1,5 +1,6 @@
 #!/usr/bin/env sh
 set -e
+path=$4
 while true
 do
 	pids=`ps aux|grep "/usr/bin/ssh -f -NR"|grep -v entrypoint|grep -v grep|grep -v process|awk '{print $1}'`
@@ -7,7 +8,7 @@ do
 		sleep 80000
 		kill -9 $pids
 	else
-		epids=`ps aux|grep "/data/dm/src/shell/autossh/expect"|grep -v entrypoint|grep -v grep|grep -v process|awk '{print $1}'`
+		epids=`ps aux|grep "${path}expect"|grep -v entrypoint|grep -v grep|grep -v process|awk '{print $1}'`
 		if [ "$epids" ]; then
 			kill -9 $epids
 		fi

+ 2 - 1
src/shell/autossh/start

@@ -1,3 +1,4 @@
 #!/usr/bin/env sh
 set -e
-/data/dm/src/shell/autossh/daemon $1 $2 $3 >/dev/null &
+path="/data/dm/src/shell/autossh/"
+${path}daemon $1 $2 $3 $path >/dev/null &

+ 7 - 5
src/shell/ngrok/daemon

@@ -1,15 +1,17 @@
 #!/usr/bin/env sh
 set -e
 name="ngrok_$1"
+domain=$1
+port=$2
+path=$3
 while true
 do
-	pids=`ps aux|grep "$name"|grep -v entrypoint|grep -v grep|grep -v process|awk '{print $1}'`
+	pids=`ps aux|grep "ngrok -subdomain=$1 -config=${$path}ngrok.cfg $port"|grep -v entrypoint|grep -v grep|grep -v process|awk '{print $1}'`
 	if [ "$pids" ]; then
-		sleep 600
-		kill -9 $pids
+		sleep 60
 	else
-		/data/dm/src/shell/ngrok/expect $name $2
+		${path}expect $name $domain $port $path
 		echo "ngrok started"
-		sleep 600
+		sleep 60
 	fi
 done

+ 11 - 4
src/shell/ngrok/expect

@@ -1,9 +1,16 @@
-#!/bin/sh
-set name [lrange $argv 0 0]
-set port [lrange $argv 1 1]
+#!/usr/bin/env bash
+name=$1
+domain=$2
+port=$3
+path=$4
+pids=`ps aux|grep "SCREEN -dmS $name"|grep -v entrypoint|grep -v grep|grep -v process|awk '{print $2}'`
+if [ "$pids" ]; then
+    kill -9 $pids
+    screen -wipe
+fi
 
 screen -dmS $name
-cmd=$"ngrok -subdomain='$name' -config='ngrok.cfg' $port"
+cmd=$"ngrok -subdomain=$domain -config=${path}ngrok.cfg $port"
 screen -x -S $name -p 0 -X stuff "$cmd"
 screen -x -S $name -p 0 -X stuff $'\n'
 

+ 2 - 1
src/shell/ngrok/start

@@ -1,3 +1,4 @@
 #!/usr/bin/env sh
 set -e
-/data/dm/src/shell/ngrok/daemon $1 $2 >/dev/null &
+path="/data/dm/src/shell/ngrok/"
+${path}daemon $1 $2 $path >/dev/null &