Fix channel db path issue

guggero · guggero · commit 4f099e6e513a · 2020-03-10T10:46:53.000+01:00
diff --git a/cmd/chantools/forceclose.go b/cmd/chantools/forceclose.go
@@ -48,7 +48,10 @@ func (c *forceCloseCommand) Execute(_ []string) error {
 	if c.ChannelDB == "" {
 		return fmt.Errorf("rescue DB is required")
 	}
-	db, err := channeldb.Open(path.Dir(c.ChannelDB))
+	db, err := channeldb.Open(
+		path.Dir(c.ChannelDB),channeldb.OptionSetSyncFreelist(true),
+		channeldb.OptionReadOnly(true),
+	)
 	if err != nil {
 		return fmt.Errorf("error opening rescue DB: %v", err)
 	}
diff --git a/cmd/chantools/main.go b/cmd/chantools/main.go
@@ -8,6 +8,7 @@ import (
 	"github.com/lightningnetwork/lnd/chanbackup"
 	"io/ioutil"
 	"os"
+	"path"
 	"strings"
 	"syscall"
 	"time"
@@ -148,7 +149,7 @@ func parseInputType(cfg *config) ([]*dataformat.SummaryEntry, error) {
 
 	case cfg.FromChannelDB != "":
 		db, err := channeldb.Open(
-			cfg.FromChannelDB,
+			path.Dir(cfg.FromChannelDB),
 			channeldb.OptionSetSyncFreelist(true),
 			channeldb.OptionReadOnly(true),
 		)

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,10 @@ func (c *forceCloseCommand) Execute(_ []string) error {`
`48`	`48`	`if c.ChannelDB == "" {`
`49`	`49`	`return fmt.Errorf("rescue DB is required")`
`50`	`50`	`}`
`51`		`- db, err := channeldb.Open(path.Dir(c.ChannelDB))`
	`51`	`+ db, err := channeldb.Open(`
	`52`	`+ path.Dir(c.ChannelDB),channeldb.OptionSetSyncFreelist(true),`
	`53`	`+ channeldb.OptionReadOnly(true),`
	`54`	`+ )`
`52`	`55`	`if err != nil {`
`53`	`56`	`return fmt.Errorf("error opening rescue DB: %v", err)`
`54`	`57`	`}`