Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-06-08 14:14:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix: show actual systemctl error when MariaDB restart fails

Browse source 
restart_mariadb_service() and start_mariadb_service() suppressed stderr
with 2>/dev/null, hiding the real failure reason. Now captures and displays
the systemctl error output and service status on failure for diagnostics.
This commit is contained in:
root 2026-04-23 15:05:05 +08:00
parent df20cc7e0b
commit 27c2430d4f
2 changed files with 33 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
install.sh
View file

@ -188,6 +188,7 @@ install_local_mariadb_server() {
start_mariadb_service() { start_mariadb_service() {
local svc_name="" local svc_name=""
local output=""
if command -v systemctl >/dev/null 2>&1; then if command -v systemctl >/dev/null 2>&1; then
if systemctl list-unit-files 2>/dev/null | grep -q "^mariadb.service"; then if systemctl list-unit-files 2>/dev/null | grep -q "^mariadb.service"; then
svc_name="mariadb" svc_name="mariadb"
@ -197,8 +198,8 @@ start_mariadb_service() {
fi fi
if [ -n "$svc_name" ]; then if [ -n "$svc_name" ]; then
systemctl start "$svc_name" 2>/dev/null systemctl start "$svc_name" 2>/dev/null || true
systemctl enable "$svc_name" 2>/dev/null systemctl enable "$svc_name" 2>/dev/null || true
return 0 return 0
fi fi
@ -383,6 +384,7 @@ disable_mariadb_skip_networking() {
restart_mariadb_service() { restart_mariadb_service() {
local svc_name="" local svc_name=""
local output=""
if command -v systemctl >/dev/null 2>&1; then if command -v systemctl >/dev/null 2>&1; then
if systemctl list-unit-files 2>/dev/null | grep -q "^mariadb.service"; then if systemctl list-unit-files 2>/dev/null | grep -q "^mariadb.service"; then
svc_name="mariadb" svc_name="mariadb"
@ -392,11 +394,21 @@ restart_mariadb_service() {
fi fi
if [ -n "$svc_name" ]; then if [ -n "$svc_name" ]; then
systemctl restart "$svc_name" 2>/dev/null output=$(systemctl restart "$svc_name" 2>&1) || {
return $? echo -e "${red}systemctl restart $svc_name 失败:${plain}" >&2
echo "$output" >&2
echo -e "${yellow}systemctl status $svc_name:${plain}" >&2
systemctl status "$svc_name" --no-pager -l 2>&1 | head -20 >&2
return 1
}
return 0
fi fi
if [[ $release == "alpine" ]]; then if [[ $release == "alpine" ]]; then
rc-service mariadb restart 2>/dev/null output=$(rc-service mariadb restart 2>&1) || {
echo -e "${red}rc-service mariadb restart 失败:${plain}" >&2
echo "$output" >&2
return 1
}
return $? return $?
fi fi

21
x-ui.sh
View file

@ -2833,6 +2833,7 @@ read_mariadb_server_option() {
restart_mariadb_service() { restart_mariadb_service() {
local svc_name="" local svc_name=""
local output=""
if command -v systemctl >/dev/null 2>&1; then if command -v systemctl >/dev/null 2>&1; then
if systemctl list-unit-files 2>/dev/null | grep -q "^mariadb.service"; then if systemctl list-unit-files 2>/dev/null | grep -q "^mariadb.service"; then
svc_name="mariadb" svc_name="mariadb"
@ -2842,11 +2843,21 @@ restart_mariadb_service() {
fi fi
if [ -n "$svc_name" ]; then if [ -n "$svc_name" ]; then
systemctl restart "$svc_name" 2>/dev/null output=$(systemctl restart "$svc_name" 2>&1) || {
return $? echo -e "${red}systemctl restart $svc_name 失败:${plain}" >&2
echo "$output" >&2
echo -e "${yellow}systemctl status $svc_name:${plain}" >&2
systemctl status "$svc_name" --no-pager -l 2>&1 | head -20 >&2
return 1
}
return 0
fi fi
if [[ $release == "alpine" ]]; then if [[ $release == "alpine" ]]; then
rc-service mariadb restart 2>/dev/null output=$(rc-service mariadb restart 2>&1) || {
echo -e "${red}rc-service mariadb restart 失败:${plain}" >&2
echo "$output" >&2
return 1
}
return $? return $?
fi fi
@ -2985,8 +2996,8 @@ start_mariadb_service() {
fi fi
fi fi
if [ -n "$svc_name" ]; then if [ -n "$svc_name" ]; then
systemctl start "$svc_name" 2>/dev/null systemctl start "$svc_name" 2>/dev/null || true
systemctl enable "$svc_name" 2>/dev/null systemctl enable "$svc_name" 2>/dev/null || true
return 0 return 0
fi fi
if [[ $release == "alpine" ]]; then if [[ $release == "alpine" ]]; then