Skip to content

NF-1321: Make sure to close Notecard before exiting notecard CLI. #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
haydenroche5 merged 1 commit into from
May 8, 2025
Merged

NF-1321: Make sure to close Notecard before exiting notecard CLI. #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions notecard/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,14 @@ func getFlagGroups() []lib.FlagGroup {
}
}

func exitFailAndCloseCard() {
if card != nil {
card.Close()
}
os.Exit(exitFail)
}


// Main entry
func main() {
// Channel to handle OS signals
Expand All @@ -140,10 +148,7 @@ func main() {
go func() {
sig := <-signalChan
fmt.Printf("Received signal: %s\n", sig)
if card != nil {
card.Close()
}
os.Exit(exitFail)
exitFailAndCloseCard()
}()

// Check the environment for JSON schema control variables
Expand Down Expand Up @@ -230,7 +235,7 @@ func main() {
err := lib.FlagParse(true, false)
if err != nil {
fmt.Printf("%s\n", err)
os.Exit(exitFail)
exitFailAndCloseCard()
}

// If no action specified (i.e. just -port x), exit so that we don't touch the wrong port
Expand Down Expand Up @@ -270,14 +275,14 @@ func main() {
actionRequest = flag.Args()[0]
} else if argsLeft > 0 {
fmt.Printf("to send a JSON request to the Notecard, please place it in quotes")
os.Exit(exitFail)
exitFailAndCloseCard()
}
}

// Both actionDFUPackage and actionRequest potentially use the 'remaining args' outside the flags
if actionDFUPackage != "" && actionRequest != "" {
fmt.Printf("-req and -binpack may not be combined into one command")
os.Exit(exitFail)
exitFailAndCloseCard()
}

// Open the card, just to make sure errors are reported early
Expand Down Expand Up @@ -863,7 +868,7 @@ func main() {
} else {
fmt.Printf("%s\n", err)
}
os.Exit(exitFail)
exitFailAndCloseCard()
}
}

Expand Down