Skip to content
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

cmd/geth, console: support interrupting the js console #23387

Merged
merged 17 commits into from
Dec 11, 2021
Merged

cmd/geth, console: support interrupting the js console #23387

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
148d25b
cmd/geth, console: support interrupting the js engine, fixes #23344
holiman Aug 12, 2021
90f5546
cmd/geth, console: better handle local console interrupt
holiman Aug 26, 2021
d74dc71
cmd/geth, console: support interrupting the js engine, fixes #23344
holiman Aug 12, 2021
18fe3b6
cmd/geth, console: better handle local console interrupt
holiman Aug 26, 2021
0e99d3f
cmd: dont shutdown with sigint in console mode
s1na Dec 2, 2021
46891a6
Merge branch 'console-interrupt' into console_interrupt
s1na Dec 3, 2021
a73a029
cmd/utils: don't special-case command name 'console'
fjl Dec 6, 2021
ab146ef
console: use only SIGINT as interrupt
fjl Dec 6, 2021
7a70321
cmd/geth: explain shutdown tracking better
fjl Dec 6, 2021
0e63b1c
internal/jsre: interrupt only when event loop is actually running
fjl Dec 7, 2021
36c246c
console: improve JS interrupt
fjl Dec 7, 2021
f19da52
console: add comments about signalReceived
fjl Dec 7, 2021
bc4438f
cmd/geth: remove uses of utils.Fatalf in console commands
fjl Dec 7, 2021
0f4ef14
console: improve Stop
fjl Dec 7, 2021
e408f82
internal/jsre: avoid Do hanging after Stop
fjl Dec 7, 2021
99d6258
cmd/geth: fix SIGTERM handling of 'geth js'
fjl Dec 7, 2021
4454422
internal/jsre: avoid hot-spin in Stop while JS blocked in native func…
fjl Dec 7, 2021
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
Prev Previous commit
Next Next commit
cmd/geth: explain shutdown tracking better
  • Loading branch information
@fjl
fjl committed Dec 6, 2021
commit 7a70321f6b0560e819c2e8b2aeae637c05f8f7d1
7 changes: 4 additions & 3 deletions cmd/geth/consolecmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,15 @@ func localConsole(ctx *cli.Context) error {
if err != nil {
utils.Fatalf("Failed to start the JavaScript console: %v", err)
}
defer console.Stop(false)

// Track node shutdown and stop the console when it goes down.
// This happens when SIGTERM is sent to the process.
exitCh := make(chan struct{})
go func() {
// In case the blockchain is stopped, e.g. via ctrl-c, we should
// also close down the console.
stack.Wait()
close(exitCh)
}()
defer console.Stop(false)

// If only a short execution was requested, evaluate and return
if script := ctx.GlobalString(utils.ExecFlag.Name); script != "" {
Expand Down