Merge pull request #26 from rande/fix_missing_error_management_on_init

rande · web-flow · commit aa98d8716957 · 2016-10-20T15:49:29.000+02:00
fix(init): handle error with boltdb initialization
diff --git a/mirror/bower/bower.go b/mirror/bower/bower.go
@@ -43,25 +43,19 @@ type BowerService struct {
 	StateChan chan pkgmirror.State
 }
 
-func (bs *BowerService) Init(app *goapp.App) error {
-	var err error
-
+func (bs *BowerService) Init(app *goapp.App) (err error) {
 	bs.Logger.Info("Init")
 
-	bs.DB, err = bolt.Open(fmt.Sprintf("%s/%s.db", bs.Config.Path, bs.Config.Code), 0600, &bolt.Options{
-		Timeout:  1 * time.Second,
-		ReadOnly: false,
-	})
-
-	if err != nil {
-		return err
+	if bs.DB, err = pkgmirror.OpenDatabaseWithBucket(bs.Config.Path, bs.Config.Code); err != nil {
+		bs.Logger.WithFields(log.Fields{
+			"error":  err,
+			"path":   bs.Config.Path,
+			"bucket": string(bs.Config.Code),
+			"action": "Init",
+		}).Error("Unable to open the internal database")
 	}
 
-	return bs.DB.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucketIfNotExists(bs.Config.Code)
-
-		return err
-	})
+	return
 }
 
 func (bs *BowerService) Serve(state *goapp.GoroutineState) error {
diff --git a/mirror/bower/bower_app.go b/mirror/bower/bower_app.go
@@ -40,7 +40,10 @@ func ConfigureApp(config *pkgmirror.Config, l *goapp.Lifecycle) {
 						"code":    name,
 					})
 					s.StateChan = pkgmirror.GetStateChannel(fmt.Sprintf("pkgmirror.bower.%s", name), app.Get("pkgmirror.channel.state").(chan pkgmirror.State))
-					s.Init(app)
+
+					if err := s.Init(app); err != nil {
+						panic(err)
+					}
 
 					return s
 				}
diff --git a/mirror/composer/composer.go b/mirror/composer/composer.go
@@ -45,25 +45,19 @@ type ComposerService struct {
 	StateChan chan pkgmirror.State
 }
 
-func (ps *ComposerService) Init(app *goapp.App) error {
-	var err error
-
+func (ps *ComposerService) Init(app *goapp.App) (err error) {
 	ps.Logger.Info("Init")
 
-	ps.DB, err = bolt.Open(fmt.Sprintf("%s/%s.db", ps.Config.Path, ps.Config.Code), 0600, &bolt.Options{
-		Timeout:  1 * time.Second,
-		ReadOnly: false,
-	})
-
-	if err != nil {
-		return err
+	if ps.DB, err = pkgmirror.OpenDatabaseWithBucket(ps.Config.Path, ps.Config.Code); err != nil {
+		ps.Logger.WithFields(log.Fields{
+			"error":  err,
+			"path":   ps.Config.Path,
+			"bucket": string(ps.Config.Code),
+			"action": "Init",
+		}).Error("Unable to open the internal database")
 	}
 
-	return ps.DB.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucketIfNotExists(ps.Config.Code)
-
-		return err
-	})
+	return
 }
 
 func (ps *ComposerService) Serve(state *goapp.GoroutineState) error {
diff --git a/mirror/composer/composer_app.go b/mirror/composer/composer_app.go
@@ -42,7 +42,10 @@ func ConfigureApp(config *pkgmirror.Config, l *goapp.Lifecycle) {
 						"code":    name,
 					})
 					s.StateChan = pkgmirror.GetStateChannel(fmt.Sprintf("pkgmirror.composer.%s", name), app.Get("pkgmirror.channel.state").(chan pkgmirror.State))
-					s.Init(app)
+
+					if err := s.Init(app); err != nil {
+						panic(err)
+					}
 
 					return s
 				}
diff --git a/mirror/git/git_app.go b/mirror/git/git_app.go
@@ -51,7 +51,10 @@ func ConfigureApp(config *pkgmirror.Config, l *goapp.Lifecycle) {
 						"code":    name,
 					})
 					s.StateChan = pkgmirror.GetStateChannel(fmt.Sprintf("pkgmirror.git.%s", name), app.Get("pkgmirror.channel.state").(chan pkgmirror.State))
-					s.Init(app)
+
+					if err := s.Init(app); err != nil {
+						panic(err)
+					}
 
 					return s
 				}
diff --git a/mirror/npm/npm.go b/mirror/npm/npm.go
@@ -57,25 +57,19 @@ type NpmService struct {
 	StateChan chan pkgmirror.State
 }
 
-func (ns *NpmService) Init(app *goapp.App) error {
-	var err error
-
+func (ns *NpmService) Init(app *goapp.App) (err error) {
 	ns.Logger.Info("Init")
 
-	ns.DB, err = bolt.Open(fmt.Sprintf("%s/%s.db", ns.Config.Path, ns.Config.Code), 0600, &bolt.Options{
-		Timeout:  1 * time.Second,
-		ReadOnly: false,
-	})
-
-	if err != nil {
-		return err
+	if ns.DB, err = pkgmirror.OpenDatabaseWithBucket(ns.Config.Path, ns.Config.Code); err != nil {
+		ns.Logger.WithFields(log.Fields{
+			"error":  err,
+			"path":   ns.Config.Path,
+			"bucket": string(ns.Config.Code),
+			"action": "Init",
+		}).Error("Unable to open the internal database")
 	}
 
-	return ns.DB.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucketIfNotExists(ns.Config.Code)
-
-		return err
-	})
+	return
 }
 
 func (ns *NpmService) Serve(state *goapp.GoroutineState) error {
diff --git a/mirror/npm/npm_app.go b/mirror/npm/npm_app.go
@@ -48,7 +48,10 @@ func ConfigureApp(config *pkgmirror.Config, l *goapp.Lifecycle) {
 						},
 					}
 					s.StateChan = pkgmirror.GetStateChannel(fmt.Sprintf("pkgmirror.npm.%s", name), app.Get("pkgmirror.channel.state").(chan pkgmirror.State))
-					s.Init(app)
+
+					if err := s.Init(app); err != nil {
+						panic(err)
+					}
 
 					return s
 				}
diff --git a/mirror/static/static.go b/mirror/static/static.go
@@ -52,25 +52,19 @@ type StaticService struct {
 	StateChan chan pkgmirror.State
 }
 
-func (gs *StaticService) Init(app *goapp.App) error {
+func (gs *StaticService) Init(app *goapp.App) (err error) {
 	os.MkdirAll(string(filepath.Separator)+gs.Config.Path, 0755)
 
-	var err error
-
-	gs.DB, err = bolt.Open(fmt.Sprintf("%s/%s.db", gs.Config.Path, gs.Config.Code), 0600, &bolt.Options{
-		Timeout:  1 * time.Second,
-		ReadOnly: false,
-	})
-
-	if err != nil {
-		return err
+	if gs.DB, err = pkgmirror.OpenDatabaseWithBucket(gs.Config.Path, gs.Config.Code); err != nil {
+		gs.Logger.WithFields(log.Fields{
+			"error":  err,
+			"path":   gs.Config.Path,
+			"bucket": string(gs.Config.Code),
+			"action": "Init",
+		}).Error("Unable to open the internal database")
 	}
 
-	return gs.DB.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucketIfNotExists(gs.Config.Code)
-
-		return err
-	})
+	return
 }
 
 func (gs *StaticService) Serve(state *goapp.GoroutineState) error {
diff --git a/mirror/static/static_app.go b/mirror/static/static_app.go
@@ -49,7 +49,10 @@ func ConfigureApp(config *pkgmirror.Config, l *goapp.Lifecycle) {
 						"code":    name,
 					})
 					s.StateChan = pkgmirror.GetStateChannel(fmt.Sprintf("pkgmirror.static.%s", name), app.Get("pkgmirror.channel.state").(chan pkgmirror.State))
-					s.Init(app)
+
+					if err := s.Init(app); err != nil {
+						panic(err)
+					}
 
 					return s
 				}
diff --git a/tools.go b/tools.go
@@ -9,12 +9,42 @@ import (
 	"bytes"
 	"compress/gzip"
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 	"os"
+	"path/filepath"
 	"sync"
+	"time"
+
+	"github.com/boltdb/bolt"
 )
 
+func OpenDatabaseWithBucket(basePath string, bucket []byte) (db *bolt.DB, err error) {
+	if err = os.MkdirAll(string(filepath.Separator)+basePath, 0755); err != nil {
+		return
+	}
+
+	path := fmt.Sprintf("%s/%s.db", basePath, bucket)
+
+	db, err = bolt.Open(path, 0600, &bolt.Options{
+		Timeout:  1 * time.Second,
+		ReadOnly: false,
+	})
+
+	if err != nil {
+		return
+	}
+
+	err = db.Update(func(tx *bolt.Tx) error {
+		_, err := tx.CreateBucketIfNotExists(bucket)
+
+		return err
+	})
+
+	return
+}
+
 func LoadStruct(file string, v interface{}) error {
 	r, err := os.Open(file)
 

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,10 @@ func ConfigureApp(config pkgmirror.Config, l goapp.Lifecycle) {`
`48`	`48`	`},`
`49`	`49`	`}`
`50`	`50`	`s.StateChan = pkgmirror.GetStateChannel(fmt.Sprintf("pkgmirror.npm.%s", name), app.Get("pkgmirror.channel.state").(chan pkgmirror.State))`
`51`		`- s.Init(app)`
	`51`	`+`
	`52`	`+ if err := s.Init(app); err != nil {`
	`53`	`+ panic(err)`
	`54`	`+ }`
`52`	`55`
`53`	`56`	`return s`
`54`	`57`	`}`