Merge pull request #520 from ellemouton/fixDBDir

ellemouton · web-flow · commit e50c2281435f · 2023-03-18T09:35:18.000+02:00
terminal: fix macaroon DB directory
diff --git a/terminal.go b/terminal.go
@@ -675,7 +675,8 @@ func (g *LightningTerminal) startSubservers() error {
 
 	// Set up the macaroon service.
 	rks, db, err := lndclient.NewBoltMacaroonStore(
-		g.cfg.LitDir, lncfg.MacaroonDBName, macDatabaseOpenTimeout,
+		filepath.Join(g.cfg.LitDir, g.cfg.Network),
+		lncfg.MacaroonDBName, macDatabaseOpenTimeout,
 	)
 	if err != nil {
 		return err

Original file line number	Diff line number	Diff line change
`@@ -675,7 +675,8 @@ func (g *LightningTerminal) startSubservers() error {`
`675`	`675`
`676`	`676`	`// Set up the macaroon service.`
`677`	`677`	`rks, db, err := lndclient.NewBoltMacaroonStore(`
`678`		`- g.cfg.LitDir, lncfg.MacaroonDBName, macDatabaseOpenTimeout,`
	`678`	`+ filepath.Join(g.cfg.LitDir, g.cfg.Network),`
	`679`	`+ lncfg.MacaroonDBName, macDatabaseOpenTimeout,`
`679`	`680`	`)`
`680`	`681`	`if err != nil {`
`681`	`682`	`return err`