zlei6/ragflow
1
0
Fork 0
mirror of https://github.com/infiniflow/ragflow.git synced 2026-07-24 17:36:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Go: add context to DAO (#17269)

Browse Source 
### Summary

DAO layer doesn't use context, this PR is to fix it.

---------

Signed-off-by: Jin Hai <haijin.chn@gmail.com>
This commit is contained in:
Jin Hai
2026-07-23 12:15:58 +08:00
committed by GitHub
parent 7b29fc10ca
commit 5478f955ab
45 changed files with 723 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/ragflow_server.go
View File

@@ -212,6 +212,9 @@ func printHelp(args *serverArgs) {
}
func main() {
ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGUSR2)
defer cancel()
arguments, err := parseArgs()
if err != nil {
fmt.Printf("Failed to parse arguments: %v\n", err)
@@ -340,7 +343,7 @@ func main() {
server.PrintAll()
// Initialize database
if err = dao.InitDB(arguments.migrateDB); err != nil {
if err = dao.InitDB(ctx, arguments.migrateDB); err != nil {
common.Fatal("Failed to initialize database", zap.Error(err))
}
@@ -371,7 +374,6 @@ func main() {
common.Warn("Failed to initialize server variables from Redis, using defaults", zap.String("error", err.Error()))
}
ctx, cancel := context.WithCancel(context.Background())
if err = server.StartServer(ctx, cancel, serverName); err != nil {
common.Error("Failed to start EE server", err)
os.Exit(1)
@@ -384,7 +386,7 @@ func main() {
switch *arguments.mode {
case "api":
if err = runAPI(arguments); err != nil {
if err = runAPI(ctx, arguments); err != nil {
fmt.Printf("Failed to start API server: %v\n", err)
os.Exit(1)
}
@@ -478,11 +480,11 @@ func runAdmin(args *serverArgs) error {
common.Info("Shutting down RAGFlow HTTP server...")
// Create context with timeout for graceful shutdown
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
quitCtx, quitCancel := context.WithTimeout(context.Background(), 30*time.Second)
defer quitCancel()
// Shutdown HTTP server
if err := srv.Shutdown(ctx); err != nil {
if err := srv.Shutdown(quitCtx); err != nil {
common.Fatal("Server forced to shutdown", zap.Error(err))
}
@@ -646,7 +648,7 @@ func runSyncer(args *serverArgs) error {
return nil
}
func runAPI(args *serverArgs) error {
func runAPI(ctx context.Context, args *serverArgs) error {
// Initialize admin status (default: unavailable=1)
local.InitAdminStatus(1, "admin server not connected")
@@ -666,14 +668,14 @@ func runAPI(args *serverArgs) error {
}
config := server.GetConfig()
startServer(config)
startServer(ctx, config)
common.Info("Server exited")
return nil
}
func startServer(config *server.Config) {
func startServer(ctx context.Context, config *server.Config) {
// Set Gin mode
if config.Server.Mode == "release" {
@@ -744,7 +746,7 @@ func startServer(config *server.Config) {
return handler.MCPListDatasets(datasetsService, userID, page, pageSize, orderBy, desc)
},
func(userID string, page, pageSize int, orderBy string, desc bool) ([]map[string]interface{}, int64, error) {
return handler.MCPListChats(chatService, userID, page, pageSize, orderBy, desc)
return handler.MCPListChats(ctx, chatService, userID, page, pageSize, orderBy, desc)
},
func(userID string, req mcp.RetrievalRequest) (string, error) {
return handler.MCPRetrieval(datasetsService, userID, req)