aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2018-02-20 20:33:34 +0800
committerPéter Szilágyi <peterke@gmail.com>2018-02-21 21:23:10 +0800
commit01507d9b9d872aa6dfaf3ad704b8c2b65e378a41 (patch)
tree65867213d25c4703addfff98471c134462e2f20b /cmd
parent5603715c06998ff9ed30eb134c4398ad1439ef48 (diff)
downloaddexon-01507d9b9d872aa6dfaf3ad704b8c2b65e378a41.tar
dexon-01507d9b9d872aa6dfaf3ad704b8c2b65e378a41.tar.gz
dexon-01507d9b9d872aa6dfaf3ad704b8c2b65e378a41.tar.bz2
dexon-01507d9b9d872aa6dfaf3ad704b8c2b65e378a41.tar.lz
dexon-01507d9b9d872aa6dfaf3ad704b8c2b65e378a41.tar.xz
dexon-01507d9b9d872aa6dfaf3ad704b8c2b65e378a41.tar.zst
dexon-01507d9b9d872aa6dfaf3ad704b8c2b65e378a41.zip
cmd, console: support all termination signals
Diffstat (limited to 'cmd')
-rw-r--r--cmd/geth/consolecmd.go3
-rw-r--r--cmd/utils/cmd.go5
2 files changed, 5 insertions, 3 deletions
diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go
index 9d5cc38a1..7eca4d59f 100644
--- a/cmd/geth/consolecmd.go
+++ b/cmd/geth/consolecmd.go
@@ -22,6 +22,7 @@ import (
"os/signal"
"path/filepath"
"strings"
+ "syscall"
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/console"
@@ -207,7 +208,7 @@ func ephemeralConsole(ctx *cli.Context) error {
}
// Wait for pending callbacks, but stop for Ctrl-C.
abort := make(chan os.Signal, 1)
- signal.Notify(abort, os.Interrupt)
+ signal.Notify(abort, syscall.SIGINT, syscall.SIGTERM)
go func() {
<-abort
diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go
index 53cdf7861..186d18d8f 100644
--- a/cmd/utils/cmd.go
+++ b/cmd/utils/cmd.go
@@ -25,6 +25,7 @@ import (
"os/signal"
"runtime"
"strings"
+ "syscall"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types"
@@ -64,7 +65,7 @@ func StartNode(stack *node.Node) {
}
go func() {
sigc := make(chan os.Signal, 1)
- signal.Notify(sigc, os.Interrupt)
+ signal.Notify(sigc, syscall.SIGINT, syscall.SIGTERM)
defer signal.Stop(sigc)
<-sigc
log.Info("Got interrupt, shutting down...")
@@ -85,7 +86,7 @@ func ImportChain(chain *core.BlockChain, fn string) error {
// If a signal is received, the import will stop at the next batch.
interrupt := make(chan os.Signal, 1)
stop := make(chan struct{})
- signal.Notify(interrupt, os.Interrupt)
+ signal.Notify(interrupt, syscall.SIGINT, syscall.SIGTERM)
defer signal.Stop(interrupt)
defer close(interrupt)
go func() {