Add Open() options, flock timeout.

This commit changes Open() to provide an additional Options argument. The options
argument currently only has a Timeout which will cause the Open() to return
ErrTimeout if a file lock cannot be obtained in time.

Fixes #207.

12 files changed, 12 insertions, 12 deletions

diff --git a/cmd/bolt/bench.go b/cmd/bolt/bench.go
index 5d0dbec..7eb503d 100644
--- a/cmd/bolt/bench.go
+++ b/cmd/bolt/bench.go
@@ -41,7 +41,7 @@ func Bench(options *BenchOptions) {
 	}
 
 	// Create database.
-	db, err := bolt.Open(path, 0600)
+	db, err := bolt.Open(path, 0600, nil)
 	if err != nil {
 		fatal(err)
 		return
diff --git a/cmd/bolt/buckets.go b/cmd/bolt/buckets.go
index 48395d8..68e7dde 100644
--- a/cmd/bolt/buckets.go
+++ b/cmd/bolt/buckets.go
@@ -13,7 +13,7 @@ func Buckets(path string) {
 		return
 	}
 
-	db, err := bolt.Open(path, 0600)
+	db, err := bolt.Open(path, 0600, nil)
 	if err != nil {
 		fatal(err)
 		return
diff --git a/cmd/bolt/check.go b/cmd/bolt/check.go
index 7555ec8..125f2b8 100644
--- a/cmd/bolt/check.go
+++ b/cmd/bolt/check.go
@@ -13,7 +13,7 @@ func Check(path string) {
 		return
 	}
 
-	db, err := bolt.Open(path, 0600)
+	db, err := bolt.Open(path, 0600, nil)
 	if err != nil {
 		fatal(err)
 		return
diff --git a/cmd/bolt/export.go b/cmd/bolt/export.go
index 2dcbc1f..2689f32 100644
--- a/cmd/bolt/export.go
+++ b/cmd/bolt/export.go
@@ -16,7 +16,7 @@ func Export(path string) {
 	}
 
 	// Open the database.
-	db, err := bolt.Open(path, 0600)
+	db, err := bolt.Open(path, 0600, nil)
 	if err != nil {
 		fatal(err)
 		return
diff --git a/cmd/bolt/get.go b/cmd/bolt/get.go
index 6ea7f04..90e0c1d 100644
--- a/cmd/bolt/get.go
+++ b/cmd/bolt/get.go
@@ -13,7 +13,7 @@ func Get(path, name, key string) {
 		return
 	}
 
-	db, err := bolt.Open(path, 0600)
+	db, err := bolt.Open(path, 0600, nil)
 	if err != nil {
 		fatal(err)
 		return
diff --git a/cmd/bolt/import.go b/cmd/bolt/import.go
index 0988f32..258a7da 100644
--- a/cmd/bolt/import.go
+++ b/cmd/bolt/import.go
@@ -29,7 +29,7 @@ func Import(path string, input string) {
 
 func importBuckets(path string, root []*rawMessage) {
 	// Open the database.
-	db, err := bolt.Open(path, 0600)
+	db, err := bolt.Open(path, 0600, nil)
 	if err != nil {
 		fatal(err)
 		return
diff --git a/cmd/bolt/import_test.go b/cmd/bolt/import_test.go
index 263f561..3d4f275 100644
--- a/cmd/bolt/import_test.go
+++ b/cmd/bolt/import_test.go
@@ -23,7 +23,7 @@ func TestImport(t *testing.T) {
 	assert.Equal(t, ``, output)
 
 	// Open database and verify contents.
-	db, err := bolt.Open(path, 0600)
+	db, err := bolt.Open(path, 0600, nil)
 	assert.NoError(t, err)
 	db.View(func(tx *bolt.Tx) error {
 		assert.NotNil(t, tx.Bucket([]byte("empty")))
diff --git a/cmd/bolt/info.go b/cmd/bolt/info.go
index 1e9e0d8..5606e68 100644
--- a/cmd/bolt/info.go
+++ b/cmd/bolt/info.go
@@ -13,7 +13,7 @@ func Info(path string) {
 		return
 	}
 
-	db, err := bolt.Open(path, 0600)
+	db, err := bolt.Open(path, 0600, nil)
 	if err != nil {
 		fatal(err)
 		return
diff --git a/cmd/bolt/keys.go b/cmd/bolt/keys.go
index 6affefe..d4bb3c3 100644
--- a/cmd/bolt/keys.go
+++ b/cmd/bolt/keys.go
@@ -13,7 +13,7 @@ func Keys(path, name string) {
 		return
 	}
 
-	db, err := bolt.Open(path, 0600)
+	db, err := bolt.Open(path, 0600, nil)
 	if err != nil {
 		fatal(err)
 		return
diff --git a/cmd/bolt/main_test.go b/cmd/bolt/main_test.go
index 9b32cc8..0614d43 100644
--- a/cmd/bolt/main_test.go
+++ b/cmd/bolt/main_test.go
@@ -14,7 +14,7 @@ func open(fn func(*bolt.DB, string)) {
 	path := tempfile()
 	defer os.RemoveAll(path)
 
-	db, err := bolt.Open(path, 0600)
+	db, err := bolt.Open(path, 0600, nil)
 	if err != nil {
 		panic("db open error: " + err.Error())
 	}
diff --git a/cmd/bolt/pages.go b/cmd/bolt/pages.go
index 33f6886..ec1c4b4 100644
--- a/cmd/bolt/pages.go
+++ b/cmd/bolt/pages.go
@@ -14,7 +14,7 @@ func Pages(path string) {
 		return
 	}
 
-	db, err := bolt.Open(path, 0600)
+	db, err := bolt.Open(path, 0600, nil)
 	if err != nil {
 		fatal(err)
 		return
diff --git a/cmd/bolt/stats.go b/cmd/bolt/stats.go
index 54a0f44..b5d0083 100644
--- a/cmd/bolt/stats.go
+++ b/cmd/bolt/stats.go
@@ -14,7 +14,7 @@ func Stats(path, prefix string) {
 		return
 	}
 
-	db, err := bolt.Open(path, 0600)
+	db, err := bolt.Open(path, 0600, nil)
 	if err != nil {
 		fatal(err)
 		return