@@ -8,36 +8,43 @@ echo -e "\033[0;34m────────────────────
8
8
9
9
# [Tunnel] Check if cloudflared_token.txt exists and has content
10
10
if [ -s " /home/container/cloudflared_token.txt" ]; then
11
- echo -e " \033[0;37m[Tunnel] Starting Cloudflared with token... \033[0m"
11
+ echo -e " \033[0;37m[Tunnel] Starting Cloudflared with token\033[0m"
12
12
13
13
# Start cloudflared in the background and store the PID
14
14
cloudflared tunnel --no-autoupdate run --token " $( cat /home/container/cloudflared_token.txt) " > /home/container/logs/cloudflared.log 2>&1 &
15
15
CLOUD_FLARED_PID=$!
16
16
17
17
echo $CLOUD_FLARED_PID > /home/container/tmp/cloudflared.pid
18
18
19
- # Display waiting message
20
- echo -ne " \033[0;33m[Tunnel] Waiting for Cloudflared to start\033[0m"
21
-
22
- MAX_ATTEMPTS=10
19
+ MAX_ATTEMPTS=130
23
20
ATTEMPT=0
24
21
22
+ # Times for status messages (seconds)
23
+ STATUS_TIMES=(5 10 15 30 60 90 120)
24
+
25
+ # Display waiting message
26
+ echo -e " \033[0;33m[Tunnel] Waiting for Cloudflared to start...\033[0m"
27
+
25
28
# Monitor log file in real-time for a success or failure message
26
29
while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
27
- echo -ne " ." # Add a dot every second
28
30
sleep 1
29
31
ATTEMPT=$(( ATTEMPT + 1 ))
30
32
33
+ if [[ " ${STATUS_TIMES[@]} " =~ " $ATTEMPT " ]]; then
34
+ echo -e " \033[0;33m[Tunnel] Still waiting... ($ATTEMPT sec)\033[0m"
35
+ fi
36
+
31
37
# Check if cloudflared has exited
32
38
if ! kill -0 $CLOUD_FLARED_PID 2> /dev/null; then
33
- echo -e " \n\ 033[0;31m[Tunnel] Cloudflared failed to start. Check logs at /home/container/logs/cloudflared.log\033[0m"
39
+ echo -e " \033[0;31m[Tunnel] Cloudflared failed to start. Check logs at /home/container/logs/cloudflared.log\033[0m"
34
40
echo -e " \033[0;31m$( tail -n 10 /home/container/logs/cloudflared.log) \033[0m"
35
41
exit 1
36
42
fi
37
43
38
44
# Check log file for success messages
39
45
if grep -qE " Registered tunnel connection|Updated to new configuration" /home/container/logs/cloudflared.log; then
40
- echo -e " \n\033[0;32m[Tunnel] Cloudflared is running successfully!\033[0m"
46
+ echo -e " \033[0;32m[Tunnel] Connected after $ATTEMPT seconds\033[0m"
47
+ echo -e " \033[0;32m[Tunnel] Cloudflared is running successfully!\033[0m"
41
48
exit 0
42
49
fi
43
50
done
0 commit comments