aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/geth
diff options
context:
space:
mode:
authorFelix Lange <fjl@twurst.com>2015-07-06 21:01:13 +0800
committerFelix Lange <fjl@twurst.com>2015-07-06 21:06:11 +0800
commit5615fc47149ea5db6ad6f5b1b716e5af9900f848 (patch)
tree461b31ea7ea4dafb0b2658dd11a0dbcc3f04d88f /cmd/geth
parentaa4502060b50733a3a82a0ab575eac0731cdb7ca (diff)
downloadgo-tangerine-5615fc47149ea5db6ad6f5b1b716e5af9900f848.tar.gz
go-tangerine-5615fc47149ea5db6ad6f5b1b716e5af9900f848.tar.zst
go-tangerine-5615fc47149ea5db6ad6f5b1b716e5af9900f848.zip
cmd/geth, cmd/utils: improve interrupt handling
The new strategy for interrupts is to handle them explicitly. Ethereum.Stop is now only called once, even if multiple interrupts are sent. Interrupting ten times in a row forces a panic. Fixes #869 Fixes #1359
Diffstat (limited to 'cmd/geth')
-rw-r--r--cmd/geth/main.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index ffd26a7c2..3428bb4cf 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -347,7 +347,6 @@ func main() {
}
func run(ctx *cli.Context) {
- utils.HandleInterrupt()
cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx)
ethereum, err := eth.New(cfg)
if err != nil {
@@ -527,10 +526,9 @@ func blockRecovery(ctx *cli.Context) {
func startEth(ctx *cli.Context, eth *eth.Ethereum) {
// Start Ethereum itself
-
utils.StartEthereum(eth)
- am := eth.AccountManager()
+ am := eth.AccountManager()
account := ctx.GlobalString(utils.UnlockedAccountFlag.Name)
accounts := strings.Split(account, " ")
for i, account := range accounts {