mirror of
https://github.com/kubenetworks/kubevpn.git
synced 2025-10-20 22:09:31 +08:00
feat: daemon not works well on Windows
This commit is contained in:
2
Makefile
2
Makefile
@@ -93,7 +93,7 @@ container-local: kubevpn-linux-amd64
|
|||||||
|
|
||||||
.PHONY: container-test
|
.PHONY: container-test
|
||||||
container-test: kubevpn-linux-amd64
|
container-test: kubevpn-linux-amd64
|
||||||
docker buildx build --platform linux/amd64 -t docker.io/naison/kubevpn:test-daemon -f $(BUILD_DIR)/test.Dockerfile --push .
|
docker buildx build --platform linux/amd64,linux/arm64 -t docker.io/naison/kubevpn:test -f $(BUILD_DIR)/test.Dockerfile --push .
|
||||||
|
|
||||||
.PHONY: version
|
.PHONY: version
|
||||||
version:
|
version:
|
||||||
|
@@ -9,6 +9,8 @@ import (
|
|||||||
|
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
"google.golang.org/grpc/codes"
|
||||||
|
"google.golang.org/grpc/status"
|
||||||
cmdutil "k8s.io/kubectl/pkg/cmd/util"
|
cmdutil "k8s.io/kubectl/pkg/cmd/util"
|
||||||
"k8s.io/kubectl/pkg/util/i18n"
|
"k8s.io/kubectl/pkg/util/i18n"
|
||||||
"k8s.io/kubectl/pkg/util/templates"
|
"k8s.io/kubectl/pkg/util/templates"
|
||||||
@@ -77,6 +79,8 @@ func CmdConnect(f cmdutil.Factory) *cobra.Command {
|
|||||||
recv, err := resp.Recv()
|
recv, err := resp.Recv()
|
||||||
if err == io.EOF {
|
if err == io.EOF {
|
||||||
break
|
break
|
||||||
|
} else if code := status.Code(err); code == codes.DeadlineExceeded || code == codes.Canceled {
|
||||||
|
return nil
|
||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -99,6 +103,8 @@ func CmdConnect(f cmdutil.Factory) *cobra.Command {
|
|||||||
resp, err = stream.Recv()
|
resp, err = stream.Recv()
|
||||||
if err == io.EOF {
|
if err == io.EOF {
|
||||||
return nil
|
return nil
|
||||||
|
} else if code := status.Code(err); code == codes.DeadlineExceeded || code == codes.Canceled {
|
||||||
|
return nil
|
||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@@ -7,6 +7,8 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
"google.golang.org/grpc/codes"
|
||||||
|
"google.golang.org/grpc/status"
|
||||||
cmdutil "k8s.io/kubectl/pkg/cmd/util"
|
cmdutil "k8s.io/kubectl/pkg/cmd/util"
|
||||||
"k8s.io/kubectl/pkg/util/i18n"
|
"k8s.io/kubectl/pkg/util/i18n"
|
||||||
"k8s.io/kubectl/pkg/util/templates"
|
"k8s.io/kubectl/pkg/util/templates"
|
||||||
@@ -44,6 +46,8 @@ func CmdDisconnect(f cmdutil.Factory) *cobra.Command {
|
|||||||
return nil
|
return nil
|
||||||
} else if err == nil {
|
} else if err == nil {
|
||||||
fmt.Fprint(os.Stdout, resp.Message)
|
fmt.Fprint(os.Stdout, resp.Message)
|
||||||
|
} else if code := status.Code(err); code == codes.DeadlineExceeded || code == codes.Canceled {
|
||||||
|
return nil
|
||||||
} else {
|
} else {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@@ -3,13 +3,14 @@ package cmds
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"os"
|
||||||
|
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
cmdutil "k8s.io/kubectl/pkg/cmd/util"
|
cmdutil "k8s.io/kubectl/pkg/cmd/util"
|
||||||
utilcomp "k8s.io/kubectl/pkg/util/completion"
|
utilcomp "k8s.io/kubectl/pkg/util/completion"
|
||||||
"k8s.io/kubectl/pkg/util/i18n"
|
"k8s.io/kubectl/pkg/util/i18n"
|
||||||
"k8s.io/kubectl/pkg/util/templates"
|
"k8s.io/kubectl/pkg/util/templates"
|
||||||
"os"
|
|
||||||
|
|
||||||
"github.com/wencaiwulue/kubevpn/pkg/config"
|
"github.com/wencaiwulue/kubevpn/pkg/config"
|
||||||
"github.com/wencaiwulue/kubevpn/pkg/handler"
|
"github.com/wencaiwulue/kubevpn/pkg/handler"
|
||||||
|
@@ -5,6 +5,8 @@ import (
|
|||||||
"io"
|
"io"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
"google.golang.org/grpc/codes"
|
||||||
|
"google.golang.org/grpc/status"
|
||||||
cmdutil "k8s.io/kubectl/pkg/cmd/util"
|
cmdutil "k8s.io/kubectl/pkg/cmd/util"
|
||||||
|
|
||||||
"github.com/wencaiwulue/kubevpn/pkg/daemon"
|
"github.com/wencaiwulue/kubevpn/pkg/daemon"
|
||||||
@@ -30,6 +32,8 @@ func CmdLeave(f cmdutil.Factory) *cobra.Command {
|
|||||||
recv, err := leave.Recv()
|
recv, err := leave.Recv()
|
||||||
if err == io.EOF {
|
if err == io.EOF {
|
||||||
return nil
|
return nil
|
||||||
|
} else if code := status.Code(err); code == codes.DeadlineExceeded || code == codes.Canceled {
|
||||||
|
return nil
|
||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@@ -1,13 +1,13 @@
|
|||||||
package cmds
|
package cmds
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
"google.golang.org/grpc/codes"
|
||||||
|
"google.golang.org/grpc/status"
|
||||||
cmdutil "k8s.io/kubectl/pkg/cmd/util"
|
cmdutil "k8s.io/kubectl/pkg/cmd/util"
|
||||||
"k8s.io/kubectl/pkg/util/i18n"
|
"k8s.io/kubectl/pkg/util/i18n"
|
||||||
"k8s.io/kubectl/pkg/util/templates"
|
"k8s.io/kubectl/pkg/util/templates"
|
||||||
@@ -39,7 +39,7 @@ func CmdLogs(f cmdutil.Factory) *cobra.Command {
|
|||||||
break
|
break
|
||||||
} else if err == nil {
|
} else if err == nil {
|
||||||
fmt.Fprintln(os.Stdout, resp.Message)
|
fmt.Fprintln(os.Stdout, resp.Message)
|
||||||
} else if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
|
} else if code := status.Code(err); code == codes.DeadlineExceeded || code == codes.Canceled {
|
||||||
return nil
|
return nil
|
||||||
} else {
|
} else {
|
||||||
return err
|
return err
|
||||||
|
@@ -7,6 +7,8 @@ import (
|
|||||||
|
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
"google.golang.org/grpc/codes"
|
||||||
|
"google.golang.org/grpc/status"
|
||||||
cmdutil "k8s.io/kubectl/pkg/cmd/util"
|
cmdutil "k8s.io/kubectl/pkg/cmd/util"
|
||||||
utilcomp "k8s.io/kubectl/pkg/util/completion"
|
utilcomp "k8s.io/kubectl/pkg/util/completion"
|
||||||
"k8s.io/kubectl/pkg/util/i18n"
|
"k8s.io/kubectl/pkg/util/i18n"
|
||||||
@@ -111,6 +113,8 @@ func CmdProxy(f cmdutil.Factory) *cobra.Command {
|
|||||||
break
|
break
|
||||||
} else if err == nil {
|
} else if err == nil {
|
||||||
fmt.Fprint(os.Stdout, resp.Message)
|
fmt.Fprint(os.Stdout, resp.Message)
|
||||||
|
} else if code := status.Code(err); code == codes.DeadlineExceeded || code == codes.Canceled {
|
||||||
|
return nil
|
||||||
} else {
|
} else {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@@ -7,6 +7,8 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
"google.golang.org/grpc/codes"
|
||||||
|
"google.golang.org/grpc/status"
|
||||||
cmdutil "k8s.io/kubectl/pkg/cmd/util"
|
cmdutil "k8s.io/kubectl/pkg/cmd/util"
|
||||||
"k8s.io/kubectl/pkg/util/i18n"
|
"k8s.io/kubectl/pkg/util/i18n"
|
||||||
"k8s.io/kubectl/pkg/util/templates"
|
"k8s.io/kubectl/pkg/util/templates"
|
||||||
@@ -49,6 +51,8 @@ func quit(ctx context.Context, isSudo bool) error {
|
|||||||
break
|
break
|
||||||
} else if err == nil {
|
} else if err == nil {
|
||||||
fmt.Fprint(os.Stdout, resp.Message)
|
fmt.Fprint(os.Stdout, resp.Message)
|
||||||
|
} else if code := status.Code(err); code == codes.DeadlineExceeded || code == codes.Canceled {
|
||||||
|
return nil
|
||||||
} else {
|
} else {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@@ -62,6 +62,7 @@ func NewKubeVPNCommand() *cobra.Command {
|
|||||||
CmdUpgrade(factory),
|
CmdUpgrade(factory),
|
||||||
CmdReset(factory),
|
CmdReset(factory),
|
||||||
CmdVersion(factory),
|
CmdVersion(factory),
|
||||||
|
CmdStatus(factory),
|
||||||
// Hidden, Server Commands (DO NOT USE IT !!!)
|
// Hidden, Server Commands (DO NOT USE IT !!!)
|
||||||
CmdControlPlane(factory),
|
CmdControlPlane(factory),
|
||||||
CmdServe(factory),
|
CmdServe(factory),
|
||||||
|
@@ -5,13 +5,15 @@ import (
|
|||||||
"runtime"
|
"runtime"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
"go.uber.org/automaxprocs/maxprocs"
|
||||||
|
cmdutil "k8s.io/kubectl/pkg/cmd/util"
|
||||||
|
|
||||||
"github.com/wencaiwulue/kubevpn/pkg/config"
|
"github.com/wencaiwulue/kubevpn/pkg/config"
|
||||||
"github.com/wencaiwulue/kubevpn/pkg/core"
|
"github.com/wencaiwulue/kubevpn/pkg/core"
|
||||||
"github.com/wencaiwulue/kubevpn/pkg/handler"
|
"github.com/wencaiwulue/kubevpn/pkg/handler"
|
||||||
"github.com/wencaiwulue/kubevpn/pkg/util"
|
"github.com/wencaiwulue/kubevpn/pkg/util"
|
||||||
"go.uber.org/automaxprocs/maxprocs"
|
|
||||||
cmdutil "k8s.io/kubectl/pkg/cmd/util"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func CmdServe(_ cmdutil.Factory) *cobra.Command {
|
func CmdServe(_ cmdutil.Factory) *cobra.Command {
|
||||||
@@ -29,11 +31,16 @@ func CmdServe(_ cmdutil.Factory) *cobra.Command {
|
|||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
rand.Seed(time.Now().UnixNano())
|
rand.Seed(time.Now().UnixNano())
|
||||||
_, _ = maxprocs.Set(maxprocs.Logger(nil))
|
_, _ = maxprocs.Set(maxprocs.Logger(nil))
|
||||||
err := handler.Complete(route)
|
err := handler.RentIPIfNeeded(route)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer handler.Final()
|
defer func() {
|
||||||
|
err := handler.ReleaseIPIfNeeded()
|
||||||
|
if err != nil {
|
||||||
|
log.Error(err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
servers, err := handler.Parse(*route)
|
servers, err := handler.Parse(*route)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@@ -1 +1,37 @@
|
|||||||
package cmds
|
package cmds
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/spf13/cobra"
|
||||||
|
cmdutil "k8s.io/kubectl/pkg/cmd/util"
|
||||||
|
"k8s.io/kubectl/pkg/util/i18n"
|
||||||
|
"k8s.io/kubectl/pkg/util/templates"
|
||||||
|
|
||||||
|
"github.com/wencaiwulue/kubevpn/pkg/daemon"
|
||||||
|
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc"
|
||||||
|
)
|
||||||
|
|
||||||
|
func CmdStatus(f cmdutil.Factory) *cobra.Command {
|
||||||
|
cmd := &cobra.Command{
|
||||||
|
Use: "status",
|
||||||
|
Short: i18n.T("KubeVPN status"),
|
||||||
|
Long: templates.LongDesc(i18n.T(`KubeVPN status`)),
|
||||||
|
Example: templates.Examples(i18n.T(``)),
|
||||||
|
PreRunE: func(cmd *cobra.Command, args []string) (err error) {
|
||||||
|
return daemon.StartupDaemon(cmd.Context())
|
||||||
|
},
|
||||||
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
|
client, err := daemon.GetClient(false).Status(
|
||||||
|
cmd.Context(),
|
||||||
|
&rpc.StatusRequest{},
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
fmt.Print(client.GetMessage())
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
return cmd
|
||||||
|
}
|
||||||
|
@@ -35,6 +35,7 @@ func CmdVersion(cmdutil.Factory) *cobra.Command {
|
|||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
fmt.Printf("KubeVPN: CLI\n")
|
fmt.Printf("KubeVPN: CLI\n")
|
||||||
fmt.Printf(" Version: %s\n", config.Version)
|
fmt.Printf(" Version: %s\n", config.Version)
|
||||||
|
fmt.Printf(" DaemonVersion: %s\n", config.Version)
|
||||||
fmt.Printf(" Image: %s\n", config.Image)
|
fmt.Printf(" Image: %s\n", config.Image)
|
||||||
fmt.Printf(" Branch: %s\n", Branch)
|
fmt.Printf(" Branch: %s\n", Branch)
|
||||||
fmt.Printf(" Git commit: %s\n", config.GitCommit)
|
fmt.Printf(" Git commit: %s\n", config.GitCommit)
|
||||||
|
@@ -9,8 +9,8 @@ const (
|
|||||||
SockPath = "daemon.sock"
|
SockPath = "daemon.sock"
|
||||||
SudoSockPath = "sudo_daemon.sock"
|
SudoSockPath = "sudo_daemon.sock"
|
||||||
|
|
||||||
PidPath = "daemon_pid"
|
PidPath = "daemon.pid"
|
||||||
SudoPidPath = "sudo_daemon_pid"
|
SudoPidPath = "sudo_daemon.pid"
|
||||||
|
|
||||||
LogFile = "daemon.log"
|
LogFile = "daemon.log"
|
||||||
|
|
||||||
|
@@ -74,12 +74,12 @@ func InitFactory(kubeconfigBytes string, ns string) cmdutil.Factory {
|
|||||||
|
|
||||||
func (svr *Server) Connect(req *rpc.ConnectRequest, resp rpc.Daemon_ConnectServer) error {
|
func (svr *Server) Connect(req *rpc.ConnectRequest, resp rpc.Daemon_ConnectServer) error {
|
||||||
origin := log.StandardLogger().Out
|
origin := log.StandardLogger().Out
|
||||||
out := io.MultiWriter(newWarp(resp), origin)
|
|
||||||
log.SetOutput(out)
|
|
||||||
defer func() {
|
defer func() {
|
||||||
log.SetOutput(origin)
|
log.SetOutput(origin)
|
||||||
log.SetLevel(log.DebugLevel)
|
log.SetLevel(log.DebugLevel)
|
||||||
}()
|
}()
|
||||||
|
out := io.MultiWriter(newWarp(resp), origin)
|
||||||
|
log.SetOutput(out)
|
||||||
util.InitLogger(false)
|
util.InitLogger(false)
|
||||||
if !svr.IsSudo {
|
if !svr.IsSudo {
|
||||||
return svr.redirectToSudoDaemon(req, resp)
|
return svr.redirectToSudoDaemon(req, resp)
|
||||||
|
@@ -17,6 +17,7 @@ func (svr *Server) Logs(req *rpc.LogRequest, resp rpc.Daemon_LogsServer) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
defer file.Stop()
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case <-resp.Context().Done():
|
case <-resp.Context().Done():
|
||||||
|
@@ -7,7 +7,11 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func (svr *Server) Status(ctx context.Context, request *rpc.StatusRequest) (*rpc.StatusResponse, error) {
|
func (svr *Server) Status(ctx context.Context, request *rpc.StatusRequest) (*rpc.StatusResponse, error) {
|
||||||
|
status := "None"
|
||||||
|
if svr.connect != nil {
|
||||||
|
status = "Connected"
|
||||||
|
}
|
||||||
return &rpc.StatusResponse{
|
return &rpc.StatusResponse{
|
||||||
Message: "i am fine",
|
Message: status,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
@@ -1 +1,34 @@
|
|||||||
package action
|
package action
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
|
||||||
|
goversion "github.com/hashicorp/go-version"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
|
||||||
|
"github.com/wencaiwulue/kubevpn/pkg/config"
|
||||||
|
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc"
|
||||||
|
)
|
||||||
|
|
||||||
|
func (svr *Server) Upgrade(req *rpc.UpgradeRequest, resp rpc.Daemon_UpgradeServer) error {
|
||||||
|
var err error
|
||||||
|
var clientVersion, daemonVersion *goversion.Version
|
||||||
|
clientVersion, err = goversion.NewVersion(req.ClientVersion)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
daemonVersion, err = goversion.NewVersion(config.Version)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if clientVersion.GreaterThan(daemonVersion) || (clientVersion.Equal(daemonVersion) && req.ClientCommitId == config.GitCommit) {
|
||||||
|
log.Info("Already up to date, don't needs to upgrade")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
executable, err := os.Executable()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
println(executable)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
@@ -20,6 +20,7 @@ import (
|
|||||||
|
|
||||||
"github.com/wencaiwulue/kubevpn/pkg/config"
|
"github.com/wencaiwulue/kubevpn/pkg/config"
|
||||||
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc"
|
"github.com/wencaiwulue/kubevpn/pkg/daemon/rpc"
|
||||||
|
"github.com/wencaiwulue/kubevpn/pkg/util"
|
||||||
)
|
)
|
||||||
|
|
||||||
var daemonClient, sudoDaemonClient rpc.DaemonClient
|
var daemonClient, sudoDaemonClient rpc.DaemonClient
|
||||||
@@ -87,11 +88,27 @@ func GetPidPath(isSudo bool) string {
|
|||||||
return filepath.Join(config.DaemonPath, name)
|
return filepath.Join(config.DaemonPath, name)
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetDaemonCommand(isSudo bool) *exec.Cmd {
|
func GetDaemonCommand(isSudo bool) error {
|
||||||
if isSudo {
|
exe, err := os.Executable()
|
||||||
return exec.Command("sudo", "--preserve-env", os.Args[0], "daemon", "--sudo")
|
if err != nil {
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
return exec.Command(os.Args[0], "daemon")
|
fmt.Println(exe)
|
||||||
|
if isSudo {
|
||||||
|
return util.RunCmdWithElevated([]string{"daemon", "--sudo"})
|
||||||
|
}
|
||||||
|
cmd := exec.Command(exe, "daemon")
|
||||||
|
err = cmd.Start()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
go func() {
|
||||||
|
err := cmd.Wait()
|
||||||
|
if err != nil {
|
||||||
|
log.Error(err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func StartupDaemon(ctx context.Context) error {
|
func StartupDaemon(ctx context.Context) error {
|
||||||
@@ -127,27 +144,27 @@ func runDaemon(ctx context.Context, isSudo bool) error {
|
|||||||
if err = p.Kill(); err != nil && err != os.ErrProcessDone {
|
if err = p.Kill(); err != nil && err != os.ErrProcessDone {
|
||||||
log.Error(err)
|
log.Error(err)
|
||||||
}
|
}
|
||||||
|
p.Wait()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
cmd := GetDaemonCommand(isSudo)
|
err = GetDaemonCommand(isSudo)
|
||||||
cmd.Stdin = os.Stdin
|
|
||||||
cmd.Stdout = os.Stdout
|
|
||||||
cmd.Stderr = os.Stderr
|
|
||||||
if err = cmd.Start(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
err = os.WriteFile(pidPath, []byte(strconv.Itoa(cmd.Process.Pid)), os.ModePerm)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
err = os.Chmod(GetPidPath(false), os.ModePerm)
|
//cmd.Stdin = os.Stdin
|
||||||
if err != nil {
|
//cmd.Stdout = os.Stdout
|
||||||
return err
|
//cmd.Stderr = os.Stderr
|
||||||
}
|
//if err = cmd.Start(); err != nil {
|
||||||
go func() {
|
// return err
|
||||||
cmd.Wait()
|
//}
|
||||||
}()
|
//err = os.WriteFile(pidPath, []byte(strconv.Itoa(cmd.Process.Pid)), os.ModePerm)
|
||||||
|
//if err != nil {
|
||||||
|
// return err
|
||||||
|
//}
|
||||||
|
//go func() {
|
||||||
|
// cmd.Wait()
|
||||||
|
//}()
|
||||||
|
|
||||||
for ctx.Err() == nil {
|
for ctx.Err() == nil {
|
||||||
time.Sleep(time.Millisecond * 50)
|
time.Sleep(time.Millisecond * 50)
|
||||||
@@ -156,6 +173,11 @@ func runDaemon(ctx context.Context, isSudo bool) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
err = os.Chmod(GetPidPath(false), os.ModePerm)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
client := GetClient(isSudo)
|
client := GetClient(isSudo)
|
||||||
if client == nil {
|
if client == nil {
|
||||||
return fmt.Errorf("can not get daemon server client")
|
return fmt.Errorf("can not get daemon server client")
|
||||||
|
@@ -782,6 +782,108 @@ func (x *LeaveResponse) GetMessage() string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type UpgradeRequest struct {
|
||||||
|
state protoimpl.MessageState
|
||||||
|
sizeCache protoimpl.SizeCache
|
||||||
|
unknownFields protoimpl.UnknownFields
|
||||||
|
|
||||||
|
ClientVersion string `protobuf:"bytes,1,opt,name=ClientVersion,proto3" json:"ClientVersion,omitempty"`
|
||||||
|
ClientCommitId string `protobuf:"bytes,2,opt,name=ClientCommitId,proto3" json:"ClientCommitId,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *UpgradeRequest) Reset() {
|
||||||
|
*x = UpgradeRequest{}
|
||||||
|
if protoimpl.UnsafeEnabled {
|
||||||
|
mi := &file_daemon_proto_msgTypes[14]
|
||||||
|
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||||
|
ms.StoreMessageInfo(mi)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *UpgradeRequest) String() string {
|
||||||
|
return protoimpl.X.MessageStringOf(x)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*UpgradeRequest) ProtoMessage() {}
|
||||||
|
|
||||||
|
func (x *UpgradeRequest) ProtoReflect() protoreflect.Message {
|
||||||
|
mi := &file_daemon_proto_msgTypes[14]
|
||||||
|
if protoimpl.UnsafeEnabled && x != nil {
|
||||||
|
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||||
|
if ms.LoadMessageInfo() == nil {
|
||||||
|
ms.StoreMessageInfo(mi)
|
||||||
|
}
|
||||||
|
return ms
|
||||||
|
}
|
||||||
|
return mi.MessageOf(x)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Deprecated: Use UpgradeRequest.ProtoReflect.Descriptor instead.
|
||||||
|
func (*UpgradeRequest) Descriptor() ([]byte, []int) {
|
||||||
|
return file_daemon_proto_rawDescGZIP(), []int{14}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *UpgradeRequest) GetClientVersion() string {
|
||||||
|
if x != nil {
|
||||||
|
return x.ClientVersion
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *UpgradeRequest) GetClientCommitId() string {
|
||||||
|
if x != nil {
|
||||||
|
return x.ClientCommitId
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
type UpgradeResponse struct {
|
||||||
|
state protoimpl.MessageState
|
||||||
|
sizeCache protoimpl.SizeCache
|
||||||
|
unknownFields protoimpl.UnknownFields
|
||||||
|
|
||||||
|
Message string `protobuf:"bytes,1,opt,name=message,proto3" json:"message,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *UpgradeResponse) Reset() {
|
||||||
|
*x = UpgradeResponse{}
|
||||||
|
if protoimpl.UnsafeEnabled {
|
||||||
|
mi := &file_daemon_proto_msgTypes[15]
|
||||||
|
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||||
|
ms.StoreMessageInfo(mi)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *UpgradeResponse) String() string {
|
||||||
|
return protoimpl.X.MessageStringOf(x)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*UpgradeResponse) ProtoMessage() {}
|
||||||
|
|
||||||
|
func (x *UpgradeResponse) ProtoReflect() protoreflect.Message {
|
||||||
|
mi := &file_daemon_proto_msgTypes[15]
|
||||||
|
if protoimpl.UnsafeEnabled && x != nil {
|
||||||
|
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||||
|
if ms.LoadMessageInfo() == nil {
|
||||||
|
ms.StoreMessageInfo(mi)
|
||||||
|
}
|
||||||
|
return ms
|
||||||
|
}
|
||||||
|
return mi.MessageOf(x)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Deprecated: Use UpgradeResponse.ProtoReflect.Descriptor instead.
|
||||||
|
func (*UpgradeResponse) Descriptor() ([]byte, []int) {
|
||||||
|
return file_daemon_proto_rawDescGZIP(), []int{15}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *UpgradeResponse) GetMessage() string {
|
||||||
|
if x != nil {
|
||||||
|
return x.Message
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
var File_daemon_proto protoreflect.FileDescriptor
|
var File_daemon_proto protoreflect.FileDescriptor
|
||||||
|
|
||||||
var file_daemon_proto_rawDesc = []byte{
|
var file_daemon_proto_rawDesc = []byte{
|
||||||
@@ -854,36 +956,48 @@ var file_daemon_proto_rawDesc = []byte{
|
|||||||
0x03, 0x28, 0x09, 0x52, 0x09, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x22, 0x29,
|
0x03, 0x28, 0x09, 0x52, 0x09, 0x57, 0x6f, 0x72, 0x6b, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x22, 0x29,
|
||||||
0x0a, 0x0d, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
|
0x0a, 0x0d, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
|
||||||
0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||||
0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0xb5, 0x03, 0x0a, 0x06, 0x44, 0x61,
|
0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x5e, 0x0a, 0x0e, 0x55, 0x70, 0x67,
|
||||||
0x65, 0x6d, 0x6f, 0x6e, 0x12, 0x38, 0x0a, 0x07, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x12,
|
0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x43,
|
||||||
0x13, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71,
|
0x6c, 0x69, 0x65, 0x6e, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01,
|
||||||
0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
|
0x28, 0x09, 0x52, 0x0d, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f,
|
||||||
0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x36,
|
0x6e, 0x12, 0x26, 0x0a, 0x0e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69,
|
||||||
0x0a, 0x05, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x13, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f,
|
0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x43, 0x6c, 0x69, 0x65, 0x6e,
|
||||||
0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x72,
|
0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x49, 0x64, 0x22, 0x2b, 0x0a, 0x0f, 0x55, 0x70, 0x67,
|
||||||
0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
|
0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07,
|
||||||
0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x41, 0x0a, 0x0a, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e,
|
0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d,
|
||||||
0x6e, 0x65, 0x63, 0x74, 0x12, 0x16, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f,
|
0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x32, 0xef, 0x03, 0x0a, 0x06, 0x44, 0x61, 0x65, 0x6d, 0x6f,
|
||||||
0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x72,
|
0x6e, 0x12, 0x38, 0x0a, 0x07, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x12, 0x13, 0x2e, 0x72,
|
||||||
0x70, 0x63, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73,
|
0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
|
||||||
0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x2d, 0x0a, 0x04, 0x4c, 0x6f, 0x67,
|
0x74, 0x1a, 0x14, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52,
|
||||||
0x73, 0x12, 0x0f, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65,
|
0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x36, 0x0a, 0x05, 0x50,
|
||||||
0x73, 0x74, 0x1a, 0x10, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70,
|
0x72, 0x6f, 0x78, 0x79, 0x12, 0x13, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65,
|
||||||
0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x33, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74,
|
0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x72, 0x70, 0x63, 0x2e,
|
||||||
0x75, 0x73, 0x12, 0x12, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52,
|
0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
|
||||||
0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x74, 0x61,
|
0x00, 0x30, 0x01, 0x12, 0x41, 0x0a, 0x0a, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
|
||||||
0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x2f, 0x0a,
|
0x74, 0x12, 0x16, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
|
||||||
0x04, 0x51, 0x75, 0x69, 0x74, 0x12, 0x10, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x51, 0x75, 0x69, 0x74,
|
0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x72, 0x70, 0x63, 0x2e,
|
||||||
0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x51, 0x75,
|
0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
|
||||||
0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x2d,
|
0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x2d, 0x0a, 0x04, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x0f,
|
||||||
0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x10, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x69, 0x73,
|
0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
|
||||||
0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c,
|
0x10, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x6f, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
|
||||||
0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x32, 0x0a,
|
0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x33, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12,
|
||||||
0x05, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x12, 0x11, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x65, 0x61,
|
0x12, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75,
|
||||||
0x76, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x72, 0x70, 0x63, 0x2e,
|
0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
|
||||||
0x4c, 0x65, 0x61, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30,
|
0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x2f, 0x0a, 0x04, 0x51, 0x75,
|
||||||
0x01, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x3b, 0x72, 0x70, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
|
0x69, 0x74, 0x12, 0x10, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x51, 0x75, 0x69, 0x74, 0x52, 0x65, 0x71,
|
||||||
0x6f, 0x33,
|
0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x51, 0x75, 0x69, 0x74, 0x52,
|
||||||
|
0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x2d, 0x0a, 0x04, 0x4c,
|
||||||
|
0x69, 0x73, 0x74, 0x12, 0x10, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
|
||||||
|
0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x69, 0x73, 0x74,
|
||||||
|
0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x32, 0x0a, 0x05, 0x4c, 0x65,
|
||||||
|
0x61, 0x76, 0x65, 0x12, 0x11, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x52,
|
||||||
|
0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x65, 0x61,
|
||||||
|
0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x38,
|
||||||
|
0x0a, 0x07, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x12, 0x13, 0x2e, 0x72, 0x70, 0x63, 0x2e,
|
||||||
|
0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14,
|
||||||
|
0x2e, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70,
|
||||||
|
0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x3b, 0x72, 0x70,
|
||||||
|
0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@@ -898,7 +1012,7 @@ func file_daemon_proto_rawDescGZIP() []byte {
|
|||||||
return file_daemon_proto_rawDescData
|
return file_daemon_proto_rawDescData
|
||||||
}
|
}
|
||||||
|
|
||||||
var file_daemon_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
|
var file_daemon_proto_msgTypes = make([]protoimpl.MessageInfo, 17)
|
||||||
var file_daemon_proto_goTypes = []interface{}{
|
var file_daemon_proto_goTypes = []interface{}{
|
||||||
(*ConnectRequest)(nil), // 0: rpc.ConnectRequest
|
(*ConnectRequest)(nil), // 0: rpc.ConnectRequest
|
||||||
(*ConnectResponse)(nil), // 1: rpc.ConnectResponse
|
(*ConnectResponse)(nil), // 1: rpc.ConnectResponse
|
||||||
@@ -914,10 +1028,12 @@ var file_daemon_proto_goTypes = []interface{}{
|
|||||||
(*ListResponse)(nil), // 11: rpc.ListResponse
|
(*ListResponse)(nil), // 11: rpc.ListResponse
|
||||||
(*LeaveRequest)(nil), // 12: rpc.LeaveRequest
|
(*LeaveRequest)(nil), // 12: rpc.LeaveRequest
|
||||||
(*LeaveResponse)(nil), // 13: rpc.LeaveResponse
|
(*LeaveResponse)(nil), // 13: rpc.LeaveResponse
|
||||||
nil, // 14: rpc.ConnectRequest.HeadersEntry
|
(*UpgradeRequest)(nil), // 14: rpc.UpgradeRequest
|
||||||
|
(*UpgradeResponse)(nil), // 15: rpc.UpgradeResponse
|
||||||
|
nil, // 16: rpc.ConnectRequest.HeadersEntry
|
||||||
}
|
}
|
||||||
var file_daemon_proto_depIdxs = []int32{
|
var file_daemon_proto_depIdxs = []int32{
|
||||||
14, // 0: rpc.ConnectRequest.Headers:type_name -> rpc.ConnectRequest.HeadersEntry
|
16, // 0: rpc.ConnectRequest.Headers:type_name -> rpc.ConnectRequest.HeadersEntry
|
||||||
0, // 1: rpc.Daemon.Connect:input_type -> rpc.ConnectRequest
|
0, // 1: rpc.Daemon.Connect:input_type -> rpc.ConnectRequest
|
||||||
0, // 2: rpc.Daemon.Proxy:input_type -> rpc.ConnectRequest
|
0, // 2: rpc.Daemon.Proxy:input_type -> rpc.ConnectRequest
|
||||||
8, // 3: rpc.Daemon.Disconnect:input_type -> rpc.DisconnectRequest
|
8, // 3: rpc.Daemon.Disconnect:input_type -> rpc.DisconnectRequest
|
||||||
@@ -926,16 +1042,18 @@ var file_daemon_proto_depIdxs = []int32{
|
|||||||
2, // 6: rpc.Daemon.Quit:input_type -> rpc.QuitRequest
|
2, // 6: rpc.Daemon.Quit:input_type -> rpc.QuitRequest
|
||||||
10, // 7: rpc.Daemon.List:input_type -> rpc.ListRequest
|
10, // 7: rpc.Daemon.List:input_type -> rpc.ListRequest
|
||||||
12, // 8: rpc.Daemon.Leave:input_type -> rpc.LeaveRequest
|
12, // 8: rpc.Daemon.Leave:input_type -> rpc.LeaveRequest
|
||||||
1, // 9: rpc.Daemon.Connect:output_type -> rpc.ConnectResponse
|
14, // 9: rpc.Daemon.Upgrade:input_type -> rpc.UpgradeRequest
|
||||||
1, // 10: rpc.Daemon.Proxy:output_type -> rpc.ConnectResponse
|
1, // 10: rpc.Daemon.Connect:output_type -> rpc.ConnectResponse
|
||||||
9, // 11: rpc.Daemon.Disconnect:output_type -> rpc.DisconnectResponse
|
1, // 11: rpc.Daemon.Proxy:output_type -> rpc.ConnectResponse
|
||||||
7, // 12: rpc.Daemon.Logs:output_type -> rpc.LogResponse
|
9, // 12: rpc.Daemon.Disconnect:output_type -> rpc.DisconnectResponse
|
||||||
5, // 13: rpc.Daemon.Status:output_type -> rpc.StatusResponse
|
7, // 13: rpc.Daemon.Logs:output_type -> rpc.LogResponse
|
||||||
3, // 14: rpc.Daemon.Quit:output_type -> rpc.QuitResponse
|
5, // 14: rpc.Daemon.Status:output_type -> rpc.StatusResponse
|
||||||
11, // 15: rpc.Daemon.List:output_type -> rpc.ListResponse
|
3, // 15: rpc.Daemon.Quit:output_type -> rpc.QuitResponse
|
||||||
13, // 16: rpc.Daemon.Leave:output_type -> rpc.LeaveResponse
|
11, // 16: rpc.Daemon.List:output_type -> rpc.ListResponse
|
||||||
9, // [9:17] is the sub-list for method output_type
|
13, // 17: rpc.Daemon.Leave:output_type -> rpc.LeaveResponse
|
||||||
1, // [1:9] is the sub-list for method input_type
|
15, // 18: rpc.Daemon.Upgrade:output_type -> rpc.UpgradeResponse
|
||||||
|
10, // [10:19] is the sub-list for method output_type
|
||||||
|
1, // [1:10] is the sub-list for method input_type
|
||||||
1, // [1:1] is the sub-list for extension type_name
|
1, // [1:1] is the sub-list for extension type_name
|
||||||
1, // [1:1] is the sub-list for extension extendee
|
1, // [1:1] is the sub-list for extension extendee
|
||||||
0, // [0:1] is the sub-list for field type_name
|
0, // [0:1] is the sub-list for field type_name
|
||||||
@@ -1115,6 +1233,30 @@ func file_daemon_proto_init() {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
file_daemon_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
|
||||||
|
switch v := v.(*UpgradeRequest); i {
|
||||||
|
case 0:
|
||||||
|
return &v.state
|
||||||
|
case 1:
|
||||||
|
return &v.sizeCache
|
||||||
|
case 2:
|
||||||
|
return &v.unknownFields
|
||||||
|
default:
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
file_daemon_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
|
||||||
|
switch v := v.(*UpgradeResponse); i {
|
||||||
|
case 0:
|
||||||
|
return &v.state
|
||||||
|
case 1:
|
||||||
|
return &v.sizeCache
|
||||||
|
case 2:
|
||||||
|
return &v.unknownFields
|
||||||
|
default:
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
type x struct{}
|
type x struct{}
|
||||||
out := protoimpl.TypeBuilder{
|
out := protoimpl.TypeBuilder{
|
||||||
@@ -1122,7 +1264,7 @@ func file_daemon_proto_init() {
|
|||||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||||
RawDescriptor: file_daemon_proto_rawDesc,
|
RawDescriptor: file_daemon_proto_rawDesc,
|
||||||
NumEnums: 0,
|
NumEnums: 0,
|
||||||
NumMessages: 15,
|
NumMessages: 17,
|
||||||
NumExtensions: 0,
|
NumExtensions: 0,
|
||||||
NumServices: 1,
|
NumServices: 1,
|
||||||
},
|
},
|
||||||
|
@@ -13,6 +13,7 @@ service Daemon {
|
|||||||
rpc Quit (QuitRequest) returns (stream QuitResponse) {}
|
rpc Quit (QuitRequest) returns (stream QuitResponse) {}
|
||||||
rpc List (ListRequest) returns (ListResponse) {}
|
rpc List (ListRequest) returns (ListResponse) {}
|
||||||
rpc Leave (LeaveRequest) returns (stream LeaveResponse) {}
|
rpc Leave (LeaveRequest) returns (stream LeaveResponse) {}
|
||||||
|
rpc Upgrade (UpgradeRequest) returns (stream UpgradeResponse) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
message ConnectRequest {
|
message ConnectRequest {
|
||||||
@@ -87,4 +88,13 @@ message LeaveRequest {
|
|||||||
|
|
||||||
message LeaveResponse {
|
message LeaveResponse {
|
||||||
string message = 1;
|
string message = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
message UpgradeRequest {
|
||||||
|
string ClientVersion = 1;
|
||||||
|
string ClientCommitId = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message UpgradeResponse {
|
||||||
|
string message = 1;
|
||||||
}
|
}
|
@@ -27,6 +27,7 @@ const (
|
|||||||
Daemon_Quit_FullMethodName = "/rpc.Daemon/Quit"
|
Daemon_Quit_FullMethodName = "/rpc.Daemon/Quit"
|
||||||
Daemon_List_FullMethodName = "/rpc.Daemon/List"
|
Daemon_List_FullMethodName = "/rpc.Daemon/List"
|
||||||
Daemon_Leave_FullMethodName = "/rpc.Daemon/Leave"
|
Daemon_Leave_FullMethodName = "/rpc.Daemon/Leave"
|
||||||
|
Daemon_Upgrade_FullMethodName = "/rpc.Daemon/Upgrade"
|
||||||
)
|
)
|
||||||
|
|
||||||
// DaemonClient is the client API for Daemon service.
|
// DaemonClient is the client API for Daemon service.
|
||||||
@@ -41,6 +42,7 @@ type DaemonClient interface {
|
|||||||
Quit(ctx context.Context, in *QuitRequest, opts ...grpc.CallOption) (Daemon_QuitClient, error)
|
Quit(ctx context.Context, in *QuitRequest, opts ...grpc.CallOption) (Daemon_QuitClient, error)
|
||||||
List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error)
|
List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error)
|
||||||
Leave(ctx context.Context, in *LeaveRequest, opts ...grpc.CallOption) (Daemon_LeaveClient, error)
|
Leave(ctx context.Context, in *LeaveRequest, opts ...grpc.CallOption) (Daemon_LeaveClient, error)
|
||||||
|
Upgrade(ctx context.Context, in *UpgradeRequest, opts ...grpc.CallOption) (Daemon_UpgradeClient, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
type daemonClient struct {
|
type daemonClient struct {
|
||||||
@@ -261,6 +263,38 @@ func (x *daemonLeaveClient) Recv() (*LeaveResponse, error) {
|
|||||||
return m, nil
|
return m, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *daemonClient) Upgrade(ctx context.Context, in *UpgradeRequest, opts ...grpc.CallOption) (Daemon_UpgradeClient, error) {
|
||||||
|
stream, err := c.cc.NewStream(ctx, &Daemon_ServiceDesc.Streams[6], Daemon_Upgrade_FullMethodName, opts...)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
x := &daemonUpgradeClient{stream}
|
||||||
|
if err := x.ClientStream.SendMsg(in); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
if err := x.ClientStream.CloseSend(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return x, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type Daemon_UpgradeClient interface {
|
||||||
|
Recv() (*UpgradeResponse, error)
|
||||||
|
grpc.ClientStream
|
||||||
|
}
|
||||||
|
|
||||||
|
type daemonUpgradeClient struct {
|
||||||
|
grpc.ClientStream
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *daemonUpgradeClient) Recv() (*UpgradeResponse, error) {
|
||||||
|
m := new(UpgradeResponse)
|
||||||
|
if err := x.ClientStream.RecvMsg(m); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return m, nil
|
||||||
|
}
|
||||||
|
|
||||||
// DaemonServer is the server API for Daemon service.
|
// DaemonServer is the server API for Daemon service.
|
||||||
// All implementations must embed UnimplementedDaemonServer
|
// All implementations must embed UnimplementedDaemonServer
|
||||||
// for forward compatibility
|
// for forward compatibility
|
||||||
@@ -273,6 +307,7 @@ type DaemonServer interface {
|
|||||||
Quit(*QuitRequest, Daemon_QuitServer) error
|
Quit(*QuitRequest, Daemon_QuitServer) error
|
||||||
List(context.Context, *ListRequest) (*ListResponse, error)
|
List(context.Context, *ListRequest) (*ListResponse, error)
|
||||||
Leave(*LeaveRequest, Daemon_LeaveServer) error
|
Leave(*LeaveRequest, Daemon_LeaveServer) error
|
||||||
|
Upgrade(*UpgradeRequest, Daemon_UpgradeServer) error
|
||||||
mustEmbedUnimplementedDaemonServer()
|
mustEmbedUnimplementedDaemonServer()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -304,6 +339,9 @@ func (UnimplementedDaemonServer) List(context.Context, *ListRequest) (*ListRespo
|
|||||||
func (UnimplementedDaemonServer) Leave(*LeaveRequest, Daemon_LeaveServer) error {
|
func (UnimplementedDaemonServer) Leave(*LeaveRequest, Daemon_LeaveServer) error {
|
||||||
return status.Errorf(codes.Unimplemented, "method Leave not implemented")
|
return status.Errorf(codes.Unimplemented, "method Leave not implemented")
|
||||||
}
|
}
|
||||||
|
func (UnimplementedDaemonServer) Upgrade(*UpgradeRequest, Daemon_UpgradeServer) error {
|
||||||
|
return status.Errorf(codes.Unimplemented, "method Upgrade not implemented")
|
||||||
|
}
|
||||||
func (UnimplementedDaemonServer) mustEmbedUnimplementedDaemonServer() {}
|
func (UnimplementedDaemonServer) mustEmbedUnimplementedDaemonServer() {}
|
||||||
|
|
||||||
// UnsafeDaemonServer may be embedded to opt out of forward compatibility for this service.
|
// UnsafeDaemonServer may be embedded to opt out of forward compatibility for this service.
|
||||||
@@ -479,6 +517,27 @@ func (x *daemonLeaveServer) Send(m *LeaveResponse) error {
|
|||||||
return x.ServerStream.SendMsg(m)
|
return x.ServerStream.SendMsg(m)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func _Daemon_Upgrade_Handler(srv interface{}, stream grpc.ServerStream) error {
|
||||||
|
m := new(UpgradeRequest)
|
||||||
|
if err := stream.RecvMsg(m); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return srv.(DaemonServer).Upgrade(m, &daemonUpgradeServer{stream})
|
||||||
|
}
|
||||||
|
|
||||||
|
type Daemon_UpgradeServer interface {
|
||||||
|
Send(*UpgradeResponse) error
|
||||||
|
grpc.ServerStream
|
||||||
|
}
|
||||||
|
|
||||||
|
type daemonUpgradeServer struct {
|
||||||
|
grpc.ServerStream
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *daemonUpgradeServer) Send(m *UpgradeResponse) error {
|
||||||
|
return x.ServerStream.SendMsg(m)
|
||||||
|
}
|
||||||
|
|
||||||
// Daemon_ServiceDesc is the grpc.ServiceDesc for Daemon service.
|
// Daemon_ServiceDesc is the grpc.ServiceDesc for Daemon service.
|
||||||
// It's only intended for direct use with grpc.RegisterService,
|
// It's only intended for direct use with grpc.RegisterService,
|
||||||
// and not to be introspected or modified (even as a copy)
|
// and not to be introspected or modified (even as a copy)
|
||||||
@@ -526,6 +585,11 @@ var Daemon_ServiceDesc = grpc.ServiceDesc{
|
|||||||
Handler: _Daemon_Leave_Handler,
|
Handler: _Daemon_Leave_Handler,
|
||||||
ServerStreams: true,
|
ServerStreams: true,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
StreamName: "Upgrade",
|
||||||
|
Handler: _Daemon_Upgrade_Handler,
|
||||||
|
ServerStreams: true,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
Metadata: "daemon.proto",
|
Metadata: "daemon.proto",
|
||||||
}
|
}
|
||||||
|
@@ -4,7 +4,6 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"google.golang.org/grpc/metadata"
|
|
||||||
"io"
|
"io"
|
||||||
"math"
|
"math"
|
||||||
"math/rand"
|
"math/rand"
|
||||||
@@ -29,6 +28,7 @@ import (
|
|||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/spf13/pflag"
|
"github.com/spf13/pflag"
|
||||||
"golang.org/x/sync/errgroup"
|
"golang.org/x/sync/errgroup"
|
||||||
|
"google.golang.org/grpc/metadata"
|
||||||
v1 "k8s.io/api/core/v1"
|
v1 "k8s.io/api/core/v1"
|
||||||
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
|
@@ -13,7 +13,7 @@ import (
|
|||||||
"github.com/wencaiwulue/kubevpn/pkg/util"
|
"github.com/wencaiwulue/kubevpn/pkg/util"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Complete(route *core.Route) error {
|
func RentIPIfNeeded(route *core.Route) error {
|
||||||
if v, ok := os.LookupEnv(config.EnvInboundPodTunIPv4); ok && v == "" {
|
if v, ok := os.LookupEnv(config.EnvInboundPodTunIPv4); ok && v == "" {
|
||||||
namespace := os.Getenv(config.EnvPodNamespace)
|
namespace := os.Getenv(config.EnvPodNamespace)
|
||||||
if namespace == "" {
|
if namespace == "" {
|
||||||
@@ -60,7 +60,7 @@ func Complete(route *core.Route) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func Final() error {
|
func ReleaseIPIfNeeded() error {
|
||||||
namespace := os.Getenv(config.EnvPodNamespace)
|
namespace := os.Getenv(config.EnvPodNamespace)
|
||||||
url := fmt.Sprintf("https://%s:80%s", util.GetTlsDomain(namespace), config.APIReleaseIP)
|
url := fmt.Sprintf("https://%s:80%s", util.GetTlsDomain(namespace), config.APIReleaseIP)
|
||||||
req, err := http.NewRequest("DELETE", url, nil)
|
req, err := http.NewRequest("DELETE", url, nil)
|
||||||
|
51
pkg/util/elevate_others.go
Normal file
51
pkg/util/elevate_others.go
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
//go:build !windows
|
||||||
|
// +build !windows
|
||||||
|
|
||||||
|
package util
|
||||||
|
|
||||||
|
import (
|
||||||
|
"flag"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
"k8s.io/client-go/tools/clientcmd"
|
||||||
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"runtime"
|
||||||
|
)
|
||||||
|
|
||||||
|
func RunCmdWithElevated(args []string) error {
|
||||||
|
// fix if startup with normal user, after elevated home dir will change to root user in linux
|
||||||
|
// but unix don't have this issue
|
||||||
|
if runtime.GOOS == "linux" && flag.Lookup("kubeconfig") == nil {
|
||||||
|
if _, err := os.Stat(clientcmd.RecommendedHomeFile); err == nil {
|
||||||
|
os.Args = append(os.Args, "--kubeconfig", clientcmd.RecommendedHomeFile)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
exe, err := os.Executable()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
cmd := exec.Command("sudo", append([]string{"--preserve-env", exe}, args...)...)
|
||||||
|
log.Debug(cmd.Args)
|
||||||
|
cmd.Stdout = os.Stdout
|
||||||
|
cmd.Stderr = os.Stderr
|
||||||
|
cmd.Stdin = os.Stdin
|
||||||
|
cmd.Env = append(os.Environ(), envStartSudoKubeVPNByKubeVPN+"=1")
|
||||||
|
//// while send single CTRL+C, command will quit immediately, but output will cut off and print util quit final
|
||||||
|
//// so, mute single CTRL+C, let inner command handle single only
|
||||||
|
//go func() {
|
||||||
|
// signals := make(chan os.Signal)
|
||||||
|
// signal.Notify(signals, os.Interrupt, os.Kill, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGKILL, syscall.SIGSTOP)
|
||||||
|
// <-signals
|
||||||
|
//}()
|
||||||
|
err = cmd.Start()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
go func() {
|
||||||
|
err := cmd.Wait()
|
||||||
|
if err != nil {
|
||||||
|
log.Warn(err)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
return nil
|
||||||
|
}
|
52
pkg/util/elevate_windows.go
Normal file
52
pkg/util/elevate_windows.go
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
//go:build windows
|
||||||
|
// +build windows
|
||||||
|
|
||||||
|
package util
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
"syscall"
|
||||||
|
|
||||||
|
"github.com/sirupsen/logrus"
|
||||||
|
"golang.org/x/sys/windows"
|
||||||
|
)
|
||||||
|
|
||||||
|
// ref https://stackoverflow.com/questions/31558066/how-to-ask-for-administer-privileges-on-windows-with-go
|
||||||
|
func RunCmdWithElevated(arg []string) error {
|
||||||
|
verb := "runas"
|
||||||
|
exe, err := os.Executable()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
cwd, err := os.Getwd()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
args := strings.Join(arg, " ")
|
||||||
|
|
||||||
|
verbPtr, err := windows.UTF16PtrFromString(verb)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
exePtr, err := syscall.UTF16PtrFromString(exe)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
cwdPtr, err := syscall.UTF16PtrFromString(cwd)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
argPtr, err := syscall.UTF16PtrFromString(args)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
var showCmd int32 = 1 //SW_NORMAL
|
||||||
|
|
||||||
|
err = windows.ShellExecute(0, verbPtr, exePtr, argPtr, cwdPtr, showCmd)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Warn(err)
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
Reference in New Issue
Block a user