Tools: setup-unit: ctl edit: Print file name on error
When editing the configuration in-place, it's easy to make a mistake. If the configuration is wrong, it will be passed to the control socket, which will reject it, keeping the old configuration. Those manual edits would be lost, which can make it very uncomfortable to edit in-place. By printing the name of the temporary file, we allow the user to recover the changes. Cc: Liam Crilly <liam@nginx.com> Reviewed-by: Andrew Clayton <a.clayton@nginx.com> Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
parent
e9a0c49dbc
commit
565a8ed018
1 changed files with 9 additions and 0 deletions
|
@ -138,6 +138,11 @@ OPTIONS
|
|||
__EOF__
|
||||
}
|
||||
|
||||
info()
|
||||
{
|
||||
>&2 echo "$(basename "$0"): info: $*";
|
||||
}
|
||||
|
||||
warn()
|
||||
{
|
||||
>&2 echo "$(basename "$0"): error: $*";
|
||||
|
@ -430,7 +435,11 @@ unit_ctl_edit()
|
|||
|| echo ed;
|
||||
) "$tmp";
|
||||
|
||||
trap "info 'ctl: edit: Invalid configuration saved in <$tmp>.'" ERR
|
||||
|
||||
unit_ctl_http ---s "$sock" PUT "$req_path" <"$tmp";
|
||||
|
||||
trap - ERR;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue