From 4eadc39e277b41d71c961f677a177be398d132d5 Mon Sep 17 00:00:00 2001 From: Andrew Slotin Date: Fri, 13 Oct 2017 18:57:28 +0700 Subject: [PATCH 1/4] Log error and exit if the db file could not be opened within 1s --- boltbrowser.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/boltbrowser.go b/boltbrowser.go index f2ddbb8..4c38de6 100644 --- a/boltbrowser.go +++ b/boltbrowser.go @@ -4,6 +4,7 @@ import ( "flag" "fmt" "os" + "time" "github.com/boltdb/bolt" "github.com/nsf/termbox-go" @@ -20,6 +21,8 @@ var memBolt *BoltDB var currentFilename string +const DefaultDBOpenTimeout = time.Second + func init() { flag.Usage = func() { fmt.Fprintf(os.Stdout, "Usage: %s \n", ProgramName) @@ -47,8 +50,12 @@ func main() { databaseFiles := flag.Args() for _, databaseFile := range databaseFiles { currentFilename = databaseFile - db, err = bolt.Open(databaseFile, 0600, nil) - if err != nil { + db, err = bolt.Open(databaseFile, 0600, &bolt.Options{Timeout: DefaultDBOpenTimeout}) + if err == bolt.ErrTimeout { + termbox.Close() + fmt.Printf("File %s is locked. Make sure it's not used by another app and try again\n", databaseFile) + os.Exit(1) + } else if err != nil { if len(databaseFiles) > 1 { mainLoop(nil, style) continue From 4ab47545f7e48f6575dfa086a62754d363fb7aab Mon Sep 17 00:00:00 2001 From: Andrew Slotin Date: Fri, 13 Oct 2017 19:01:25 +0700 Subject: [PATCH 2/4] Pass db open timeout via command-line flag --- boltbrowser.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/boltbrowser.go b/boltbrowser.go index 4c38de6..19fa968 100644 --- a/boltbrowser.go +++ b/boltbrowser.go @@ -23,9 +23,15 @@ var currentFilename string const DefaultDBOpenTimeout = time.Second +var args struct { + DBOpenTimeout time.Duration +} + func init() { + flag.DurationVar(&args.DBOpenTimeout, "timeout", DefaultDBOpenTimeout, "DB file open timeout") flag.Usage = func() { - fmt.Fprintf(os.Stdout, "Usage: %s \n", ProgramName) + fmt.Fprintf(os.Stdout, "Usage: %s [OPTIONS] \nOptions:\n", ProgramName) + flag.PrintDefaults() } } @@ -50,7 +56,7 @@ func main() { databaseFiles := flag.Args() for _, databaseFile := range databaseFiles { currentFilename = databaseFile - db, err = bolt.Open(databaseFile, 0600, &bolt.Options{Timeout: DefaultDBOpenTimeout}) + db, err = bolt.Open(databaseFile, 0600, &bolt.Options{Timeout: args.DBOpenTimeout}) if err == bolt.ErrTimeout { termbox.Close() fmt.Printf("File %s is locked. Make sure it's not used by another app and try again\n", databaseFile) From d506dad041f0bfd1bbe03efa6e91729afd28edb8 Mon Sep 17 00:00:00 2001 From: Andrew Slotin Date: Fri, 13 Oct 2017 19:01:54 +0700 Subject: [PATCH 3/4] Print out usage message to STDERR `flag.PrintDefaults()` writes to `os.Stderr`, therefore the "Usage" part should go there as well. --- boltbrowser.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boltbrowser.go b/boltbrowser.go index 19fa968..2a21b22 100644 --- a/boltbrowser.go +++ b/boltbrowser.go @@ -30,7 +30,7 @@ var args struct { func init() { flag.DurationVar(&args.DBOpenTimeout, "timeout", DefaultDBOpenTimeout, "DB file open timeout") flag.Usage = func() { - fmt.Fprintf(os.Stdout, "Usage: %s [OPTIONS] \nOptions:\n", ProgramName) + fmt.Fprintf(os.Stderr, "Usage: %s [OPTIONS] \nOptions:\n", ProgramName) flag.PrintDefaults() } } From c7d3622f7ae3a98746acd4b827d392157b5f146b Mon Sep 17 00:00:00 2001 From: Andrew Slotin Date: Fri, 13 Oct 2017 19:11:43 +0700 Subject: [PATCH 4/4] Update README --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index ab46c8e..140deb2 100644 --- a/README.md +++ b/README.md @@ -36,3 +36,9 @@ Just provide a BoltDB filename to be opened as the first argument on the command ```sh boltbrowser ``` + +To see all options that are available, run: + +``` +boltbrowser --help +```