forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 02:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

node: move node ephemeralKeystore cleanup to stop method

Browse source
This commit is contained in:
Janos Guljas 2019-02-05 19:52:26 +01:00
parent c7bd9ccb88
commit b4ac1d1c68
1 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
node/node.go
View file

@ -123,28 +123,7 @@ func New(conf *Config) (*Node, error) {
// Close releases resources acquired in Node constructor New.
func (n *Node) Close() error {
n.lock.Lock()
defer n.lock.Unlock()
// Close account manager
var accmanErr error
if n.accman != nil {
accmanErr = n.accman.Close()
if accmanErr == nil {
n.accman = nil
}
}
// Remove the keystore if it was created ephemerally.
var keystoreErr error
if n.ephemeralKeystore != "" {
keystoreErr = os.RemoveAll(n.ephemeralKeystore)
}
if accmanErr != nil {
return accmanErr
}
return keystoreErr
return n.accman.Close()
}
// Register injects a new service into the node's stack. The service created by
@ -461,9 +440,18 @@ func (n *Node) Stop() error {
// unblock n.Wait
close(n.stop)
// Remove the keystore if it was created ephemerally.
var keystoreErr error
if n.ephemeralKeystore != "" {
keystoreErr = os.RemoveAll(n.ephemeralKeystore)
}
if len(failure.Services) > 0 {
return failure
}
if keystoreErr != nil {
return keystoreErr
}
return nil
}