mirror of
https://github.com/Rain-kl/OpenFlare.git
synced 2026-10-06 07:36:37 +08:00
refactor(bootstrap): 引入解耦的全局生命周期管理器以隔离业务停机钩子
- 新建 internal/lifecycle 包,提供全局线程安全的 Shutdown 钩子注册与调度能力。 - 在 chwriter 与 risk_control 初始化阶段通过 OnShutdown 将其 Stop 函数注册到管理器中。 - bootstrap.Stop() 函数仅委托调用 lifecycle.Stop(),不再硬编码引入业务包,防止后续框架同步产生合并冲突。
This commit is contained in:
@@ -13,6 +13,7 @@ import (
|
||||
|
||||
"github.com/Rain-kl/Wavelet/internal/config"
|
||||
"github.com/Rain-kl/Wavelet/internal/db/batchwriter"
|
||||
"github.com/Rain-kl/Wavelet/internal/lifecycle"
|
||||
analyticsmodel "github.com/Rain-kl/Wavelet/internal/model/analytics"
|
||||
analyticsrepo "github.com/Rain-kl/Wavelet/internal/repository/analytics"
|
||||
"github.com/Rain-kl/Wavelet/pkg/logger"
|
||||
@@ -65,6 +66,8 @@ func Init(ctx context.Context) {
|
||||
frpsWriter.Start(ctx)
|
||||
frpcWriter.Start(ctx)
|
||||
nodeAccessLogWriter.Start(ctx)
|
||||
|
||||
lifecycle.OnShutdown("openflare_chwriter", Stop)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ import (
|
||||
|
||||
"github.com/Rain-kl/Wavelet/internal/config"
|
||||
"github.com/Rain-kl/Wavelet/internal/db/batchwriter"
|
||||
"github.com/Rain-kl/Wavelet/internal/lifecycle"
|
||||
"github.com/Rain-kl/Wavelet/internal/model/analytics"
|
||||
analyticsrepo "github.com/Rain-kl/Wavelet/internal/repository/analytics"
|
||||
"github.com/Rain-kl/Wavelet/pkg/logger"
|
||||
@@ -60,6 +61,7 @@ func InitLogWriter(ctx context.Context) {
|
||||
|
||||
writer.Start(ctx)
|
||||
logWriter = writer
|
||||
lifecycle.OnShutdown("risk_control_log_writer", StopLogWriter)
|
||||
}
|
||||
|
||||
// StopLogWriter stops the ClickHouse access-log batch writer and drains pending logs.
|
||||
|
||||
@@ -13,6 +13,7 @@ import (
|
||||
"github.com/Rain-kl/Wavelet/internal/apps/admin/push/custom_events"
|
||||
"github.com/Rain-kl/Wavelet/internal/apps/openflare/chwriter"
|
||||
"github.com/Rain-kl/Wavelet/internal/apps/risk_control"
|
||||
"github.com/Rain-kl/Wavelet/internal/lifecycle"
|
||||
taskhandlers "github.com/Rain-kl/Wavelet/internal/task/handlers"
|
||||
"github.com/Rain-kl/Wavelet/pkg/logger"
|
||||
)
|
||||
@@ -91,12 +92,7 @@ func Init(ctx context.Context, opts Options) {
|
||||
|
||||
// Stop stops all batch writers and background resources.
|
||||
func Stop(ctx context.Context) {
|
||||
if err := risk_control.StopLogWriter(ctx); err != nil {
|
||||
logger.ErrorF(ctx, "[Bootstrap] stop risk_control log writer failed: %v", err)
|
||||
}
|
||||
if err := chwriter.Stop(ctx); err != nil {
|
||||
logger.ErrorF(ctx, "[Bootstrap] stop chwriter failed: %v", err)
|
||||
}
|
||||
lifecycle.Stop(ctx)
|
||||
}
|
||||
|
||||
// ResetInitRuntimeOnceForTest clears initRuntimeOnce so Init can run again in unit tests.
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
// Copyright 2026 Arctel.net
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
// Package lifecycle manages global application and business component shutdown hooks.
|
||||
package lifecycle
|
||||
|
||||
import (
|
||||
"context"
|
||||
"log"
|
||||
"sync"
|
||||
)
|
||||
|
||||
// ShutdownFunc defines the signature for a graceful shutdown callback.
|
||||
type ShutdownFunc func(ctx context.Context) error
|
||||
|
||||
type hook struct {
|
||||
name string
|
||||
fn ShutdownFunc
|
||||
}
|
||||
|
||||
var (
|
||||
hooks []hook
|
||||
mu sync.Mutex
|
||||
)
|
||||
|
||||
// OnShutdown registers a callback to be run during graceful shutdown.
|
||||
func OnShutdown(name string, fn ShutdownFunc) {
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
hooks = append(hooks, hook{name: name, fn: fn})
|
||||
}
|
||||
|
||||
// Stop executes all registered shutdown hooks concurrently and waits for completion or context timeout.
|
||||
func Stop(ctx context.Context) {
|
||||
mu.Lock()
|
||||
localHooks := make([]hook, len(hooks))
|
||||
copy(localHooks, hooks)
|
||||
mu.Unlock()
|
||||
|
||||
var wg sync.WaitGroup
|
||||
for _, h := range localHooks {
|
||||
wg.Add(1)
|
||||
go func(name string, fn ShutdownFunc) {
|
||||
defer wg.Done()
|
||||
log.Printf("[Lifecycle] stopping %s...\n", name)
|
||||
if err := fn(ctx); err != nil {
|
||||
log.Printf("[Lifecycle] stop %s failed: %v\n", name, err)
|
||||
} else {
|
||||
log.Printf("[Lifecycle] %s stopped successfully\n", name)
|
||||
}
|
||||
}(h.name, h.fn)
|
||||
}
|
||||
|
||||
done := make(chan struct{})
|
||||
go func() {
|
||||
wg.Wait()
|
||||
close(done)
|
||||
}()
|
||||
|
||||
select {
|
||||
case <-done:
|
||||
log.Println("[Lifecycle] all services stopped gracefully")
|
||||
case <-ctx.Done():
|
||||
log.Printf("[Lifecycle] shutdown timed out: %v\n", ctx.Err())
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user