RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
Go: fix log level (#20036)
Jin Haid83f7540e7b8
diff --git a/cmd/deepdoc_server_ee.go b/cmd/deepdoc_server_ee.goindex 09bacb9c7e..ee68db3dd1 100644--- a/cmd/deepdoc_server_ee.go+++ b/cmd/deepdoc_server_ee.go@@ -21,7 +21,7 @@ import ("ragflow/internal/common")-func runDeepDoc(ctx context.Context, args *serverArgs) error {+func runDeepDoc(ctx context.Context, serverName string, args *serverArgs) error {common.Info("DeepDoc server is not implemented")return nil}diff --git a/cmd/ragflow_server.go b/cmd/ragflow_server.goindex 33468b7a7f..edcf349a5b 100644--- a/cmd/ragflow_server.go+++ b/cmd/ragflow_server.go@@ -207,14 +207,15 @@ func validateLogLevel(level string) error {}func selectedLogLevel(args *serverArgs, configured string) string {- level := configured- if level == "" {- level = "warn"- }if args.logLevel != nil {- level = *args.logLevel+ return *args.logLevel+ }++ if configured == "" {+ return "info"}- return level++ return configured}func printHelp(args *serverArgs) {@@ -299,7 +300,6 @@ func printHelp(args *serverArgs) {fmt.Fprintf(os.Stderr, " --name string\t\t\tSync service server name (default: \"default_syncer\")\n")fmt.Fprintf(os.Stderr, " --admin-host string\tAdmin server host:port (overrides config file)\n")fmt.Fprintf(os.Stderr, " -v, --version \t\tPrint version information and exit\n")- fmt.Fprintf(os.Stderr, " --debug \t\tEnable debug-level logging\n")fmt.Fprintf(os.Stderr, " --profile \t\tEnable pprof server\n")fmt.Fprintf(os.Stderr, " -h, --help \t\tShow this help message and exit\n")}@@ -340,21 +340,18 @@ func main() {}// Temporary logger initialization- var logFileName stringvar serverName stringif arguments.name != nil {serverName = *arguments.name} else {serverName = fmt.Sprintf("%s_server", *arguments.mode)}- logFileName = fmt.Sprintf("%s.log", serverName)logLevel := selectedLogLevel(arguments, "")+ if higherThanInfo := common.LogLevelHigherThanInfo(logLevel); higherThanInfo {+ logLevel = "info"+ }- // Temporary pre-config logger: STDOUT ONLY (empty FileOutput). The port- // is not known yet, so a file here would be an orphaned log (e.g.- // logs/api_server.log next to the real logs/api_server_9384.log); the- // real file sink is attached by the post-config re-initialization below.if err = common.InitLogger(logLevel, common.FileOutput{}, serverName); err != nil {panic("failed to initialize logger: " + err.Error())}@@ -423,30 +420,6 @@ func main() {// set server name and log file pathserver.SetServerName(serverName)- // rename log filename- logFileName = fmt.Sprintf("%s.log", serverName)-- logConfig := globalConfig.GetLogConfig()-- // Reinitialize logger with the configured level and CLI overrides.- logLevel = selectedLogLevel(arguments, logConfig.Level)-- globalConfig.SetLogLevel(logLevel)-- fileOut := common.FileOutput{- Filename: logFileName,- Path: logConfig.Path,- MaxSize: logConfig.MaxSize,- MaxBackups: logConfig.MaxBackups,- MaxAge: logConfig.MaxAge,- Compress: logConfig.Compress,- }-- common.SyncLog()- if err = common.InitLogger(logLevel, fileOut, serverName); err != nil {- common.Error("Failed to reinitialize logger with configured level", err)- }-// Wire the in-process DeepDoc backend only after the REAL file-backed// logger exists: its registration lines (and the Fatal abort on a missing// backend) must land in the run's log file, not in the pre-config@@ -519,27 +492,27 @@ func main() {switch *arguments.mode {case "api":- if err = runAPI(ctx, arguments); err != nil {+ if err = runAPI(ctx, serverName, arguments); err != nil {fmt.Printf("Failed to start API server: %v\n", err)os.Exit(1)}case "admin":- if err = runAdmin(ctx, arguments); err != nil {+ if err = runAdmin(ctx, serverName, arguments); err != nil {fmt.Printf("Failed to start ADMIN server: %v\n", err)os.Exit(1)}case "ingestor":- if err = runIngestor(ctx, cancel, arguments); err != nil {+ if err = runIngestor(ctx, cancel, serverName, arguments); err != nil {fmt.Printf("Failed to start INGESTION worker: %v\n", err)os.Exit(1)}case "syncer":- if err = runSyncer(ctx, cancel, arguments); err != nil {+ if err = runSyncer(ctx, cancel, serverName, arguments); err != nil {fmt.Printf("Failed to start SYNCER: %v\n", err)os.Exit(1)}case "deepdoc":- if err = runDeepDoc(ctx, arguments); err != nil {+ if err = runDeepDoc(ctx, serverName, arguments); err != nil {fmt.Printf("Failed to start DEEPDOC: %v\n", err)os.Exit(1)}@@ -549,6 +522,33 @@ func main() {}}+func setLogger(serverName string, arguments *serverArgs) {+ // log filename+ logFileName := fmt.Sprintf("%s.log", serverName)++ globalConfig := server.GetConfig()+ logConfig := globalConfig.GetLogConfig()++ // Reinitialize logger with the configured level and CLI overrides.+ logLevel := selectedLogLevel(arguments, logConfig.Level)++ globalConfig.SetLogLevel(logLevel)++ fileOut := common.FileOutput{+ Filename: logFileName,+ Path: logConfig.Path,+ MaxSize: logConfig.MaxSize,+ MaxBackups: logConfig.MaxBackups,+ MaxAge: logConfig.MaxAge,+ Compress: logConfig.Compress,+ }++ common.SyncLog()+ if err := common.InitLogger(logLevel, fileOut, serverName); err != nil {+ common.Error("Failed to reinitialize logger with configured level", err)+ }+}+// checkDatabaseVersion refuses to run a server when the running code is older// than the version recorded in the system_settings migration marker. Migrating// the database forward is a one-way operation, so an older binary would read and@@ -647,7 +647,7 @@ func runMigrate(ctx context.Context, args *serverArgs) error {return nil}-func runAdmin(ctx context.Context, args *serverArgs) error {+func runAdmin(ctx context.Context, serverName string, args *serverArgs) error {globalConfig := server.GetConfig()serverMode := globalConfig.GetMode()@@ -710,6 +710,9 @@ func runAdmin(ctx context.Context, args *serverArgs) error {// Print RAGFlow versioncommon.Info(fmt.Sprintf("RAGFlow admin version: %s", common.GetRAGFlowVersion()))+ // Set log level+ setLogger(serverName, args)+// Start HTTP server in a goroutinego func() {common.Info(fmt.Sprintf("Starting RAGFlow admin HTTP server on port: %d", adminConfig.HTTPPort))@@ -768,7 +771,7 @@ func startHeartbeat(serverType common.ServerType, serverID string, port int, heareturn heartbeatReporter}-func runIngestor(ctx context.Context, cancel context.CancelFunc, args *serverArgs) error {+func runIngestor(ctx context.Context, cancel context.CancelFunc, serverName string, args *serverArgs) error {// Initialize tokenizer (rag_analyzer)// tokenizer.Init handles DictPath fallback: env var → /usr/share/infinity/resourceif err := tokenizer.Init(&tokenizer.PoolConfig{}); err != nil {@@ -838,6 +841,9 @@ func runIngestor(ctx context.Context, cancel context.CancelFunc, args *serverArg// Print RAGFlow versioncommon.Info(fmt.Sprintf("RAGFlow ingestion service version: %s", common.GetRAGFlowVersion()))+ // Set log level+ setLogger(serverName, args)+// Start heartbeat reporter to admin serverif hb := startHeartbeat(common.ServerTypeIngestion,@@ -869,7 +875,7 @@ func runIngestor(ctx context.Context, cancel context.CancelFunc, args *serverArgreturn nil}-func runSyncer(ctx context.Context, cancel context.CancelFunc, args *serverArgs) error {+func runSyncer(ctx context.Context, cancel context.CancelFunc, serverName string, args *serverArgs) error {globalConfig := server.GetConfig()syncerConfig := globalConfig.GetSyncerConfig()fileSyncer := syncer.NewSyncer(syncerConfig.MaxConcurrentSyncs)@@ -889,6 +895,9 @@ func runSyncer(ctx context.Context, cancel context.CancelFunc, args *serverArgs)// Print RAGFlow versioncommon.Info(fmt.Sprintf("RAGFlow file syncer service version: %s", common.GetRAGFlowVersion()))+ // Set log level+ setLogger(serverName, args)+// Start heartbeat reporter to admin serverif hb := startHeartbeat(common.ServerTypeFileSyncer,@@ -915,7 +924,7 @@ func runSyncer(ctx context.Context, cancel context.CancelFunc, args *serverArgs)return nil}-func runAPI(ctx context.Context, args *serverArgs) error {+func runAPI(ctx context.Context, serverName string, args *serverArgs) error {// Initialize admin status (default: unavailable=1)local.InitAdminStatus(1, "admin server not connected")@@ -941,7 +950,7 @@ func runAPI(ctx context.Context, args *serverArgs) error {common.Fatal("Failed to initialize query builder", zap.Error(err))}- if err := startServer(ctx); err != nil {+ if err := startServer(ctx, serverName, args); err != nil {return err}@@ -950,7 +959,7 @@ func runAPI(ctx context.Context, args *serverArgs) error {return nil}-func startServer(ctx context.Context) error {+func startServer(ctx context.Context, serverName string, arguments *serverArgs) error {globalConfig := server.GetConfig()serverMode := globalConfig.GetMode()@@ -1274,18 +1283,22 @@ func startServer(ctx context.Context) error {}()}+ common.Info(+ "\n ____ ___ ______ ______ __\n" ++ " / __ \\ / | / ____// ____// /____ _ __\n" ++ " / /_/ // /| | / / __ / /_ / // __ \\| | /| / /\n" ++ " / _, _// ___ |/ /_/ // __/ / // /_/ /| |/ |/ /\n" ++ " /_/ |_|/_/ |_|\\____//_/ /_/ \\____/ |__/|__/\n",+ )+ common.Info(fmt.Sprintf("RAGFlow Go Version: %s", common.GetRAGFlowVersion()))+ common.Info(fmt.Sprintf("Server starting on port: %d", apiServerConfig.HTTPPort))++ // Set log level+ setLogger(serverName, arguments)+// Start server in a goroutinego func() {- common.Info(- "\n ____ ___ ______ ______ __\n" +- " / __ \\ / | / ____// ____// /____ _ __\n" +- " / /_/ // /| | / / __ / /_ / // __ \\| | /| / /\n" +- " / _, _// ___ |/ /_/ // __/ / // /_/ /| |/ |/ /\n" +- " /_/ |_|/_/ |_|\\____//_/ /_/ \\____/ |__/|__/\n",- )- common.Info(fmt.Sprintf("RAGFlow Go Version: %s", common.GetRAGFlowVersion()))- common.Info(fmt.Sprintf("Server starting on port: %d", apiServerConfig.HTTPPort))- serve("API", srv, apiListener)+ serve(serverName, srv, apiListener)}()// Start heartbeat reporter to admin server@@ -1313,15 +1326,15 @@ func startServer(ctx context.Context) error {defer shutdownCancel()if mcpCloser != nil {- if err := mcpCloser.Close(); err != nil {+ if err = mcpCloser.Close(); err != nil {common.Warn("Failed to close MCP handler", zap.Error(err))}}- if err := shutdownHTTPServer(shutdownCtx, "API", srv); err != nil {+ if err = shutdownHTTPServer(shutdownCtx, "API", srv); err != nil {return err}if mcpSrv != nil {- if err := shutdownHTTPServer(shutdownCtx, "MCP", mcpSrv); err != nil {+ if err = shutdownHTTPServer(shutdownCtx, "MCP", mcpSrv); err != nil {return err}}diff --git a/cmd/ragflow_server_test.go b/cmd/ragflow_server_test.goindex 4413c701ac..2d1f9545f9 100644--- a/cmd/ragflow_server_test.go+++ b/cmd/ragflow_server_test.go@@ -72,8 +72,8 @@ func TestSelectedLogLevelPrecedence(t *testing.T) {if err != nil {t.Fatalf("parseArgs(--api) error = %v", err)}- if got := selectedLogLevel(args, ""); got != "warn" {- t.Errorf("default log level = %q, want warn", got)+ if got := selectedLogLevel(args, ""); got != "info" {+ t.Errorf("default log level = %q, want info", got)}if got := selectedLogLevel(args, "info"); got != "info" {t.Errorf("configured log level = %q, want info", got)@@ -86,7 +86,7 @@ func TestSelectedLogLevelPrecedence(t *testing.T) {if got := selectedLogLevel(args, "info"); got != "error" {t.Errorf("--log-level log level = %q, want error", got)}- if _, err := parseArgsForTest(t, "--api", "--debug"); err == nil {+ if _, err = parseArgsForTest(t, "--api", "--debug"); err == nil {t.Error("parseArgs(--debug) error = nil, want unknown parameter error")}}diff --git a/internal/common/logger.go b/internal/common/logger.goindex 185fe1b42a..58fb439309 100644--- a/internal/common/logger.go+++ b/internal/common/logger.go@@ -136,11 +136,12 @@ func parseZapLevel(level string) (zapcore.Level, error) {}}-func logLevelName(level zapcore.Level) string {- if level == zapcore.WarnLevel {- return "WARNING"+func LogLevelHigherThanInfo(level string) bool {+ l, err := parseZapLevel(level)+ if err != nil {+ return false}- return strings.ToUpper(level.String())+ return l > zapcore.InfoLevel}// InitLogger initializes the global logger. stdout is always written. If file.Pathdiff --git a/internal/engine/nats/nats.go b/internal/engine/nats/nats.goindex 4560559009..e3580e6502 100644--- a/internal/engine/nats/nats.go+++ b/internal/engine/nats/nats.go@@ -126,7 +126,7 @@ func (n *NatsEngine) Init() error {}common.Info("NATS stream updated with current config (discard=new, larger limits)")} else {- common.Info(fmt.Sprintf("NATS stream create successfully at %s", natsURL))+ common.Info("NATS stream create successfully")}common.Info(fmt.Sprintf("NATS stream RAGFLOW_TASKS ready at %s", natsURL))