apps/kubevpn
1
0
Fork 0
mirror of https://github.com/kubenetworks/kubevpn.git synced 2025-10-15 11:50:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: optimize code

Browse Source
This commit is contained in:
fengcaiwen
2023-10-27 17:49:38 +08:00
committed by naison
parent 2d44c9b00d
commit 457fda89a0
11 changed files with 88 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/dev/main.go
View File

@@ -81,7 +81,7 @@ type Options struct {
DockerCli *command.DockerCli
// rollback
RollbackFuncList []func()
rollbackFuncList []func() error
}
func (d *Options) Main(ctx context.Context, tempContainerConfig *containerConfig) error {
@@ -217,8 +217,8 @@ func (d *Options) Main(ctx context.Context, tempContainerConfig *containerConfig
}
}
d.RollbackFuncList = append(d.RollbackFuncList, func() {
_ = runConfigList.Remove(ctx, d.Cli)
d.AddRollbackFunc(func() error {
return runConfigList.Remove(ctx, d.Cli)
})
err = runConfigList.Run(ctx, volume, d.Cli, d.DockerCli)
if err != nil {
@@ -576,8 +576,9 @@ func (d *Options) doConnect(ctx context.Context, f cmdutil.Factory, conf *util.S
},
)
go h.Run(func() error { select {} })
d.RollbackFuncList = append(d.RollbackFuncList, func() {
d.AddRollbackFunc(func() error {
h.Close()
return nil
})
err = runLogsWaitRunning(cancelCtx, d.DockerCli, id)
if err != nil {
@@ -864,3 +865,11 @@ func createKubevpnNetwork(ctx context.Context, cli *client.Client) (string, erro
}
return create.ID, nil
}
func (d *Options) AddRollbackFunc(f func() error) {
d.rollbackFuncList = append(d.rollbackFuncList, f)
}
func (d *Options) GetRollbackFuncList() []func() error {
return d.rollbackFuncList
}