Deploy attempt #2: db established

go-park-mail-ru · Oct 21, 2018 · f162159 · f162159
1 parent d792e8d
commit f162159
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/resources/configs/main.json b/resources/configs/main.json
@@ -14,5 +14,9 @@
     "structTmpl": "./resources/templates/struct.tmpl",
     "routerTmpl": "./resources/templates/router.tmpl"
   },
-  "database": {}
+  "database": {
+    "user": "",
+    "password": "",
+    "name": ""
+  }
 }
diff --git a/server/database/database.go b/server/database/database.go
@@ -49,8 +49,10 @@ func New(dbconf_ utiles.DatabaseConfig) *DB {
 	}
 
 	var err error
+	//postgr.db, err = sql.Open("postgres", fmt.Sprintf("user=%s password=%s dbname=%s sslmode=disable",
+	//postgr.dbconf.User, postgr.dbconf.Password, postgr.dbconf.Name))
 	postgr.db, err = sql.Open("postgres", fmt.Sprintf("user=%s password=%s dbname=%s sslmode=disable",
-	postgr.dbconf.User, postgr.dbconf.Password, postgr.dbconf.Name))
+	"waveapp", "surf", "wave"))
 	checkErr(err)
 	log.Println("postgres connection established")