Merge pull request #6 from thiagopereiramartinez/master

Atualização das configurações
caronaprime · Jan 17, 2020 · 4537128 · 4537128
2 parents 5daf3c3 + e9a03c5
commit 4537128
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/functions/config.json b/functions/config.json
@@ -1,6 +1,7 @@
 {
     "projectId": "carona-prime",
     "sql": {
+        "host": "34.68.132.157",
         "user": "root",
         "password": "CaronaPrime2020",
         "database": "caronaprime",

diff --git a/functions/lib/db/index.js b/functions/lib/db/index.js
@@ -17,12 +17,24 @@ if (!(config &&
     throw "SQL Error: SQL configuration is not available. Please, enter the settings in config.json file."
 }
 
-const mysqlConfig = {
-    connectionLimit: 1,
-    user: config.sql.user,
-    password: config.sql.password,
-    database: config.sql.database,
-    socketPath: config.sql.socketPath
+var mysqlConfig = null;
+
+if (process.env.GCLOUD_PROJECT !== undefined) {
+    mysqlConfig = {
+        connectionLimit: 1,
+        user: config.sql.user,
+        password: config.sql.password,
+        database: config.sql.database,
+        socketPath: config.sql.socketPath
+    }
+} else {
+    mysqlConfig = {
+        host: config.sql.host,
+        connectionLimit: 1,
+        user: config.sql.user,
+        password: config.sql.password,
+        database: config.sql.database
+    }
 }
 
 // Módulo