From caee2159a8241cf7baf3dd97e16758789e0f36ad Mon Sep 17 00:00:00 2001 From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com> Date: Mon, 3 Jun 2024 11:23:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E7=AB=99=20access=5Flog=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=B8=BB=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=8F=82=E6=95=B0=20(#5255)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/service/website.go | 4 +++- backend/app/service/website_utils.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/app/service/website.go b/backend/app/service/website.go index d54a35555..cc458273f 100644 --- a/backend/app/service/website.go +++ b/backend/app/service/website.go @@ -1044,14 +1044,16 @@ func (w WebsiteService) OpWebsiteLog(req request.WebsiteLogReq) (*response.Websi case constant.EnableLog: key := "access_log" logPath := path.Join("/www", "sites", website.Alias, "log", req.LogType) + params := []string{logPath} switch req.LogType { case constant.AccessLog: + params = append(params, "main") website.AccessLog = true case constant.ErrorLog: key = "error_log" website.ErrorLog = true } - if err := updateNginxConfig(constant.NginxScopeServer, []dto.NginxParam{{Name: key, Params: []string{logPath}}}, &website); err != nil { + if err := updateNginxConfig(constant.NginxScopeServer, []dto.NginxParam{{Name: key, Params: params}}, &website); err != nil { return nil, err } if err := websiteRepo.Save(context.Background(), &website); err != nil { diff --git a/backend/app/service/website_utils.go b/backend/app/service/website_utils.go index 5c9ebab0d..0bf55887e 100644 --- a/backend/app/service/website_utils.go +++ b/backend/app/service/website_utils.go @@ -235,7 +235,7 @@ func configDefaultNginx(website *model.Website, domains []model.WebsiteDomain, a server.UpdateServerName(serverNames) siteFolder := path.Join("/www", "sites", website.Alias) - server.UpdateDirective("access_log", []string{path.Join(siteFolder, "log", "access.log")}) + server.UpdateDirective("access_log", []string{path.Join(siteFolder, "log", "access.log"), "main"}) server.UpdateDirective("error_log", []string{path.Join(siteFolder, "log", "error.log")}) rootIndex := path.Join("/www/sites", website.Alias, "index")