Merge pull request #6 from 8thlight/VDB-337-Dockerize-vDB

VDB-337 Dockerize vDB

pkg/datastore/postgres/postgres.go

@@ -18,6 +18,7 @@ package postgres
 
 import (
 	"errors"
+	"github.com/sirupsen/logrus"
 
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq" //postgres driver
@@ -40,6 +41,7 @@ var (
 
 func NewDB(databaseConfig config.Database, node core.Node) (*DB, error) {
 	connectString := config.DbConnectionString(databaseConfig)
+	logrus.Info("Using connection string: ", connectString)
 	db, err := sqlx.Connect("postgres", connectString)
 	if err != nil {
 		return &DB{}, ErrDBConnectionFailed

pkg/transformers/shared/constants/external.go

@@ -6,23 +6,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-var initialized = false
-
-func initConfig() {
-	if initialized {
-		return
-	}
-
-	if err := viper.ReadInConfig(); err == nil {
-		fmt.Printf("Using config file: %s\n\n", viper.ConfigFileUsed())
-	} else {
-		panic(fmt.Sprintf("Could not find environment file: %v", err))
-	}
-	initialized = true
-}
-
 func getEnvironmentString(key string) string {
-	initConfig()
 	value := viper.GetString(key)
 	if value == "" {
 		panic(fmt.Sprintf("No environment configuration variable set for key: \"%v\"", key))
@@ -30,11 +14,11 @@ func getEnvironmentString(key string) string {
 	return value
 }
 
+// Returns an int from the environment, defaulting to 0 if it does not exist
 func getEnvironmentInt64(key string) int64 {
-	initConfig()
 	value := viper.GetInt64(key)
 	if value == -1 {
-		panic(fmt.Sprintf("No environment configuration variable set for key: \"%v\"", key))
+		return 0
 	}
 	return value
 }