philipp/uncloud
1
0
Fork 0
mirror of https://github.com/psviderski/uncloud.git synced 2026-08-26 11:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename Cluster to Server

Browse Source
This commit is contained in:
Pavel Sviderski
2024-09-06 09:34:29 +10:00
parent 69c259aa8d
commit 2c46c0a7d5
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/daemon/daemon.go
+2 -2
View File
@@ -108,7 +108,7 @@ func InitCluster(dataDir, machineName string, netPrefix netip.Prefix, users []*p
type Daemon struct { type Daemon struct {
state *machine.State state *machine.State
cluster *cluster.Cluster cluster *cluster.Server
} }
func New(dataDir string) (*Daemon, error) { func New(dataDir string) (*Daemon, error) {
@@ -212,7 +212,7 @@ func (d *Daemon) Run(ctx context.Context) error {
if d.cluster != nil { if d.cluster != nil {
slog.Info("Stopping cluster.") slog.Info("Stopping cluster.")
d.cluster.Stop() d.cluster.Stop()
slog.Info("Cluster stopped.") slog.Info("Cluster server stopped.")
} }
return nil return nil
}) })
internal/machine/cluster/cluster.go
+12 -12
View File
@@ -27,8 +27,8 @@ type Config struct {
APISockPath string APISockPath string
} }
type Cluster struct { type Server struct {
// TODO: implement grpc ClusterServer // TODO: implement grpc Server
pb.UnimplementedClusterServer pb.UnimplementedClusterServer
config Config config Config
@@ -37,8 +37,8 @@ type Cluster struct {
server *grpc.Server server *grpc.Server
} }
func NewCluster(config *Config, state *State) *Cluster { func NewCluster(config *Config, state *State) *Server {
c := &Cluster{ c := &Server{
config: *config, config: *config,
state: state, state: state,
server: grpc.NewServer(), server: grpc.NewServer(),
@@ -47,7 +47,7 @@ func NewCluster(config *Config, state *State) *Cluster {
return c return c
} }
func (c *Cluster) Run() error { func (c *Server) Run() error {
listener, err := net.Listen("tcp", c.config.APIAddr) listener, err := net.Listen("tcp", c.config.APIAddr)
if err != nil { if err != nil {
return fmt.Errorf("listen API port: %w", err) return fmt.Errorf("listen API port: %w", err)
@@ -59,21 +59,21 @@ func (c *Cluster) Run() error {
return nil return nil
} }
func (c *Cluster) Stop() { func (c *Server) Stop() {
slog.Info("Stopping API server.") slog.Info("Stopping API server.")
// TODO: implement timeout for graceful shutdown. // TODO: implement timeout for graceful shutdown.
c.server.GracefulStop() c.server.GracefulStop()
slog.Info("API server stopped.") slog.Info("API server stopped.")
} }
func (c *Cluster) Network() (netip.Prefix, error) { func (c *Server) Network() (netip.Prefix, error) {
if c.state.State.Network == nil { if c.state.State.Network == nil {
return netip.Prefix{}, fmt.Errorf("network not set") return netip.Prefix{}, fmt.Errorf("network not set")
} }
return c.state.State.Network.ToPrefix() return c.state.State.Network.ToPrefix()
} }
func (c *Cluster) SetNetwork(network netip.Prefix) error { func (c *Server) SetNetwork(network netip.Prefix) error {
if c.state.State.Network != nil { if c.state.State.Network != nil {
return fmt.Errorf("network already set and cannot be changed") return fmt.Errorf("network already set and cannot be changed")
} }
@@ -82,7 +82,7 @@ func (c *Cluster) SetNetwork(network netip.Prefix) error {
} }
// AddMachine adds a machine to the cluster. // AddMachine adds a machine to the cluster.
func (c *Cluster) AddMachine(ctx context.Context, req *pb.AddMachineRequest) (*pb.AddMachineResponse, error) { func (c *Server) AddMachine(ctx context.Context, req *pb.AddMachineRequest) (*pb.AddMachineResponse, error) {
// TODO: replace errors with gRPC status.Error(f), e.g. status.Error(codes.InvalidArgument, "management IP not set") // TODO: replace errors with gRPC status.Error(f), e.g. status.Error(codes.InvalidArgument, "management IP not set")
if req.Network.PublicKey == nil { if req.Network.PublicKey == nil {
return nil, fmt.Errorf("public key not set") return nil, fmt.Errorf("public key not set")
@@ -165,7 +165,7 @@ func (c *Cluster) AddMachine(ctx context.Context, req *pb.AddMachineRequest) (*p
return resp, nil return resp, nil
} }
func (c *Cluster) ListMachineEndpoints(ctx context.Context, req *pb.ListMachineEndpointsRequest) (*pb.ListMachineEndpointsResponse, error) { func (c *Server) ListMachineEndpoints(ctx context.Context, req *pb.ListMachineEndpointsRequest) (*pb.ListMachineEndpointsResponse, error) {
endpoints, ok := c.state.State.Endpoints[req.Id] endpoints, ok := c.state.State.Endpoints[req.Id]
if !ok { if !ok {
return nil, status.Errorf(codes.NotFound, "machine %q not found", req.Id) return nil, status.Errorf(codes.NotFound, "machine %q not found", req.Id)
@@ -173,12 +173,12 @@ func (c *Cluster) ListMachineEndpoints(ctx context.Context, req *pb.ListMachineE
return &pb.ListMachineEndpointsResponse{Endpoints: endpoints}, nil return &pb.ListMachineEndpointsResponse{Endpoints: endpoints}, nil
} }
func (c *Cluster) AddUser(user *pb.User) error { func (c *Server) AddUser(user *pb.User) error {
c.state.State.Users = append(c.state.State.Users, user) c.state.State.Users = append(c.state.State.Users, user)
return c.state.Save() return c.state.Save()
} }
func (c *Cluster) ListUsers() []*pb.User { func (c *Server) ListUsers() []*pb.User {
return c.state.State.Users return c.state.State.Users
} }