mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-19 18:32:23 +00:00
swarm/shed: push metrics prefix up
This commit is contained in:
parent
97c8a61f2a
commit
9a90c999ac
3 changed files with 7 additions and 6 deletions
|
|
@ -63,7 +63,8 @@ type DB struct {
|
||||||
|
|
||||||
// NewDB constructs a new DB and validates the schema
|
// NewDB constructs a new DB and validates the schema
|
||||||
// if it exists in database on the given path.
|
// if it exists in database on the given path.
|
||||||
func NewDB(path string) (db *DB, err error) {
|
// prefix is used for metrics collection for the given DB.
|
||||||
|
func NewDB(path string, prefix string) (db *DB, err error) {
|
||||||
ldb, err := leveldb.OpenFile(path, &opt.Options{
|
ldb, err := leveldb.OpenFile(path, &opt.Options{
|
||||||
OpenFilesCacheCapacity: openFileLimit,
|
OpenFilesCacheCapacity: openFileLimit,
|
||||||
})
|
})
|
||||||
|
|
@ -88,7 +89,7 @@ func NewDB(path string) (db *DB, err error) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
db.Meter("shed/db")
|
db.Meter(prefix)
|
||||||
|
|
||||||
return db, nil
|
return db, nil
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ func TestDB_persistence(t *testing.T) {
|
||||||
}
|
}
|
||||||
defer os.RemoveAll(dir)
|
defer os.RemoveAll(dir)
|
||||||
|
|
||||||
db, err := NewDB(dir)
|
db, err := NewDB(dir, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
@ -73,7 +73,7 @@ func TestDB_persistence(t *testing.T) {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
db2, err := NewDB(dir)
|
db2, err := NewDB(dir, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
@ -101,7 +101,7 @@ func newTestDB(t *testing.T) (db *DB, cleanupFunc func()) {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
cleanupFunc = func() { os.RemoveAll(dir) }
|
cleanupFunc = func() { os.RemoveAll(dir) }
|
||||||
db, err = NewDB(dir)
|
db, err = NewDB(dir, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
cleanupFunc()
|
cleanupFunc()
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
|
|
||||||
|
|
@ -52,7 +52,7 @@ type Store struct {
|
||||||
// and possible conflicts with schema from existing database is checked
|
// and possible conflicts with schema from existing database is checked
|
||||||
// automatically.
|
// automatically.
|
||||||
func New(path string) (s *Store, err error) {
|
func New(path string) (s *Store, err error) {
|
||||||
db, err := shed.NewDB(path)
|
db, err := shed.NewDB(path, "")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue