Skip to content

Commit

Permalink
fly/commands/rerun_build.go small refactor
Browse files Browse the repository at this point in the history
Signed-off-by: Mikhail Fesenko <proggga@gmail.com>
  • Loading branch information
proggga committed Oct 18, 2022
1 parent e68c62e commit b4b44d0
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions fly/commands/rerun_build.go
Expand Up @@ -38,33 +38,33 @@ func (command *RerunBuildCommand) Execute(args []string) error {
}
fmt.Printf("started %s/%s #%s\n", pipelineRef.String(), jobName, build.Name)

if command.Watch {
terminate := make(chan os.Signal, 1)
if !command.Watch {
return nil
}

go func(terminate <-chan os.Signal) {
<-terminate
fmt.Fprintf(ui.Stderr, "\ndetached, build is still running...\n")
fmt.Fprintf(ui.Stderr, "re-attach to it with:\n\n")
fmt.Fprintf(ui.Stderr, " "+ui.Embolden(fmt.Sprintf("fly -t %s watch -j %s/%s -b %s\n\n", Fly.Target, pipelineRef.QueryParams(), jobName, build.Name)))
os.Exit(2)
}(terminate)
terminate := make(chan os.Signal, 1)

signal.Notify(terminate, syscall.SIGINT, syscall.SIGTERM)
go func(terminate <-chan os.Signal) {
<-terminate
_, _ = fmt.Fprintf(ui.Stderr, "\ndetached, build is still running...\n")
_, _ = fmt.Fprintf(ui.Stderr, "re-attach to it with:\n\n")
_, _ = fmt.Fprintf(ui.Stderr, " "+ui.Embolden(fmt.Sprintf("fly -t %s watch -j %s/%s -b %s\n\n", Fly.Target, pipelineRef.QueryParams(), jobName, build.Name)))
os.Exit(2)
}(terminate)

fmt.Println("")
eventSource, err := target.Client().BuildEvents(fmt.Sprintf("%d", build.ID))
if err != nil {
return err
}
signal.Notify(terminate, syscall.SIGINT, syscall.SIGTERM)

renderOptions := eventstream.RenderOptions{}
fmt.Println("")
eventSource, err := target.Client().BuildEvents(fmt.Sprintf("%d", build.ID))
if err != nil {
return err
}

exitCode := eventstream.Render(os.Stdout, eventSource, renderOptions)
renderOptions := eventstream.RenderOptions{}

eventSource.Close()
exitCode := eventstream.Render(os.Stdout, eventSource, renderOptions)

os.Exit(exitCode)
}
_ = eventSource.Close()

return nil
os.Exit(exitCode)
}

0 comments on commit b4b44d0

Please sign in to comment.