From 2b9f701849956147cb1eb25d9628ef9230f71a6b Mon Sep 17 00:00:00 2001 From: hunterlong Date: Thu, 27 Sep 2018 20:36:23 -0700 Subject: [PATCH] moved files --- core/database.go | 2 +- {servers => dev/compose}/README.md | 0 {servers => dev/compose}/docker-compose-single.yml | 0 {servers => dev/compose}/docker-compose-ssl.yml | 0 {servers => dev/compose}/docker-compose-test.yml | 0 {servers => dev/compose}/docker-compose.yml | 0 {servers => dev/compose}/ec2-ssl.sh | 0 {servers => dev/compose}/init.service | 0 {servers => dev/compose}/init.sh | 0 9 files changed, 1 insertion(+), 1 deletion(-) rename {servers => dev/compose}/README.md (100%) rename {servers => dev/compose}/docker-compose-single.yml (100%) rename {servers => dev/compose}/docker-compose-ssl.yml (100%) rename {servers => dev/compose}/docker-compose-test.yml (100%) rename {servers => dev/compose}/docker-compose.yml (100%) rename {servers => dev/compose}/ec2-ssl.sh (100%) rename {servers => dev/compose}/init.service (100%) rename {servers => dev/compose}/init.sh (100%) diff --git a/core/database.go b/core/database.go index fe34a5f4..d22a7b1c 100644 --- a/core/database.go +++ b/core/database.go @@ -174,7 +174,7 @@ func (db *DbConfig) Connect(retry bool, location string) error { DbSession, err = gorm.Open(dbType, conn) if err != nil { if retry { - utils.Log(1, fmt.Sprintf("Database connection to '%v' is not available, trying again in 5 seconds...", Configs.DbHost)) + utils.Log(1, fmt.Sprintf("Database connection to '%v' is not available, trying again in 5 seconds...", conn)) return db.waitForDb() } else { fmt.Println("ERROR:", err) diff --git a/servers/README.md b/dev/compose/README.md similarity index 100% rename from servers/README.md rename to dev/compose/README.md diff --git a/servers/docker-compose-single.yml b/dev/compose/docker-compose-single.yml similarity index 100% rename from servers/docker-compose-single.yml rename to dev/compose/docker-compose-single.yml diff --git a/servers/docker-compose-ssl.yml b/dev/compose/docker-compose-ssl.yml similarity index 100% rename from servers/docker-compose-ssl.yml rename to dev/compose/docker-compose-ssl.yml diff --git a/servers/docker-compose-test.yml b/dev/compose/docker-compose-test.yml similarity index 100% rename from servers/docker-compose-test.yml rename to dev/compose/docker-compose-test.yml diff --git a/servers/docker-compose.yml b/dev/compose/docker-compose.yml similarity index 100% rename from servers/docker-compose.yml rename to dev/compose/docker-compose.yml diff --git a/servers/ec2-ssl.sh b/dev/compose/ec2-ssl.sh similarity index 100% rename from servers/ec2-ssl.sh rename to dev/compose/ec2-ssl.sh diff --git a/servers/init.service b/dev/compose/init.service similarity index 100% rename from servers/init.service rename to dev/compose/init.service diff --git a/servers/init.sh b/dev/compose/init.sh similarity index 100% rename from servers/init.sh rename to dev/compose/init.sh