Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit6de168c

Browse files
committed
refactor(upstream): remove init function and implement caching for disabled sockets in service
1 parent5b47ccf commit6de168c

File tree

4 files changed

+80
-55
lines changed

4 files changed

+80
-55
lines changed

‎api/upstream/init.go‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎api/upstream/socket.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@ func UpdateSocketConfig(c *gin.Context) {
123123
cosy.ErrHandler(c,err)
124124
return
125125
}
126+
// Invalidate cache after creating new config
127+
service:=upstream.GetUpstreamService()
128+
service.InvalidateDisabledSocketsCache()
126129
}else {
127130
// Update existing config
128131
if_,err:=u.Where(u.Socket.Eq(socket)).Update(u.Enabled,req.Enabled);err!=nil {
@@ -132,6 +135,10 @@ func UpdateSocketConfig(c *gin.Context) {
132135
}
133136
}
134137

138+
// Invalidate the disabled sockets cache to ensure changes take effect immediately
139+
service:=upstream.GetUpstreamService()
140+
service.InvalidateDisabledSocketsCache()
141+
135142
c.JSON(http.StatusOK, gin.H{
136143
"message":"Socket config updated successfully",
137144
})

‎app/components.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ declare module 'vue' {
1111
AAlert:typeofimport('ant-design-vue/es')['Alert']
1212
AApp:typeofimport('ant-design-vue/es')['App']
1313
AAutoComplete:typeofimport('ant-design-vue/es')['AutoComplete']
14+
AAvatar:typeofimport('ant-design-vue/es')['Avatar']
1415
ABadge:typeofimport('ant-design-vue/es')['Badge']
1516
ABreadcrumb:typeofimport('ant-design-vue/es')['Breadcrumb']
1617
ABreadcrumbItem:typeofimport('ant-design-vue/es')['BreadcrumbItem']

‎internal/upstream/service.go‎

Lines changed: 72 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"time"
99

1010
"github.com/0xJacky/Nginx-UI/internal/cache"
11+
"github.com/0xJacky/Nginx-UI/model"
1112
"github.com/uozi-tech/cosy/logger"
1213
)
1314

@@ -32,13 +33,16 @@ type Service struct {
3233
availabilityMapmap[string]*Status// key: host:port
3334
configTargetsmap[string][]string// configPath -> []targetKeys
3435
// Public upstream definitions storage
35-
Upstreamsmap[string]*Definition// key: upstream name
36-
upstreamsMutex sync.RWMutex
37-
targetsMutex sync.RWMutex
38-
lastUpdateTime time.Time
39-
testInProgressbool
40-
testMutex sync.Mutex
41-
disabledSocketsCheckerfunc()map[string]bool
36+
Upstreamsmap[string]*Definition// key: upstream name
37+
upstreamsMutex sync.RWMutex
38+
targetsMutex sync.RWMutex
39+
lastUpdateTime time.Time
40+
testInProgressbool
41+
testMutex sync.Mutex
42+
cachedDisabledSocketsmap[string]bool
43+
disabledSocketsCacheMutex sync.RWMutex
44+
disabledSocketsCacheExpiry time.Time
45+
disabledSocketsCacheDuration time.Duration
4246
}
4347

4448
var (
@@ -66,11 +70,12 @@ func formatSocketAddress(host, port string) string {
6670
funcGetUpstreamService()*Service {
6771
serviceOnce.Do(func() {
6872
upstreamService=&Service{
69-
targets:make(map[string]*TargetInfo),
70-
availabilityMap:make(map[string]*Status),
71-
configTargets:make(map[string][]string),
72-
Upstreams:make(map[string]*Definition),
73-
lastUpdateTime:time.Now(),
73+
targets:make(map[string]*TargetInfo),
74+
availabilityMap:make(map[string]*Status),
75+
configTargets:make(map[string][]string),
76+
Upstreams:make(map[string]*Definition),
77+
lastUpdateTime:time.Now(),
78+
disabledSocketsCacheDuration:30*time.Second,
7479
}
7580
})
7681
returnupstreamService
@@ -237,11 +242,8 @@ func (s *Service) PerformAvailabilityTest() {
237242

238243
// logger.Debug("Performing availability test for", targetCount, "unique targets")
239244

240-
// Get disabled sockets from database
241-
disabledSockets:=make(map[string]bool)
242-
ifs.disabledSocketsChecker!=nil {
243-
disabledSockets=s.disabledSocketsChecker()
244-
}
245+
// Get disabled sockets from cache or database
246+
disabledSockets:=s.getDisabledSockets()
245247

246248
// Separate targets into traditional and consul groups from the start
247249
s.targetsMutex.RLock()
@@ -307,9 +309,59 @@ func (s *Service) findUpstreamNameForTarget(target ProxyTarget) string {
307309
return""
308310
}
309311

310-
// SetDisabledSocketsChecker sets a callback function to check disabled sockets
311-
func (s*Service)SetDisabledSocketsChecker(checkerfunc()map[string]bool) {
312-
s.disabledSocketsChecker=checker
312+
// getDisabledSockets queries the database for disabled sockets with caching
313+
func (s*Service)getDisabledSockets()map[string]bool {
314+
// Check if cache is still valid
315+
s.disabledSocketsCacheMutex.RLock()
316+
iftime.Now().Before(s.disabledSocketsCacheExpiry)&&s.cachedDisabledSockets!=nil {
317+
// Return a copy of the cached data
318+
result:=make(map[string]bool,len(s.cachedDisabledSockets))
319+
fork,v:=ranges.cachedDisabledSockets {
320+
result[k]=v
321+
}
322+
s.disabledSocketsCacheMutex.RUnlock()
323+
returnresult
324+
}
325+
s.disabledSocketsCacheMutex.RUnlock()
326+
327+
// Cache expired or not initialized, refresh from database
328+
disabled:=make(map[string]bool)
329+
330+
db:=model.UseDB()
331+
ifdb==nil {
332+
returndisabled
333+
}
334+
335+
varconfigs []model.UpstreamConfig
336+
iferr:=db.Where("enabled = ?",false).Find(&configs).Error;err!=nil {
337+
logger.Error("Failed to query disabled sockets:",err)
338+
returndisabled
339+
}
340+
341+
for_,config:=rangeconfigs {
342+
disabled[config.Socket]=true
343+
}
344+
345+
// Update cache
346+
s.disabledSocketsCacheMutex.Lock()
347+
s.cachedDisabledSockets=disabled
348+
s.disabledSocketsCacheExpiry=time.Now().Add(s.disabledSocketsCacheDuration)
349+
s.disabledSocketsCacheMutex.Unlock()
350+
351+
// Return a copy to prevent external modification
352+
result:=make(map[string]bool,len(disabled))
353+
fork,v:=rangedisabled {
354+
result[k]=v
355+
}
356+
returnresult
357+
}
358+
359+
// InvalidateDisabledSocketsCache invalidates the cache, forcing next read to refresh from database
360+
func (s*Service)InvalidateDisabledSocketsCache() {
361+
s.disabledSocketsCacheMutex.Lock()
362+
defers.disabledSocketsCacheMutex.Unlock()
363+
s.disabledSocketsCacheExpiry= time.Time{}// Set to zero time to force refresh
364+
logger.Debug("Disabled sockets cache invalidated")
313365
}
314366

315367
// ClearTargets clears all targets (useful for testing or reloading)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp