gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-31 14:08:06 +08:00
Code

fix: 解决网站某些设置会报服务器内部错误的问题 (#2973)

Browse Source 
Refs https://github.com/1Panel-dev/1Panel/issues/2955
This commit is contained in:
zhengkunwang 2023-11-16 14:42:07 +08:00 committed by GitHub
parent 49d8582658
commit 88c3559245
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/app/service/nginx_utils.go
View File

@ -196,8 +196,11 @@ func opNginx(containerName, operate string) error {
if operate == constant.NginxCheck { if operate == constant.NginxCheck {
nginxCmd = fmt.Sprintf("docker exec -i %s %s", containerName, "nginx -t") nginxCmd = fmt.Sprintf("docker exec -i %s %s", containerName, "nginx -t")
} }
if out, err := cmd.ExecWithTimeOut(nginxCmd, 2*time.Second); err != nil { if out, err := cmd.ExecWithTimeOut(nginxCmd, 20*time.Second); err != nil {
return errors.New(out) if out != "" {
return errors.New(out)
}
return err
} }
return nil return nil
} }