feature: basic management service implementation (#44)

* feat: basic management service implementation [FAILING TESTS]

* test: fix healthcheck test

* test: #39 add peer registration endpoint test

* feat: #39 add setup key handling

* feat: #39 add peer management store persistence

* refactor: extract config read/write to the utility package

* refactor: move file contents copy to the utility package

* refactor: use Accounts instead of Users in the Store

* feature: add management server Docker file

* refactor: introduce datadir instead of config

* chore: use filepath.Join to concat filepaths instead of string concat

* refactor: move stop channel to the root

* refactor: move stop channel to the root

* review: fix PR review notes

Co-authored-by: braginini <hello@wiretrustee.com>
This commit is contained in:
Mikhail Bragin
2021-07-17 14:38:59 +02:00
committed by GitHub
parent dd50f495ab
commit 4587f7686e
17 changed files with 980 additions and 17 deletions

61
cmd/management.go Normal file
View File

@@ -0,0 +1,61 @@
package cmd
import (
"flag"
"fmt"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
mgmt "github.com/wiretrustee/wiretrustee/management"
mgmtProto "github.com/wiretrustee/wiretrustee/management/proto"
"google.golang.org/grpc"
"net"
)
var (
mgmtPort int
mgmtDataDir string
mgmtCmd = &cobra.Command{
Use: "management",
Short: "start Wiretrustee Management Server",
Run: func(cmd *cobra.Command, args []string) {
flag.Parse()
lis, err := net.Listen("tcp", fmt.Sprintf(":%d", mgmtPort))
if err != nil {
log.Fatalf("failed to listen: %v", err)
}
if err != nil {
log.Fatalf("failed to listen: %v", err)
}
var opts []grpc.ServerOption
grpcServer := grpc.NewServer(opts...)
defer grpcServer.Stop()
server, err := mgmt.NewServer(mgmtDataDir)
if err != nil {
log.Fatalf("failed creating new server: %v", err)
panic(err)
}
mgmtProto.RegisterManagementServiceServer(grpcServer, server)
log.Printf("started server: localhost:%v", mgmtPort)
go func() {
if err = grpcServer.Serve(lis); err != nil {
log.Fatalf("failed to serve: %v", err)
}
}()
SetupCloseHandler()
<-stopCh
log.Println("Receive signal to stop running Management server")
},
}
)
func init() {
mgmtCmd.PersistentFlags().IntVar(&mgmtPort, "port", 33073, "Server port to listen on (e.g. 33073)")
mgmtCmd.PersistentFlags().StringVar(&mgmtDataDir, "datadir", "/data", "Server data directory location (e.g. /data")
}

View File

@@ -24,6 +24,9 @@ var (
Short: "",
Long: "",
}
// Execution control channel for stopCh signal
stopCh chan int
)
// Execute executes the root command.
@@ -31,6 +34,9 @@ func Execute() error {
return rootCmd.Execute()
}
func init() {
stopCh = make(chan int)
defaultConfigPath = "/etc/wiretrustee/config.json"
if runtime.GOOS == "windows" {
defaultConfigPath = os.Getenv("PROGRAMDATA") + "\\Wiretrustee\\" + "config.json"
@@ -41,6 +47,7 @@ func init() {
rootCmd.AddCommand(addPeerCmd)
rootCmd.AddCommand(upCmd)
rootCmd.AddCommand(signalCmd)
rootCmd.AddCommand(mgmtCmd)
rootCmd.AddCommand(serviceCmd)
serviceCmd.AddCommand(runCmd, startCmd, stopCmd, restartCmd) // service control commands are subcommands of service
serviceCmd.AddCommand(installCmd, uninstallCmd) // service installer commands are subcommands of service
@@ -53,7 +60,7 @@ func SetupCloseHandler() {
go func() {
for range c {
fmt.Println("\r- Ctrl+C pressed in Terminal")
stopUP <- 0
stopCh <- 0
}
}()
}

View File

@@ -13,7 +13,7 @@ func (p *program) Start(s service.Service) error {
}
func (p *program) Stop(s service.Service) error {
stopUP <- 1
stopCh <- 1
return nil
}

View File

@@ -12,7 +12,7 @@ import (
)
var (
port int
signalPort int
signalCmd = &cobra.Command{
Use: "signal",
@@ -20,7 +20,7 @@ var (
Run: func(cmd *cobra.Command, args []string) {
flag.Parse()
lis, err := net.Listen("tcp", fmt.Sprintf(":%d", port))
lis, err := net.Listen("tcp", fmt.Sprintf(":%d", signalPort))
if err != nil {
log.Fatalf("failed to listen: %v", err)
}
@@ -31,7 +31,7 @@ var (
var opts []grpc.ServerOption
grpcServer := grpc.NewServer(opts...)
sigProto.RegisterSignalExchangeServer(grpcServer, sig.NewServer())
log.Printf("started server: localhost:%v", port)
log.Printf("started server: localhost:%v", signalPort)
if err := grpcServer.Serve(lis); err != nil {
log.Fatalf("failed to serve: %v", err)
}
@@ -43,5 +43,5 @@ var (
)
func init() {
signalCmd.PersistentFlags().IntVar(&port, "port", 10000, "Server port to listen on (e.g. 10000)")
signalCmd.PersistentFlags().IntVar(&signalPort, "port", 10000, "Server port to listen on (e.g. 10000)")
}

View File

@@ -48,15 +48,8 @@ var (
//signalClient.WaitConnected()
SetupCloseHandler()
<-stopUP
<-stopCh
log.Println("Receive signal to stop running")
},
}
)
// Execution control channel for stopUP signal
var stopUP chan int
func init() {
stopUP = make(chan int)
}