Skip to content

Commit 0c7a509

Browse files
committed
refactor: small improvements
1 parent d958d92 commit 0c7a509

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

cmd/main.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,11 @@ func runProxy(cfg config.Config) {
165165
},
166166
}
167167
seeder := seed.New(seederCfg, log, rpcListener, restListener, grpcListener)
168-
rpcProxyHandler := proxy.NewRPCProxy(rpcListener, cfg.Health, log, proxy.NewStickyLatencyBased(log, 6*time.Second))
169-
restProxyHandler := proxy.NewRestProxy(restListener, cfg.Health, log, proxy.NewStickyLatencyBased(log, 6*time.Second))
170-
grpcProxyHandler := proxy.NewGRPCProxy(grpcListener, log, proxy.NewStickyLatencyBased(log, 6*time.Second))
168+
169+
blockTime := 6 * time.Second
170+
rpcProxyHandler := proxy.NewRPCProxy(rpcListener, cfg.Health, log, proxy.NewStickyLatencyBased(log, blockTime))
171+
restProxyHandler := proxy.NewRestProxy(restListener, cfg.Health, log, proxy.NewStickyLatencyBased(log, blockTime))
172+
grpcProxyHandler := proxy.NewGRPCProxy(grpcListener, log, proxy.NewStickyLatencyBased(log, blockTime))
171173

172174
ctx, proxyCtxCancel := context.WithCancel(context.Background())
173175
defer proxyCtxCancel()

internal/proxy/balancer.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ func NewStickyLatencyBased(log *slog.Logger, sessionTimeout time.Duration) *Stic
198198
sessionTimeout: sessionTimeout,
199199
}
200200

201-
// Start cleanup routine for expired sessions
202201
slb.sessionCleanupTicker = time.NewTicker(5 * time.Minute)
203202
go slb.cleanupExpiredSessions()
204203

@@ -226,12 +225,10 @@ func (slb *StickyLatencyBased) Next(req *http.Request) *Server {
226225
if sessionID != "" {
227226
slb.sessionMu.RLock()
228227
if server, exists := slb.sessionMap[sessionID]; exists {
229-
// Check if session has timed out (cache miss scenario)
230228
lastAccessed := slb.sessionTimestamps[sessionID]
231229
if time.Since(lastAccessed) > slb.sessionTimeout {
232230
slb.sessionMu.RUnlock()
233231

234-
// Session timed out, clean it up
235232
slb.sessionMu.Lock()
236233
delete(slb.sessionMap, sessionID)
237234
delete(slb.sessionTimestamps, sessionID)
@@ -242,10 +239,8 @@ func (slb *StickyLatencyBased) Next(req *http.Request) *Server {
242239
"server", server.name,
243240
"last_accessed", lastAccessed)
244241
} else {
245-
// Session is valid (cache hit scenario)
246242
slb.sessionMu.RUnlock()
247243

248-
// Update session timestamp
249244
slb.sessionMu.Lock()
250245
slb.sessionTimestamps[sessionID] = time.Now()
251246
slb.sessionMu.Unlock()
@@ -256,11 +251,9 @@ func (slb *StickyLatencyBased) Next(req *http.Request) *Server {
256251
}
257252
}
258253

259-
// No existing session or unhealthy server, use embedded LatencyBased selection
260254
server := slb.LatencyBased.Next(req)
261255

262256
if server != nil && sessionID != "" {
263-
// Create new session mapping
264257
slb.sessionMu.Lock()
265258
slb.sessionMap[sessionID] = server
266259
slb.sessionTimestamps[sessionID] = time.Now()

0 commit comments

Comments
 (0)