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
fix(admin): show host and port in service status (#19848)
Sbaaoui Idrissa1da66010b62
diff --git a/cmd/ragflow_server.go b/cmd/ragflow_server.goindex 797571e660..4988fe3a3a 100644--- a/cmd/ragflow_server.go+++ b/cmd/ragflow_server.go@@ -986,7 +986,7 @@ func runIngestor(ctx context.Context, cancel context.CancelFunc, args *serverArgif hb := startHeartbeat(common.ServerTypeIngestion,fmt.Sprintf("ingestor-%s", ingestor.ID()),- -1,+ 0,globalConfig.GetHeartbeatInterval(),); hb != nil {defer hb.Stop()@@ -1037,7 +1037,7 @@ func runSyncer(ctx context.Context, cancel context.CancelFunc, args *serverArgs)if hb := startHeartbeat(common.ServerTypeFileSyncer,fmt.Sprintf("syncer-%s", fileSyncer.ID()),- -1,+ 0,globalConfig.GetHeartbeatInterval(),); hb != nil {defer hb.Stop()diff --git a/internal/admin/service.go b/internal/admin/service.goindex 6f915435e9..015b71e999 100644--- a/internal/admin/service.go+++ b/internal/admin/service.go@@ -24,6 +24,8 @@ import ("encoding/json""errors""fmt"+ "net"+ "net/url""ragflow/internal/agent/sandbox""ragflow/internal/common""ragflow/internal/dao"@@ -998,21 +1000,38 @@ func (s *Service) DeleteUserAPIToken(ctx context.Context, username, key string)type ServiceStatus struct {Type string `json:"type"`Name string `json:"name"`+ Host string `json:"host"`+ Port int `json:"port"`Status string `json:"status"`Elapsed string `json:"elapsed"`Message string `json:"message"`}-func newServiceStatus(typeStr, nameStr, statusStr string, startTime time.Time, messageStr string) ServiceStatus {+func newServiceStatus(typeStr, nameStr, host string, port int, statusStr string, startTime time.Time, messageStr string) ServiceStatus {return ServiceStatus{Type: typeStr,Name: nameStr,+ Host: host,+ Port: port,Status: statusStr,Elapsed: fmt.Sprintf("%.1d", time.Since(startTime).Milliseconds()),Message: messageStr,}}+func serviceEndpoint(raw string, defaultPort int) (string, int) {+ if parsed, err := url.Parse(raw); err == nil && parsed.Hostname() != "" {+ raw = parsed.Host+ }+ host, port, err := net.SplitHostPort(raw)+ if err == nil {+ var portNumber int+ fmt.Sscanf(port, "%d", &portNumber)+ return host, portNumber+ }+ return raw, defaultPort+}+// ListServices get all servicesfunc (s *Service) ListServices(ctx context.Context) ([]ServiceStatus, error) {@@ -1026,25 +1045,36 @@ func (s *Service) ListServices(ctx context.Context) ([]ServiceStatus, error) {mysqlStatus := s.getMySQLStatus(ctx)results = append(results, mysqlStatus)default:- results = append(results, newServiceStatus("database", databaseType, "not available", time.Now(), "not supported database type"))+ mysqlConfig := globalConfig.GetMySQLConfig()+ results = append(results, newServiceStatus("database", databaseType, mysqlConfig.Host, mysqlConfig.Port, "not available", time.Now(), "not supported database type"))}// Doc enginedocEngineImpl := engine.Get()+ docHost, docPort := "-", 0+ if docEngineImpl.GetType() == "infinity" {+ docHost, docPort = serviceEndpoint(globalConfig.GetInfinityConfig().URI, 0)+ } else if docEngineImpl.GetType() == "elasticsearch" {+ docHost, docPort = serviceEndpoint(globalConfig.GetElasticsearchConfig().Hosts, 0)+ }err := docEngineImpl.Ping(ctx)if err == nil {- results = append(results, newServiceStatus("doc_engine", docEngineImpl.GetType(), "alive", time.Now(), ""))+ results = append(results, newServiceStatus("doc_engine", docEngineImpl.GetType(), docHost, docPort, "alive", time.Now(), ""))} else {- results = append(results, newServiceStatus("doc_engine", docEngineImpl.GetType(), "timeout", time.Now(), err.Error()))+ results = append(results, newServiceStatus("doc_engine", docEngineImpl.GetType(), docHost, docPort, "timeout", time.Now(), err.Error()))}// storage enginestorageImpl := storage.GetStorageFactory().GetStorage()+ storageHost, storagePort := "-", 0+ if storageImpl.Type() == "minio" {+ storageHost, storagePort = serviceEndpoint(globalConfig.GetMinioConfig().Host, 0)+ }storageHealth := storageImpl.Health(ctx)if storageHealth {- results = append(results, newServiceStatus("storage_engine", storageImpl.Type(), "alive", time.Now(), ""))+ results = append(results, newServiceStatus("storage_engine", storageImpl.Type(), storageHost, storagePort, "alive", time.Now(), ""))} else {- results = append(results, newServiceStatus("storage_engine", storageImpl.Type(), "timeout", time.Now(), ""))+ results = append(results, newServiceStatus("storage_engine", storageImpl.Type(), storageHost, storagePort, "timeout", time.Now(), ""))}// cache engine@@ -1054,20 +1084,22 @@ func (s *Service) ListServices(ctx context.Context) ([]ServiceStatus, error) {mysqlStatus := s.getRedisInfo(ctx)results = append(results, mysqlStatus)default:- results = append(results, newServiceStatus("database", databaseType, "not available", time.Now(), "not supported database type"))+ redisConfig := globalConfig.GetRedisConfig()+ results = append(results, newServiceStatus("cache", cacheType, redisConfig.Host, redisConfig.Port, "not available", time.Now(), "not supported cache type"))}// message queuemessageQueueImpl := engine.GetMessageQueueEngine()messageQueueStatus := messageQueueImpl.CheckStatus()- results = append(results, newServiceStatus("message_queue", messageQueueImpl.Type(), messageQueueStatus, time.Now(), ""))+ natsConfig := globalConfig.GetNATSConfig()+ results = append(results, newServiceStatus("message_queue", messageQueueImpl.Type(), natsConfig.Host, natsConfig.Port, messageQueueStatus, time.Now(), ""))results = append(results, s.GetEEServicesStatus(ctx)...)serverList := GlobalServerStore.ListInfos()for _, serverStatus := range serverList {now := time.Now()- serverItem := newServiceStatus(string(serverStatus.ServerType), serverStatus.ServerName, "", serverStatus.Timestamp, "")+ serverItem := newServiceStatus(string(serverStatus.ServerType), serverStatus.ServerName, serverStatus.Host, serverStatus.Port, "", serverStatus.Timestamp, "")// the difference between now and serverStatus.Timestamp is less than 5 seconds, then the server is aliveif now.Sub(serverStatus.Timestamp) < 45*time.Second {serverItem.Status = "alive"@@ -1134,16 +1166,19 @@ func (s *Service) getMySQLStatus(ctx context.Context) ServiceStatus {sqlDB, err := dao.DB.DB()if err != nil {- return newServiceStatus(serviceType, name, "not connected", startTime, err.Error())+ mysqlConfig := server.GetConfig().GetMySQLConfig()+ return newServiceStatus(serviceType, name, mysqlConfig.Host, mysqlConfig.Port, "not connected", startTime, err.Error())}// Execute SELECT 1 to check connectivityerr = sqlDB.PingContext(ctx)if err != nil {- return newServiceStatus(serviceType, name, "timeout", startTime, err.Error())+ mysqlConfig := server.GetConfig().GetMySQLConfig()+ return newServiceStatus(serviceType, name, mysqlConfig.Host, mysqlConfig.Port, "timeout", startTime, err.Error())}- return newServiceStatus(serviceType, name, "alive", startTime, "")+ mysqlConfig := server.GetConfig().GetMySQLConfig()+ return newServiceStatus(serviceType, name, mysqlConfig.Host, mysqlConfig.Port, "alive", startTime, "")}// getRedisInfo gets Redis service info@@ -1153,13 +1188,14 @@ func (s *Service) getRedisInfo(ctx context.Context) ServiceStatus {name := "redis"startTime := time.Now()+ redisConfig := server.GetConfig().GetRedisConfig()redisClient := redis.Get()if redisClient.Health(ctx) {- return newServiceStatus(serviceType, name, "alive", startTime, "")+ return newServiceStatus(serviceType, name, redisConfig.Host, redisConfig.Port, "alive", startTime, "")}- return newServiceStatus(serviceType, name, "timeout", startTime, "Redis health check failed")+ return newServiceStatus(serviceType, name, redisConfig.Host, redisConfig.Port, "timeout", startTime, "Redis health check failed")}// getESClusterStats gets Elasticsearch cluster statsdiff --git a/web/src/services/admin-service-adapter.ts b/web/src/services/admin-service-adapter.tsindex 8542245c29..e553e625b0 100644--- a/web/src/services/admin-service-adapter.ts+++ b/web/src/services/admin-service-adapter.ts@@ -3,6 +3,8 @@ import { pickByBackend } from '@/utils/backend-variant';export type GoServiceStatus = {type: string;name: string;+ host: string;+ port: number;status: string;elapsed: string;message: string;@@ -18,8 +20,8 @@ export const adaptServiceList = (name: service.name,service_type: service.type,status: service.status,- host: '-',- port: '-',+ host: service.host || '-',+ port: service.port || '-',extra: { elapsed: service.elapsed, message: service.message },})),python: () => services as AdminService.ListServicesItem[],