mirror of
https://github.com/rvalitov/zabbix-php-fpm.git
synced 2023-11-05 03:30:27 +01:00
[fix] port checks and port range
This commit is contained in:
parent
d53e9293b7
commit
cbaff4a688
12
tests/all.sh
12
tests/all.sh
@ -5,7 +5,8 @@
|
|||||||
|
|
||||||
MAX_POOLS=3
|
MAX_POOLS=3
|
||||||
MAX_PORTS=3
|
MAX_PORTS=3
|
||||||
MIN_PORT=9000
|
MIN_PORT=49001
|
||||||
|
MAX_PORTS_COUNT=100
|
||||||
TEST_SOCKET=""
|
TEST_SOCKET=""
|
||||||
ONDEMAND_TIMEOUT=60
|
ONDEMAND_TIMEOUT=60
|
||||||
ZABBIX_TIMEOUT=10
|
ZABBIX_TIMEOUT=10
|
||||||
@ -84,19 +85,24 @@ setupPool() {
|
|||||||
copyPool "$POOL_FILE" "$POOL_NAME" "$POOL_SOCKET" "ondemand"
|
copyPool "$POOL_FILE" "$POOL_NAME" "$POOL_SOCKET" "ondemand"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
PHP_SERIAL_ID=$(find /etc/php/ -maxdepth 1 -mindepth 1 -type d | sort | grep -n -F "7.3" | cut -d : -f 1)
|
||||||
#Create TCP port based pools
|
#Create TCP port based pools
|
||||||
#Division on 1 is required to convert from float to integer
|
#Division on 1 is required to convert from float to integer
|
||||||
START_PORT=$(echo "($MIN_PORT + $PHP_VERSION * 100 + 1)/1" | bc)
|
START_PORT=$(echo "($MIN_PORT + $PHP_SERIAL_ID * $MAX_PORTS_COUNT + 1)/1" | bc)
|
||||||
for ((c = 1; c <= MAX_PORTS; c++)); do
|
for ((c = 1; c <= MAX_PORTS; c++)); do
|
||||||
POOL_NAME="port$c"
|
POOL_NAME="port$c"
|
||||||
POOL_PORT=$(echo "($START_PORT + $c)/1" | bc)
|
POOL_PORT=$(echo "($START_PORT + $c)/1" | bc)
|
||||||
|
PORT_IS_BUSY=$(sudo lsof -i:$POOL_PORT)
|
||||||
|
assertNull "Port $POOL_PORT is busy" "$PORT_IS_BUSY"
|
||||||
copyPool "$POOL_FILE" "$POOL_NAME" "$POOL_PORT" "static"
|
copyPool "$POOL_FILE" "$POOL_NAME" "$POOL_PORT" "static"
|
||||||
done
|
done
|
||||||
|
|
||||||
#Create TCP IPv4 localhost pool
|
#Create TCP IPv4 localhost pool
|
||||||
POOL_NAME="localhost"
|
POOL_NAME="localhost"
|
||||||
POOL_PORT=$(echo "($MIN_PORT + $PHP_VERSION * 100)/1" | bc)
|
POOL_PORT=$(echo "($MIN_PORT + $PHP_SERIAL_ID * $MAX_PORTS_COUNT)/1" | bc)
|
||||||
POOL_SOCKET="127.0.0.1:$POOL_PORT"
|
POOL_SOCKET="127.0.0.1:$POOL_PORT"
|
||||||
|
PORT_IS_BUSY=$(sudo lsof -i:$POOL_PORT)
|
||||||
|
assertNull "Port $POOL_PORT is busy" "$PORT_IS_BUSY"
|
||||||
copyPool "$POOL_FILE" "$POOL_NAME" "$POOL_SOCKET" "static"
|
copyPool "$POOL_FILE" "$POOL_NAME" "$POOL_SOCKET" "static"
|
||||||
|
|
||||||
echo "List of configured PHP$PHP_VERSION pools:"
|
echo "List of configured PHP$PHP_VERSION pools:"
|
||||||
|
Loading…
Reference in New Issue
Block a user