technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Tools: disambiguate unitc control socket detection

Browse Source 
Now that unitd has multiple --control* startup options, locating the
address of the control socket requires additional precision.

Signed-off-by: Liam Crilly <liam.crilly@nginx.com>
Acked-by: Andrew Clayton <a.clayton@nginx.com>
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
This commit is contained in:
Liam Crilly
2023-11-08 09:33:38 +00:00
committed by Andrew Clayton
parent 2bd3b41876
commit 1dca86028a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/unitc
View File

@@ -188,7 +188,7 @@ if [ $REMOTE -eq 0 ]; then
fi fi
CTRL_ADDR=$(echo "$PARAMS" | grep '\--control ' | cut -f2 -d' ') CTRL_ADDR=$(echo "$PARAMS" | grep '\--control ' | cut -f2 -d' ')
if [ "$CTRL_ADDR" = "" ]; then if [ "$CTRL_ADDR" = "" ]; then
CTRL_ADDR=$($(echo "$PARAMS") --help | grep -A1 '\--control' | tail -1 | cut -f2 -d\") CTRL_ADDR=$($(echo "$PARAMS") --help | grep -A1 '\--control ADDRESS' | tail -1 | cut -f2 -d\")
fi fi
if [ "$CTRL_ADDR" = "" ]; then if [ "$CTRL_ADDR" = "" ]; then
echo "${0##*/}: ERROR: cannot detect control socket. Did you start unitd with a relative path? Try starting unitd with --control option." echo "${0##*/}: ERROR: cannot detect control socket. Did you start unitd with a relative path? Try starting unitd with --control option."