Nuke OpenRC from docker image, update readme's

This commit is contained in:
Edvard
2019-02-11 11:27:33 +01:00
parent 0bf8bd4183
commit 9b986c4c14
10 changed files with 12 additions and 48 deletions
+2
View File
@@ -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
@@ -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))
@@ -32,7 +16,6 @@ func getEnvironmentString(key string) string {
// 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 {
return 0