TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-04 13:10:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

“集群设置 -- 网站设置”增加“允许记录访问日志”选项

Browse Source
This commit is contained in:
刘祥超
2023-07-05 15:29:17 +08:00
parent 05d51a5447
commit 5d43125284
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/web/actions/default/clusters/cluster/settings/global-server-config/index.go
View File

@@ -31,7 +31,7 @@ func (this *IndexAction) RunGet(params struct {
} }
var configJSON = configResp.GlobalServerConfigJSON var configJSON = configResp.GlobalServerConfigJSON
var config = serverconfigs.DefaultGlobalServerConfig() var config = serverconfigs.NewGlobalServerConfig()
if len(configJSON) > 0 { if len(configJSON) > 0 {
err = json.Unmarshal(configJSON, config) err = json.Unmarshal(configJSON, config)
if err != nil { if err != nil {
@@ -86,6 +86,7 @@ func (this *IndexAction) RunPost(params struct {
HttpAllSupportsLowVersionHTTP bool HttpAllSupportsLowVersionHTTP bool
HttpAllMatchCertFromAllServers bool HttpAllMatchCertFromAllServers bool
HttpAccessLogIsOn bool
HttpAccessLogEnableRequestHeaders bool HttpAccessLogEnableRequestHeaders bool
HttpAccessLogEnableResponseHeaders bool HttpAccessLogEnableResponseHeaders bool
HttpAccessLogCommonRequestHeadersOnly bool HttpAccessLogCommonRequestHeadersOnly bool
@@ -110,7 +111,7 @@ func (this *IndexAction) RunPost(params struct {
} }
var configJSON = configResp.GlobalServerConfigJSON var configJSON = configResp.GlobalServerConfigJSON
var config = serverconfigs.DefaultGlobalServerConfig() var config = serverconfigs.NewGlobalServerConfig()
if len(configJSON) > 0 { if len(configJSON) > 0 {
err = json.Unmarshal(configJSON, config) err = json.Unmarshal(configJSON, config)
if err != nil { if err != nil {
@@ -150,6 +151,7 @@ func (this *IndexAction) RunPost(params struct {
config.HTTPAll.ForceLnRequest = params.HttpAllForceLnRequest config.HTTPAll.ForceLnRequest = params.HttpAllForceLnRequest
// 访问日志 // 访问日志
config.HTTPAccessLog.IsOn = params.HttpAccessLogIsOn
config.HTTPAccessLog.EnableRequestHeaders = params.HttpAccessLogEnableRequestHeaders config.HTTPAccessLog.EnableRequestHeaders = params.HttpAccessLogEnableRequestHeaders
config.HTTPAccessLog.EnableResponseHeaders = params.HttpAccessLogEnableResponseHeaders config.HTTPAccessLog.EnableResponseHeaders = params.HttpAccessLogEnableResponseHeaders
config.HTTPAccessLog.CommonRequestHeadersOnly = params.HttpAccessLogCommonRequestHeadersOnly config.HTTPAccessLog.CommonRequestHeadersOnly = params.HttpAccessLogCommonRequestHeadersOnly

2
internal/web/actions/default/clusters/create.go
View File

@@ -99,7 +99,7 @@ func (this *CreateAction) RunPost(params struct {
// TODO 检查DnsDomainId的有效性 // TODO 检查DnsDomainId的有效性
// 全局服务配置 // 全局服务配置
var globalServerConfig = serverconfigs.DefaultGlobalServerConfig() var globalServerConfig = serverconfigs.NewGlobalServerConfig()
globalServerConfig.HTTPAll.MatchDomainStrictly = params.MatchDomainStrictly globalServerConfig.HTTPAll.MatchDomainStrictly = params.MatchDomainStrictly
globalServerConfigJSON, err := json.Marshal(globalServerConfig) globalServerConfigJSON, err := json.Marshal(globalServerConfig)
if err != nil { if err != nil {

19
web/views/@default/clusters/cluster/settings/global-server-config/index.html
View File

@@ -65,24 +65,31 @@
<h4>访问日志</h4> <h4>访问日志</h4>
<table class="ui table definition selectable"> <table class="ui table definition selectable">
<tr> <tr>
<td>记录请求Header</td> <td>允许记录访问日志</td>
<td>
<checkbox name="httpAccessLogIsOn" v-model="config.httpAccessLog.isOn"></checkbox>
<p class="comment">选中后，表示允许当前集群下的网站记录访问日志，否则当前集群下的所有网站都不会记录访问日志。</p>
</td>
</tr>
<tr>
<td>记录请求报头</td>
<td> <td>
<checkbox name="httpAccessLogEnableRequestHeaders" v-model="config.httpAccessLog.enableRequestHeaders"></checkbox> <checkbox name="httpAccessLogEnableRequestHeaders" v-model="config.httpAccessLog.enableRequestHeaders"></checkbox>
<p class="comment">选中后，表示在访问日志中记录请求Header。</p> <p class="comment">选中后，表示在访问日志中记录请求报头。</p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="title">只记录通用请求<br/>Header</td> <td class="title">只记录通用请求报头</td>
<td> <td>
<checkbox name="httpAccessLogCommonRequestHeadersOnly" v-model="config.httpAccessLog.commonRequestHeadersOnly"></checkbox> <checkbox name="httpAccessLogCommonRequestHeadersOnly" v-model="config.httpAccessLog.commonRequestHeadersOnly"></checkbox>
<p class="comment">选中后，表示访问日志中只记录通用的HTTP请求Header（比如<code-label>User-Agent</code-label>），其他自定义或非标准的（比如<code-label>Test-Header</code-label>）将不记录。</p> <p class="comment">选中后，表示访问日志中只记录通用的HTTP请求报头（比如<code-label>User-Agent</code-label>），其他自定义或非标准的（比如<code-label>Test-Header</code-label>）将不记录。</p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>记录响应Header</td> <td>记录响应报头</td>
<td> <td>
<checkbox name="httpAccessLogEnableResponseHeaders" v-model="config.httpAccessLog.enableResponseHeaders"></checkbox> <checkbox name="httpAccessLogEnableResponseHeaders" v-model="config.httpAccessLog.enableResponseHeaders"></checkbox>
<p class="comment">选中后，表示在访问日志中记录响应Header。</p> <p class="comment">选中后，表示在访问日志中记录响应报头。</p>
</td> </td>
</tr> </tr>
<tr> <tr>