diff options
author | Janoš Guljaš <janos@users.noreply.github.com> | 2019-02-07 18:40:36 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2019-02-07 18:40:36 +0800 |
commit | 26aea736736dc70257b1c11676f626ab775e9339 (patch) | |
tree | 93d60a587905e6f5ac170d71fb0c78127ec75d27 /cmd/swarm/main.go | |
parent | 81801ccc2b5444ebcf05bf1cf1562fc7a7c2b93e (diff) | |
download | go-tangerine-26aea736736dc70257b1c11676f626ab775e9339.tar go-tangerine-26aea736736dc70257b1c11676f626ab775e9339.tar.gz go-tangerine-26aea736736dc70257b1c11676f626ab775e9339.tar.bz2 go-tangerine-26aea736736dc70257b1c11676f626ab775e9339.tar.lz go-tangerine-26aea736736dc70257b1c11676f626ab775e9339.tar.xz go-tangerine-26aea736736dc70257b1c11676f626ab775e9339.tar.zst go-tangerine-26aea736736dc70257b1c11676f626ab775e9339.zip |
cmd, node, p2p/simulations: fix node account manager leak (#19004)
* node: close AccountsManager in new Close method
* p2p/simulations, p2p/simulations/adapters: handle node close on shutdown
* node: move node ephemeralKeystore cleanup to stop method
* node: call Stop in Node.Close method
* cmd/geth: close node.Node created with makeFullNode in cli commands
* node: close Node instances in tests
* cmd/geth, node: minor code style fixes
* cmd, console, miner, mobile: proper node Close() termination
Diffstat (limited to 'cmd/swarm/main.go')
-rw-r--r-- | cmd/swarm/main.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 53888b615..11b51124d 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -288,6 +288,7 @@ func bzzd(ctx *cli.Context) error { if err != nil { utils.Fatalf("can't create node: %v", err) } + defer stack.Close() //a few steps need to be done after the config phase is completed, //due to overriding behavior @@ -365,6 +366,8 @@ func getPrivKey(ctx *cli.Context) *ecdsa.PrivateKey { if err != nil { utils.Fatalf("can't create node: %v", err) } + defer stack.Close() + return getAccount(bzzconfig.BzzAccount, ctx, stack) } |