add env var for data path

simpleiot · Dec 10, 2018 · 1037949 · 1037949
1 parent 6c2e32b
commit 1037949
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/cmd/portal/main.go b/cmd/portal/main.go
@@ -76,12 +76,17 @@ func httpServer(port string, db *db.Db) error {
 }
 
 func main() {
-	port := os.Getenv("PORT")
+	port := os.Getenv("SIOT_PORT")
 	if port == "" {
 		port = "8080"
 	}
 
-	db, err := db.NewDb()
+	dataDir := os.Getenv("SIOT_DATA")
+	if dataDir == "" {
+		dataDir = "./"
+	}
+
+	db, err := db.NewDb(dataDir)
 	if err != nil {
 		log.Println("Error opening db: ", err)
 		os.Exit(-1)

diff --git a/db/db.go b/db/db.go
@@ -1,6 +1,8 @@
 package db
 
 import (
+	"path"
+
 	"github.com/simpleiot/simpleiot/data"
 	"github.com/timshannon/bolthold"
 )
@@ -13,8 +15,9 @@ type Db struct {
 }
 
 // NewDb creates a new Db instance for the app
-func NewDb() (*Db, error) {
-	store, err := bolthold.Open("data.db", 0666, nil)
+func NewDb(dataDir string) (*Db, error) {
+	dbFile := path.Join(dataDir, "data.db")
+	store, err := bolthold.Open(dbFile, 0666, nil)
 	if err != nil {
 		return nil, err
 	}