diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-06 21:32:24 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-07-06 21:32:24 +0800 |
| commit | 4c30f0f9ac33e02908c6848744dafff9031b86f3 (patch) | |
| tree | 7b87722425ca1c170aa99ee467cf91bfbb6e82f2 /cmd/geth | |
| parent | fa7b3b72765aa49e3ddffdd7c99cf7e94afd34ca (diff) | |
| parent | 5615fc47149ea5db6ad6f5b1b716e5af9900f848 (diff) | |
| download | dexon-4c30f0f9ac33e02908c6848744dafff9031b86f3.tar dexon-4c30f0f9ac33e02908c6848744dafff9031b86f3.tar.gz dexon-4c30f0f9ac33e02908c6848744dafff9031b86f3.tar.bz2 dexon-4c30f0f9ac33e02908c6848744dafff9031b86f3.tar.lz dexon-4c30f0f9ac33e02908c6848744dafff9031b86f3.tar.xz dexon-4c30f0f9ac33e02908c6848744dafff9031b86f3.tar.zst dexon-4c30f0f9ac33e02908c6848744dafff9031b86f3.zip | |
Merge pull request #1416 from fjl/one-interrupt
cmd/geth, cmd/utils: improve interrupt handling
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/main.go | 4 |
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 { |