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 heartbeat log (#17899)
Jin Haiae8cfd4d1e64
diff --git a/cmd/ragflow_server.go b/cmd/ragflow_server.goindex 57266f78b6..ea77ed5fdb 100644--- a/cmd/ragflow_server.go+++ b/cmd/ragflow_server.go@@ -516,7 +516,6 @@ func startHeartbeat(serverType common.ServerType, serverID string, port int, hea}service.AdminServiceClient = service.NewAdminClient(- common.Logger,serverType,serverID,localIP,diff --git a/internal/development.md b/internal/development.mdindex 61fb300aa2..bfd506fa40 100644--- a/internal/development.md+++ b/internal/development.md@@ -93,6 +93,11 @@ Note: admin server must be started first; otherwise, api server will encounter e./bin/ragflow_server --admin```+```bash+# Start admin server and migrate database+./bin/ragflow_server --admin --migrate+```+```bash# Start RAGFlow server./bin/ragflow_server --apidiff --git a/internal/service/admin_client.go b/internal/service/admin_client.goindex 149048dbb0..1a19413929 100644--- a/internal/service/admin_client.go+++ b/internal/service/admin_client.go@@ -35,7 +35,6 @@ var AdminServiceClient *AdminClient// AdminClient is responsible for sending heartbeat reports to the admin servertype AdminClient struct {client *utility.HTTPClient- logger *zap.LoggerserverType common.ServerTypeserverName stringhost string@@ -47,10 +46,9 @@ type AdminClient struct {}// NewAdminClient creates a new heartbeat service instance-func NewAdminClient(logger *zap.Logger, serverType common.ServerType, serverName, host string, port int) *AdminClient {+func NewAdminClient(serverType common.ServerType, serverName, host string, port int) *AdminClient {licenseStatusCode = common.CodeSuccessreturn &AdminClient{- logger: logger,serverType: serverType,serverName: serverName,host: host,@@ -75,14 +73,14 @@ func (h *AdminClient) InitHTTPClient() error {WithTimeout(10 * time.Second).Build()- h.logger.Info("Heartbeat HTTP client initialized",+ common.Info("Heartbeat HTTP client initialized",zap.String("admin_host", adminConfig.Host),zap.Int("admin_port", adminConfig.HTTPPort),)err := h.InitHTTPClientEE()if err != nil {- h.logger.Fatal(fmt.Sprintf("Fail to init enterprise service: %v", err))+ common.Fatal(fmt.Sprintf("Fail to init enterprise service: %v", err))}return nil@@ -102,7 +100,7 @@ func (h *AdminClient) SendHeartbeat() error {if h.client == nil {if err := h.InitHTTPClient(); err != nil {- h.logger.Error("Failed to initialize HTTP client", zap.Error(err))+ common.Error("Failed to initialize HTTP client", err)return err}}@@ -123,7 +121,7 @@ func (h *AdminClient) SendHeartbeat() error {jsonData, err := json.Marshal(message)if err != nil {- h.logger.Error("Failed to marshal heartbeat message", zap.Error(err))+ common.Error("Failed to marshal heartbeat message", err)return err}@@ -152,14 +150,14 @@ func (h *AdminClient) SendHeartbeat() error {if responseCode != common.CodeLicenseValid {if responseCode != licenseStatusCode {licenseStatusCode = responseCode- h.logger.Warn(fmt.Sprintf("Heartbeat response error: %s, code: %d", responseCode.Message(), responseCode))+ common.Warn(fmt.Sprintf("Heartbeat response error: %s, code: %d", responseCode.Message(), responseCode))}return errors.New(responseCode.Message())}licenseStatusCode = responseCode- h.logger.Debug("Heartbeat sent successfully",+ common.Debug("Heartbeat sent successfully",zap.String("server_id", h.serverName),zap.String("server_type", string(h.serverType)),)