Voomra/playbookctl
Archived
1
Fork 0
Code Activity

fix: выход если ошибка в Ansible

Browse Source
This commit is contained in:
Voomra
2025-01-19 15:31:08 +03:00
parent 96c1138d5c
commit 0276680da0
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/root.go
View File

@@ -21,7 +21,7 @@ var (
var rootCmd = &cobra.Command{ var rootCmd = &cobra.Command{
Use: "playbookctl", Use: "playbookctl",
Short: "Ansible Playbook Dedic2 Control", Short: "Ansible Playbook Dedic2 Control",
Version: "4.0.2", Version: "4.0.3",
RunE: func(cmd *cobra.Command, _ []string) error { RunE: func(cmd *cobra.Command, _ []string) error {
return cmd.Help() return cmd.Help()
}, },

15
internal/space_worker/restore.go
View File

@@ -38,7 +38,10 @@ func (app *SpaceWorker) Restore(targetHost string, timestamp string, inventory s
app.log.Info(fmt.Sprintf("Target Host: %s", host)) app.log.Info(fmt.Sprintf("Target Host: %s", host))
app.log.Info("Pre restore Ansible") app.log.Info("Pre restore Ansible")
_ = command.Run() err = command.Run()
if err != nil {
return err
}
app.log.Info("Send files") app.log.Info("Send files")
command = exec.Command("/bin/bash", "-c", preRestoreFile) command = exec.Command("/bin/bash", "-c", preRestoreFile)
@@ -59,7 +62,10 @@ func (app *SpaceWorker) Restore(targetHost string, timestamp string, inventory s
command.Stdin = os.Stdin command.Stdin = os.Stdin
command.Stdout = os.Stdout command.Stdout = os.Stdout
command.Stderr = os.Stderr command.Stderr = os.Stderr
_ = command.Run() err = command.Run()
if err != nil {
return err
}
app.log.Info("Clean temp files") app.log.Info("Clean temp files")
command = exec.Command("/bin/bash", "-c", preRestoreFile+"_clean") command = exec.Command("/bin/bash", "-c", preRestoreFile+"_clean")
@@ -67,7 +73,10 @@ func (app *SpaceWorker) Restore(targetHost string, timestamp string, inventory s
command.Stdin = os.Stdin command.Stdin = os.Stdin
command.Stdout = os.Stdout command.Stdout = os.Stdout
command.Stderr = os.Stderr command.Stderr = os.Stderr
_ = command.Run() err = command.Run()
if err != nil {
return err
}
if err = utils.RemoveFile(preRestoreFile); err != nil { if err = utils.RemoveFile(preRestoreFile); err != nil {
return err return err