Improve logging output for database auto init

Author: mblaschke

sync/database_mysql.go

@@ -29,21 +29,21 @@ func (database *DatabaseMysql) init() {
 				if val, ok := containerEnv["MYSQL_ROOT_PASSWORD"]; ok {
 					// get root pass from env
 					if database.Local.User == "" && database.Local.Password == "" {
-						fmt.Println("   -> local: using mysql root account (from MYSQL_ROOT_PASSWORD)")
+						fmt.Println("   -> local: using mysql root account (from env:MYSQL_ROOT_PASSWORD)")
 						database.Local.User = "root"
 						database.Local.Password = val
 					}
 				} else if val, ok := containerEnv["MYSQL_ALLOW_EMPTY_PASSWORD"]; ok {
 					// get root without password from env
 					if val == "yes" && database.Local.User == "" {
-						fmt.Println("   -> local: using mysql root account (from MYSQL_ALLOW_EMPTY_PASSWORD)")
+						fmt.Println("   -> local: using mysql root account (from env:MYSQL_ALLOW_EMPTY_PASSWORD)")
 						database.Local.User = "root"
 						database.Local.Password = ""
 					}
 				} else if user, ok := containerEnv["MYSQL_USER"]; ok {
 					if pass, ok := containerEnv["MYSQL_PASSWORD"]; ok {
 						if database.Local.User == "" && database.Local.Password == "" {
-							fmt.Println("   -> local: using mysql user account (from MYSQL_USER and MYSQL_PASSWORD)")
+							fmt.Println(fmt.Sprintf("   -> local: using mysql user account \"%s\" (from env:MYSQL_USER and env:MYSQL_PASSWORD)", user))
 							database.Local.User = user
 							database.Local.Password = pass
 						}
@@ -53,9 +53,9 @@ func (database *DatabaseMysql) init() {
 
 			// get schema from env
 			if database.Local.Schema == "" {
-				if val, ok := containerEnv["MYSQL_DATABASE"]; ok {
-					fmt.Println("   -> local: using mysql schema (from MYSQL_DATABASE)")
-					database.Local.Schema = val
+				if schema, ok := containerEnv["MYSQL_DATABASE"]; ok {
+					fmt.Println(fmt.Sprintf("   -> local: using mysql schema \"%s\" (from env:MYSQL_DATABASE)", schema))
+					database.Local.Schema = schema
 				}
 			}
 		}
@@ -79,21 +79,21 @@ func (database *DatabaseMysql) init() {
 				if val, ok := containerEnv["MYSQL_ROOT_PASSWORD"]; ok {
 					// get root pass from env
 					if database.User == "" && database.Password == "" {
-						fmt.Println("   -> remote: using mysql root account (from MYSQL_ROOT_PASSWORD)")
+						fmt.Println("   -> remote: using mysql root account (from env:MYSQL_ROOT_PASSWORD)")
 						database.User = "root"
 						database.Password = val
 					}
 				} else if val, ok := containerEnv["MYSQL_ALLOW_EMPTY_PASSWORD"]; ok {
 					// get root without password from env
 					if val == "yes" && database.User == "" {
-						fmt.Println("   -> remote: using mysql root account (from MYSQL_ALLOW_EMPTY_PASSWORD)")
+						fmt.Println("   -> remote: using mysql root account (from env:MYSQL_ALLOW_EMPTY_PASSWORD)")
 						database.User = "root"
 						database.Password = ""
 					}
 				} else if user, ok := containerEnv["MYSQL_USER"]; ok {
 					if pass, ok := containerEnv["MYSQL_PASSWORD"]; ok {
 						if database.User == "" && database.Password == "" {
-							fmt.Println("   -> remote: using mysql user account (from MYSQL_USER and MYSQL_PASSWORD)")
+							fmt.Println(fmt.Sprintf("   -> remote: using mysql user account \"%s\" (from env:MYSQL_USER and env:MYSQL_PASSWORD)", user))
 							database.User = user
 							database.Password = pass
 						}
@@ -103,9 +103,9 @@ func (database *DatabaseMysql) init() {
 
 			// get schema from env
 			if database.Schema == "" {
-				if val, ok := containerEnv["MYSQL_DATABASE"]; ok {
-					fmt.Println("   -> remote: using mysql schema (from MYSQL_DATABASE)")
-					database.Schema = val
+				if schema, ok := containerEnv["MYSQL_DATABASE"]; ok {
+					fmt.Println(fmt.Sprintf("   -> remote: using mysql schema \"%s\" (from env:MYSQL_DATABASE)", schema))
+					database.Schema = schema
 				}
 			}
 		}

sync/database_postgres.go

@@ -30,11 +30,11 @@ func (database *DatabasePostgres) init() {
 				// get superuser pass from env
 				if pass, ok := containerEnv["POSTGRES_PASSWORD"]; ok {
 					if user, ok := containerEnv["POSTGRES_USER"]; ok {
-						fmt.Println("   -> local: using postgres superadmin account (from POSTGRES_USER and POSTGRES_PASSWORD)")
+						fmt.Println(fmt.Sprintf("   -> local: using postgres superadmin account \"%s\" (from env:POSTGRES_USER and env:POSTGRES_PASSWORD)", user))
 						database.Local.User = user
 						database.Local.Password = pass
 					} else {
-						fmt.Println("   -> local: using postgres superadmin account (from POSTGRES_PASSWORD)")
+						fmt.Println("   -> local: using postgres superadmin account \"postgres\" (from env:POSTGRES_PASSWORD)")
 						// only password available
 						database.Local.User = "postgres"
 						database.Local.Password = pass
@@ -44,9 +44,9 @@ func (database *DatabasePostgres) init() {
 
 			// get schema from env
 			if database.Local.Schema == "" {
-				if val, ok := containerEnv["POSTGRES_DB"]; ok {
-					fmt.Println("   -> local: using postgres schema (from POSTGRES_DB)")
-					database.Local.Schema = val
+				if schema, ok := containerEnv["POSTGRES_DB"]; ok {
+					fmt.Println(fmt.Sprintf("   -> remote: using postgres schema \"%s\" (from env:POSTGRES_DB)", schema))
+					database.Local.Schema = schema
 				}
 			}
 		}
@@ -70,11 +70,11 @@ func (database *DatabasePostgres) init() {
 				// get superuser pass from env
 				if pass, ok := containerEnv["POSTGRES_PASSWORD"]; ok {
 					if user, ok := containerEnv["POSTGRES_USER"]; ok {
-						fmt.Println("   -> remote: using postgres superadmin account (from POSTGRES_USER and POSTGRES_PASSWORD)")
+						fmt.Println(fmt.Sprintf("   -> remote: using postgres superadmin account \"%s\" (from env:POSTGRES_USER and env:POSTGRES_PASSWORD)", user))
 						database.User = user
 						database.Password = pass
 					} else {
-						fmt.Println("   -> remote: using postgres superadmin account (from POSTGRES_PASSWORD)")
+						fmt.Println("   -> remote: using postgres superadmin account \"postgres\" (from env:POSTGRES_PASSWORD)")
 						// only password available
 						database.User = "postgres"
 						database.Password = pass
@@ -84,9 +84,9 @@ func (database *DatabasePostgres) init() {
 
 			// get schema from env
 			if database.Schema == "" {
-				if val, ok := containerEnv["POSTGRES_DB"]; ok {
-					fmt.Println("   -> remote: using postgres schema (from POSTGRES_DB)")
-					database.Schema = val
+				if schema, ok := containerEnv["POSTGRES_DB"]; ok {
+					fmt.Println(fmt.Sprintf("   -> remote: using postgres schema \"%s\" (from env:POSTGRES_DB)", schema))
+					database.Schema = schema
 				}
 			}
 		}