diff --git a/server/internal/database/init_db.go b/server/internal/database/init_db.go index fb40bc8..a2b6149 100644 --- a/server/internal/database/init_db.go +++ b/server/internal/database/init_db.go @@ -2,8 +2,8 @@ package database import ( "database/sql" + "github.com/go-kratos/kratos/v2/log" _ "github.com/go-sql-driver/mysql" - "log" ) var db *sql.DB @@ -14,18 +14,18 @@ func InitDB(config *DatabaseConfig) { case "mysql": db, err = sql.Open("mysql", config.DataSourceName) default: - log.Fatalf("Unsupported database driver: %s", config.Driver) + log.Errorf("Unsupported database driver: %s", config.Driver) } if err != nil { - log.Fatalf("Failed to connect to database: %v", err) + log.Errorf("Failed to connect to database: %v", err) } err = db.Ping() if err != nil { log.Fatalf("Failed to ping database: %v", err) } - log.Println("Connected to database") + log.Info("Connected to database") } func GetDB() *sql.DB { diff --git a/server/internal/database/resource_pool_db.go b/server/internal/database/resource_pool_db.go index 420001c..8403656 100644 --- a/server/internal/database/resource_pool_db.go +++ b/server/internal/database/resource_pool_db.go @@ -4,7 +4,7 @@ import ( "database/sql" "errors" "fmt" - "log" + "github.com/go-kratos/kratos/v2/log" "strings" "time" ) @@ -33,7 +33,7 @@ func ExistsResourcePoolByPoolName(poolName string) bool { var count int err := db.QueryRow("SELECT count(1) FROM resource_pool WHERE pool_name = ?", poolName).Scan(&count) if err != nil { - log.Printf("Query failed: %v", err) + log.Infof("Query failed: %v", err) return false } @@ -46,10 +46,10 @@ func QueryResourcePoolById(poolId int64) (*ResourcePool, error) { Scan(&pool.Id, &pool.PoolName, &pool.CreateTime, &pool.UpdateTime) if err != nil { if errors.Is(err, sql.ErrNoRows) { - log.Printf("No record found with id %d", poolId) + log.Infof("No record found with id %d", poolId) return nil, nil } - log.Printf("Query failed: %v", err) + log.Infof("Query failed: %v", err) return nil, err } @@ -58,9 +58,9 @@ func QueryResourcePoolById(poolId int64) (*ResourcePool, error) { func QueryResourcePoolListAll() ([]*ResourcePool, error) { // 执行查询 - rows, err := db.Query("SELECT id, pool_name, create_time, update_time FROM resource_pool") + rows, err := db.Query("SELECT id, pool_name, create_time, update_time FROM resource_pool order by id asc") if err != nil { - log.Printf("Query failed: %v", err) + log.Infof("Query failed: %v", err) return nil, err } defer rows.Close() @@ -73,7 +73,7 @@ func QueryResourcePoolListAll() ([]*ResourcePool, error) { var pool ResourcePool err := rows.Scan(&pool.Id, &pool.PoolName, &pool.CreateTime, &pool.UpdateTime) if err != nil { - log.Printf("Scan failed: %v", err) + log.Infof("Scan failed: %v", err) return nil, err } pools = append(pools, &pool) @@ -91,7 +91,7 @@ func QueryNodesByPoolId(poolId int64) ([]*Nodes, error) { // 执行查询 rows, err := db.Query("SELECT id, node_name, node_ip, create_time, update_time FROM nodes where pool_id = ?", poolId) if err != nil { - log.Printf("Query failed: %v", err) + log.Infof("Query failed: %v", err) return nil, err } defer rows.Close() @@ -104,7 +104,7 @@ func QueryNodesByPoolId(poolId int64) ([]*Nodes, error) { var node Nodes err := rows.Scan(&node.Id, &node.NodeName, &node.NodeIp, &node.CreateTime, &node.UpdateTime) if err != nil { - log.Printf("Scan failed: %v", err) + log.Infof("Scan failed: %v", err) return nil, err } nodes = append(nodes, &node) @@ -123,13 +123,13 @@ func InsertResourcePool(poolName string) (int64, error) { result, err := db.Exec(querySql, poolName) if err != nil { - log.Printf("Failed to insert record: %v", err) + log.Infof("Failed to insert record: %v", err) return 0, err } id, err := result.LastInsertId() if err != nil { - log.Printf("Failed to get last insert ID: %v", err) + log.Infof("Failed to get last insert ID: %v", err) return 0, err } @@ -140,13 +140,13 @@ func UpdateResourcePool(poolId int64, poolName string) (int64, error) { updateSql := "UPDATE resource_pool SET pool_name=? where id=?" result, err := db.Exec(updateSql, poolName, poolId) if err != nil { - log.Printf("Failed to update record: %v", err) + log.Infof("Failed to update record: %v", err) return 0, err } rows, err := result.RowsAffected() if err != nil { - log.Printf("Failed to get rows affected: %v", err) + log.Infof("Failed to get rows affected: %v", err) return 0, err } @@ -168,13 +168,13 @@ func InsertNodes(poolId int64, nodes []*NodeInfo) (int64, error) { result, err := db.Exec(insertSql, valueArgs...) if err != nil { - log.Printf("Batch insert failed: %v", err) + log.Infof("Batch insert failed: %v", err) return 0, err } rows, err := result.RowsAffected() if err != nil { - log.Printf("Get rows affected failed: %v", err) + log.Infof("Get rows affected failed: %v", err) return 0, err } diff --git a/server/internal/service/resource_pool.go b/server/internal/service/resource_pool.go index fd1d9a0..6864ab4 100644 --- a/server/internal/service/resource_pool.go +++ b/server/internal/service/resource_pool.go @@ -5,9 +5,9 @@ import ( "encoding/json" "errors" "fmt" + "github.com/go-kratos/kratos/v2/log" "github.com/gookit/goutil/arrutil" "github.com/prometheus/common/model" - "log" "sort" pb "vgpu/api/v1" "vgpu/internal/biz" @@ -29,7 +29,7 @@ func NewResourcePoolService(uc *biz.NodeUsecase, pod *biz.PodUseCase, summary *b } func (s *ResourcePoolService) Create(ctx context.Context, req *pb.ResourcePoolCreateRequest) (*pb.BaseResponse, error) { - log.Println("CreateResourcePool called", req) + log.Info("CreateResourcePool called", req) poolName := req.PoolName if database.ExistsResourcePoolByPoolName(poolName) { @@ -54,12 +54,12 @@ func (s *ResourcePoolService) Create(ctx context.Context, req *pb.ResourcePoolCr return &pb.BaseResponse{Code: -1, Message: poolName + "创建资源池失败"}, nil } - log.Println("CreateResourcePool success", poolName, rows) + log.Info("CreateResourcePool success", poolName, rows) return &pb.BaseResponse{Code: 1, Message: "成功"}, nil } func (s *ResourcePoolService) Update(ctx context.Context, req *pb.ResourcePoolUpdateRequest) (*pb.BaseResponse, error) { - log.Println("UpdateResourcePool called", req) + log.Info("UpdateResourcePool called", req) poolId := req.PoolId resourcePool, err := database.QueryResourcePoolById(poolId) if err != nil { @@ -92,25 +92,25 @@ func (s *ResourcePoolService) Update(ctx context.Context, req *pb.ResourcePoolUp } func (s *ResourcePoolService) Delete(ctx context.Context, req *pb.ResourcePoolDeleteRequest) (*pb.BaseResponse, error) { - log.Println("DeleteResourcePool called", req) + log.Info("DeleteResourcePool called", req) poolId := req.PoolId num, err := database.DeleteNodesByPoolId(poolId) if err != nil { return &pb.BaseResponse{Code: -1, Message: "删除资源池失败"}, nil } - log.Println("DeleteNodes success", poolId, num) + log.Infof("DeleteNodes success, poolId: %d, 影响行数: %d", poolId, num) num, err = database.DeleteResourcePoolById(poolId) if err != nil { return &pb.BaseResponse{Code: -1, Message: "删除资源池失败"}, nil } - log.Println("DeleteResourcePool success", poolId, num) + log.Infof("DeleteResourcePool success poolId: %d, 影响行数: %d", poolId, num) return &pb.BaseResponse{Code: 1, Message: "成功"}, nil } func (s *ResourcePoolService) List(ctx context.Context, req *pb.ResourcePoolListRequest) (*pb.ResourcePoolListResponse, error) { - log.Println("GetResourcePoolList", req) + log.Info("GetResourcePoolList", req) resourcePoolList, err := database.QueryResourcePoolListAll() if err != nil { @@ -143,7 +143,7 @@ func (s *ResourcePoolService) List(ctx context.Context, req *pb.ResourcePoolList } func (s *ResourcePoolService) GetDetail(ctx context.Context, req *pb.ResourcePoolDetailRequest) (*pb.ResourcePoolDetailResponse, error) { - log.Println("GetResourcePoolDetail", req) + log.Info("GetResourcePoolDetail", req) poolNodes, err := database.QueryNodesByPoolId(req.PoolId) if err != nil { return nil, err @@ -151,13 +151,13 @@ func (s *ResourcePoolService) GetDetail(ctx context.Context, req *pb.ResourcePoo if len(poolNodes) == 0 { return &pb.ResourcePoolDetailResponse{}, nil } - log.Println("GetResourcePoolDetail success", poolNodes) + log.Info("GetResourcePoolDetail success", poolNodes) var res = &pb.ResourcePoolDetailResponse{List: []*pb.PoolNodeReply{}} nodes, err := s.uc.ListAllNodesV2(ctx) for _, poolNode := range poolNodes { b1, _ := json.MarshalIndent(poolNode, "", " ") - fmt.Println(string(b1)) + log.Info(string(b1)) node := s.filterNode(poolNode.NodeIp, nodes) if node == nil { continue @@ -177,7 +177,7 @@ func (s *ResourcePoolService) GetDetail(ctx context.Context, req *pb.ResourcePoo } func (s *ResourcePoolService) GetAvailableNodes(ctx context.Context, req *pb.AvailableNodesRequest) (*pb.AvailableNodesResponse, error) { - log.Println("GetAvailableNodes", req) + log.Info("GetAvailableNodes", req) var data []*pb.AvailableNodesInfo k8sNodes := s.getK8sNodes(ctx) @@ -230,7 +230,7 @@ func (s *ResourcePoolService) simpleQuery(ctx context.Context, query string) int func (s *ResourcePoolService) filterNode(nodeIp string, nodes []*biz.Node) *biz.Node { for _, node := range nodes { b, _ := json.MarshalIndent(node, "", " ") - fmt.Println(string(b)) + log.Info(string(b)) if node.IP == nodeIp { return node }