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

缓存策略增加预热超时时间设置（默认20分钟）

Browse Source
This commit is contained in:
GoEdgeLab
2023-08-06 17:06:28 +08:00
parent 649de2ad60
commit 43f2f25646
6 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/web/actions/default/servers/components/cache/createPopup.go vendored
View File

@@ -21,6 +21,7 @@ func (this *CreatePopupAction) Init() {
func (this *CreatePopupAction) RunGet(params struct{}) {
this.Data["types"] = serverconfigs.AllCachePolicyStorageTypes
this.Show()
}
@@ -36,6 +37,7 @@ func (this *CreatePopupAction) RunPost(params struct {
CapacityJSON []byte
MaxSizeJSON []byte
FetchTimeoutJSON []byte
SyncCompressionCache bool
Description string
@@ -97,6 +99,7 @@ func (this *CreatePopupAction) RunPost(params struct {
Description: params.Description,
CapacityJSON: params.CapacityJSON,
MaxSizeJSON: params.MaxSizeJSON,
FetchTimeoutJSON: params.FetchTimeoutJSON,
Type: params.Type,
OptionsJSON: optionsJSON,
SyncCompressionCache: params.SyncCompressionCache,

8
internal/web/actions/default/servers/components/cache/policy.go vendored
View File

@@ -26,6 +26,12 @@ func (this *PolicyAction) RunGet(params struct {
}
this.Data["cachePolicy"] = cachePolicy
// 预热超时时间
this.Data["fetchTimeoutString"] = ""
if cachePolicy.FetchTimeout != nil && cachePolicy.FetchTimeout.Count > 0 {
this.Data["fetchTimeoutString"] = cachePolicy.FetchTimeout.Description()
}
this.Data["typeName"] = serverconfigs.FindCachePolicyStorageName(cachePolicy.Type)
// 正在使用此策略的集群
@@ -34,7 +40,7 @@ func (this *PolicyAction) RunGet(params struct {
this.ErrorPage(err)
return
}
clusterMaps := []maps.Map{}
var clusterMaps = []maps.Map{}
for _, cluster := range clustersResp.NodeClusters {
clusterMaps = append(clusterMaps, maps.Map{
"id": cluster.Id,

4
internal/web/actions/default/servers/components/cache/update.go vendored
View File

@@ -61,6 +61,7 @@ func (this *UpdateAction) RunPost(params struct {
CapacityJSON []byte
MaxSizeJSON []byte
SyncCompressionCache bool
FetchTimeoutJSON []byte
Description string
IsOn bool
@@ -122,7 +123,7 @@ func (this *UpdateAction) RunPost(params struct {
}
// 校验缓存条件
refs := []*serverconfigs.HTTPCacheRef{}
var refs = []*serverconfigs.HTTPCacheRef{}
if len(params.RefsJSON) > 0 {
err = json.Unmarshal(params.RefsJSON, &refs)
if err != nil {
@@ -146,6 +147,7 @@ func (this *UpdateAction) RunPost(params struct {
Type: params.Type,
OptionsJSON: optionsJSON,
SyncCompressionCache: params.SyncCompressionCache,
FetchTimeoutJSON: params.FetchTimeoutJSON,
})
if err != nil {
this.ErrorPage(err)

7
web/views/@default/servers/components/cache/createPopup.html vendored
View File

@@ -85,6 +85,13 @@
<checkbox name="syncCompressionCache"></checkbox>
<p class="comment">选中后，在压缩设置开启的情况下，在缓存源站内容的同时，也会同步写入压缩缓存；不选中，表示在源站内容缓存后，下一次调用才会缓存压缩内容，防止同一时间内硬盘IO负载过高。</p>
</td>
</tr>
<tr>
<td>预热超时时间</td>
<td>
<time-duration-box :v-name="'fetchTimeoutJSON'" :v-unit="'minute'"></time-duration-box>
<p class="comment">预热读取源站的超时时间，默认20分钟。</p>
</td>
</tr>
<tr>
<td>描述</td>

4
web/views/@default/servers/components/cache/policy.html vendored
View File

@@ -83,6 +83,10 @@
<span v-else class="disabled">N</span>
</td>
</tr>
<tr>
<td>预热超时时间</td>
<td><span v-if="fetchTimeoutString.length > 0">{{fetchTimeoutString}}</span><span v-else class="disabled">使用默认</span></td>
</tr>
<tr>
<td>描述</td>
<td>

7
web/views/@default/servers/components/cache/update.html vendored
View File

@@ -92,6 +92,13 @@
<checkbox name="syncCompressionCache" v-model="cachePolicy.syncCompressionCache"></checkbox>
<p class="comment">选中后，在压缩设置开启的情况下，在缓存源站内容的同时，也会同步写入压缩缓存；不选中，表示在源站内容缓存后，下一次调用才会缓存压缩内容，防止同一时间内硬盘IO负载过高。</p>
</td>
</tr>
<tr>
<td>预热超时时间</td>
<td>
<time-duration-box :v-name="'fetchTimeoutJSON'" :v-value="cachePolicy.fetchTimeout"></time-duration-box>
<p class="comment">预热读取源站的超时时间，默认20分钟。</p>
</td>
</tr>
<tr>
<td>描述</td>