gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

node: switching prometheus flock location to tsdb (#19376)

Browse Source 
* node: switching prometheus flock location to tsdb

* rookie mistake
This commit is contained in:
Steve Ruckdashel
2019-04-04 08:59:18 -05:00
committed by Péter Szilágyi
parent d5cae48bae
commit a8dd1f93c6
24 changed files with 677 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
node/node.go
View File

@ -34,7 +34,7 @@ import (
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/rpc"
"github.com/prometheus/prometheus/util/flock"
"github.com/prometheus/tsdb/fileutil"
)
// Node is a container on which services can be registered.
@ -43,8 +43,8 @@ type Node struct {
config *Config
accman *accounts.Manager
ephemeralKeystore string // if non-empty, the key directory that will be removed by Stop
instanceDirLock flock.Releaser // prevents concurrent use of instance directory
ephemeralKeystore string // if non-empty, the key directory that will be removed by Stop
instanceDirLock fileutil.Releaser // prevents concurrent use of instance directory
serverConfig p2p.Config
server *p2p.Server // Currently running P2P networking layer
@ -267,7 +267,7 @@ func (n *Node) openDataDir() error {
}
// Lock the instance directory to prevent concurrent use by another instance as well as
// accidental use of the instance directory as a database.
release, _, err := flock.New(filepath.Join(instdir, "LOCK"))
release, _, err := fileutil.Flock(filepath.Join(instdir, "LOCK"))
if err != nil {
return convertFileLockError(err)
}