mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2025-12-23 06:42:41 +00:00
Refactored previous commit
This commit is contained in:
parent
dd1beaaaba
commit
64d2f15be2
2 changed files with 6 additions and 13 deletions
|
|
@ -1,24 +1,18 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
if [ -z "$GEODATA_DIR" ]; then
|
set -eu
|
||||||
echo "ERROR: GEODATA_DIR environment variable is not set"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$MAX_GEODATA_DIR_WAIT" ]; then
|
: "${MAX_GEODATA_DIR_WAIT:=30}"
|
||||||
echo "WARNING: MAX_GEODATA_DIR_WAIT environment variable is not set, using default MAX_GEODATA_DIR_WAIT=300"
|
: "${WAIT_INTERVAL:=10}"
|
||||||
MAX_GEODATA_DIR_WAIT=300
|
: "${GEODATA_DIR:?GEODATA_DIR is required}"
|
||||||
fi
|
|
||||||
|
|
||||||
FINISH_FILE="$GEODATA_DIR/cron-job-finished.txt"
|
FINISH_FILE="$GEODATA_DIR/cron-job-finished.txt"
|
||||||
|
|
||||||
ELAPSED=0
|
ELAPSED=0
|
||||||
INTERVAL=10
|
|
||||||
|
|
||||||
while [ ! -f "$FINISH_FILE" ] && [ "$ELAPSED" -lt "$MAX_GEODATA_DIR_WAIT" ]; do
|
while [ ! -f "$FINISH_FILE" ] && [ "$ELAPSED" -lt "$MAX_GEODATA_DIR_WAIT" ]; do
|
||||||
echo "Waiting for geodata initialization... ($ELAPSED/$MAX_GEODATA_DIR_WAIT seconds)"
|
echo "Waiting for geodata initialization... ($ELAPSED/$MAX_GEODATA_DIR_WAIT seconds)"
|
||||||
sleep $INTERVAL
|
sleep $WAIT_INTERVAL
|
||||||
ELAPSED=$((ELAPSED + INTERVAL))
|
ELAPSED=$((ELAPSED + WAIT_INTERVAL))
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ ! -f "$FINISH_FILE" ]; then
|
if [ ! -f "$FINISH_FILE" ]; then
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,6 @@ services:
|
||||||
XRAY_VMESS_AEAD_FORCED: "false"
|
XRAY_VMESS_AEAD_FORCED: "false"
|
||||||
XUI_ENABLE_FAIL2BAN: "true"
|
XUI_ENABLE_FAIL2BAN: "true"
|
||||||
GEODATA_DIR: "/app/bin"
|
GEODATA_DIR: "/app/bin"
|
||||||
MAX_GEODATA_DIR_WAIT: 300 # 5 minutes
|
|
||||||
tty: true
|
tty: true
|
||||||
network_mode: host
|
network_mode: host
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue