ston1th/gowiki
0
0
Fork 0
Code Issues 2 Releases Activity

added plain db

Browse source
This commit is contained in:
ston1th 2019-11-24 11:54:39 +01:00
commit b1028b3d8a
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/cmd/cmd.go
View file

@ -142,7 +142,7 @@ func Run(version string) {
stdlog.Fatal("dump: ", err) stdlog.Fatal("dump: ", err)
} }
} }
DB, err := db.New(config) DB, err := db.NewPlain(config)
if err != nil { if err != nil {
stdlog.Fatal("dump: ", err) stdlog.Fatal("dump: ", err)
} }
@ -175,7 +175,7 @@ func Run(version string) {
stdlog.Fatal("restore: ", err) stdlog.Fatal("restore: ", err)
} }
} }
DB, err := db.New(config) DB, err := db.NewPlain(config)
if err != nil { if err != nil {
stdlog.Fatal("restore: ", err) stdlog.Fatal("restore: ", err)
} }
@ -199,7 +199,7 @@ func Run(version string) {
if err = loadConfig(); err != nil { if err = loadConfig(); err != nil {
stdlog.Fatal("resetadmin: ", err) stdlog.Fatal("resetadmin: ", err)
} }
DB, err := db.New(config) DB, err := db.NewPlain(config)
if err != nil { if err != nil {
stdlog.Fatal("resetadmin: ", err) stdlog.Fatal("resetadmin: ", err)
} }

10
pkg/db/db.go
View file

@ -34,7 +34,7 @@ type DB struct {
indexPath string indexPath string
} }
func New(cfg core.Config) (db *DB, err error) { func NewPlain(cfg core.Config) (db *DB, err error) {
db = &DB{admin: cfg.Admin, cache: cache.NewCache()} db = &DB{admin: cfg.Admin, cache: cache.NewCache()}
dbFile := filepath.Join(cfg.DataDir, storeFile) dbFile := filepath.Join(cfg.DataDir, storeFile)
err = godrop.Unveil(dbFile, "rwc") err = godrop.Unveil(dbFile, "rwc")
@ -42,6 +42,11 @@ func New(cfg core.Config) (db *DB, err error) {
return return
} }
db.store, err = store.NewBoltStore(dbFile, nil) db.store, err = store.NewBoltStore(dbFile, nil)
return
}
func New(cfg core.Config) (db *DB, err error) {
db, err = NewPlain(cfg)
if err != nil { if err != nil {
return return
} }
@ -110,5 +115,8 @@ func (db *DB) Close() (err error) {
if err != nil { if err != nil {
return return
} }
if db.Index != nil {
return db.Index.Close() return db.Index.Close()
}
return nil
} }