diff --git a/README.md b/README.md index da47ec8..d469b53 100644 --- a/README.md +++ b/README.md @@ -10,12 +10,12 @@ ## Database-Connection ### SQLITE -- PROVIDER = sqlite -- CON_STR = path to file (data.db) +- DB_PROVIDER = sqlite +- DB_CONNSTR = path to file (data.db) ### MySQL -- PROVIDER = mysql -- CON_STR = root:my-secret-pw@tcp(127.0.0.1:3306)/meadows +- DB_PROVIDER = mysql +- DB_CONNSTR = root:my-secret-pw@tcp(127.0.0.1:3306)/meadows ## File-Storage diff --git a/internal/data_store/mysql/dbHistory.go b/internal/data_store/mysql/dbHistory.go index e702cef..57602d6 100644 --- a/internal/data_store/mysql/dbHistory.go +++ b/internal/data_store/mysql/dbHistory.go @@ -30,7 +30,7 @@ func updateDb() { log.Fatalln(err.Error()) } } else { - db, err = sqlx.Connect("mysql", os.Getenv("CON_STR")+"meadow") + db, err = sqlx.Connect("mysql", os.Getenv("DB_CONNSTR")+"meadow") if err != nil { log.Fatalln(err) } diff --git a/internal/data_store/mysql/handler.go b/internal/data_store/mysql/handler.go index 279565d..a412ea8 100644 --- a/internal/data_store/mysql/handler.go +++ b/internal/data_store/mysql/handler.go @@ -22,15 +22,15 @@ func (m stor) GetType() string { func init() { - if os.Getenv("PROVIDER") != "mysql" { - log.New().Info("Skip mysql Init by Config: " + os.Getenv("PROVIDER")) + if os.Getenv("DB_PROVIDER") != "mysql" { + log.New().Info("Skip mysql Init by Config: " + os.Getenv("DB_PROVIDER")) Connection.ConnectionError = errors.New("mysql disabled") return } var err error - db, err = sqlx.Connect("mysql", os.Getenv("CON_STR")) + db, err = sqlx.Connect("mysql", os.Getenv("DB_CONNSTR")) if err != nil { log.Fatalln(err) } diff --git a/internal/data_store/sqlite/handler.go b/internal/data_store/sqlite/handler.go index 81a2ef8..b235dc3 100644 --- a/internal/data_store/sqlite/handler.go +++ b/internal/data_store/sqlite/handler.go @@ -23,15 +23,15 @@ func (m stor) GetType() string { func init() { - if os.Getenv("PROVIDER") != "sqlite" { - log.New().Info("Skip sqlite Init by Config: " + os.Getenv("PROVIDER")) + if os.Getenv("DB_PROVIDER") != "sqlite" { + log.New().Info("Skip sqlite Init by Config: " + os.Getenv("DB_PROVIDER")) Connection.ConnectionError = errors.New("sqlite disabled") return } var err error - db, err = sqlx.Connect("sqlite3", os.Getenv("CON_STR")) + db, err = sqlx.Connect("sqlite3", os.Getenv("DB_CONNSTR")) if err != nil { log.Fatalln(err) } diff --git a/internal/data_store/storageHandler.go b/internal/data_store/storageHandler.go index 31a8a2d..b6c2d9d 100644 --- a/internal/data_store/storageHandler.go +++ b/internal/data_store/storageHandler.go @@ -10,7 +10,7 @@ import ( func GetProvider() (*Storage, error) { var result Storage - dbProvider := os.Getenv("PROVIDER") + dbProvider := os.Getenv("DB_PROVIDER") if dbProvider == "sqlite" { result = &sqlite.Connection