Procházet zdrojové kódy

:recycle: fixing bugs in how manifest sets production vs local db vars

tags/0.0.3^2
j před 3 roky
rodič
revize
bceb6a642b
1 změnil soubory, kde provedl 19 přidání a 25 odebrání
  1. 19
    25
      backend/server/manifest.js

+ 19
- 25
backend/server/manifest.js Zobrazit soubor

7
 
7
 
8
 const confs = {
8
 const confs = {
9
     local: {
9
     local: {
10
+        db: process.env.DB_NAME,
10
         host: process.env.DB_HOST,
11
         host: process.env.DB_HOST,
11
         port: process.env.DB_PORT,
12
         port: process.env.DB_PORT,
12
-        dbname: process.env.DB_NAME,
13
+        ssl: false,
13
         user: process.env.DB_USER,
14
         user: process.env.DB_USER,
14
         pw: process.env.DB_ROOT_PASSWORD,
15
         pw: process.env.DB_ROOT_PASSWORD,
15
-        ssl: false,
16
     },
16
     },
17
     prod: {
17
     prod: {
18
+        db: process.env.PSCALE_DB_NAME,
18
         host: process.env.PSCALE_DB_HOST,
19
         host: process.env.PSCALE_DB_HOST,
19
         port: process.env.PSCALE_DB_PORT,
20
         port: process.env.PSCALE_DB_PORT,
20
-        dbname: process.env.PSCALE_DB_NAME,
21
         branch: process.env.PSCALE_DB_BRANCH,
21
         branch: process.env.PSCALE_DB_BRANCH,
22
+        ssl: true,
22
         user: process.env.PSCALE_DB_USER,
23
         user: process.env.PSCALE_DB_USER,
23
         pw: process.env.PSCALE_DB_PASSWORD,
24
         pw: process.env.PSCALE_DB_PASSWORD,
24
-        ssl: true,
25
+    },
26
+    dbFlavor: process.env.DB_TYPE,
27
+    useLocalDb: () => {
28
+        return process.env.USE_LOCAL_DB == 'true'
25
     },
29
     },
26
 }
30
 }
27
 
31
 
28
-const current = {
29
-    ssl: process.env.USE_LOCAL_DB == true ? confs.local.ssl : confs.prod.ssl,
30
-    host: process.env.USE_LOCAL_DB == true ? confs.local.host : confs.prod.host,
31
-    port: process.env.USE_LOCAL_DB == true ? confs.local.port : confs.prod.port,
32
-    dbname:
33
-        process.env.USE_LOCAL_DB == true
34
-            ? confs.local.dbname
35
-            : confs.prod.dbname,
36
-    user: process.env.USE_LOCAL_DB == true ? confs.local.user : confs.prod.user,
37
-    pw: process.env.USE_LOCAL_DB == true ? confs.local.pw : confs.prod.pw,
32
+const _current = {
33
+    ssl: confs.useLocalDb() ? confs.local.ssl : confs.prod.ssl,
34
+    host: confs.useLocalDb() ? confs.local.host : confs.prod.host,
35
+    port: confs.useLocalDb() ? confs.local.port : confs.prod.port,
36
+    database: confs.useLocalDb() ? confs.local.db : confs.prod.db,
37
+    user: confs.useLocalDb() ? confs.local.user : confs.prod.user,
38
+    password: confs.useLocalDb() ? confs.local.pw : confs.prod.pw,
38
 }
39
 }
39
 
40
 
40
 /** Glue manifest as a confidence store */
41
 /** Glue manifest as a confidence store */
41
 module.exports = new Confidence.Store({
42
 module.exports = new Confidence.Store({
42
     server: {
43
     server: {
43
-        host: process.env.API_HOST,
44
+        host: _current.host,
44
         port: {
45
         port: {
45
             $filter: 'NODE_ENV',
46
             $filter: 'NODE_ENV',
46
             $default: {
47
             $default: {
47
                 $param: 'API_PORT',
48
                 $param: 'API_PORT',
48
                 $coerce: 'number',
49
                 $coerce: 'number',
49
-                $default: process.env.API_PORT,
50
+                $default: _current.port,
50
             },
51
             },
51
             test: { $value: undefined }, // Let the server find an open port
52
             test: { $value: undefined }, // Let the server find an open port
52
         },
53
         },
102
                     $base: {
103
                     $base: {
103
                         migrateOnStart: true,
104
                         migrateOnStart: true,
104
                         knex: {
105
                         knex: {
105
-                            client: process.env.DB_TYPE,
106
+                            client: confs.dbFlavor,
106
                             useNullAsDefault: true,
107
                             useNullAsDefault: true,
107
-                            connection: {
108
-                                host: current.host,
109
-                                user: current.user,
110
-                                password: current.pw,
111
-                                database: current.dbname,
112
-                                port: current.port,
113
-                                ssl: current.ssl,
114
-                            },
108
+                            connection: _current,
115
                         },
109
                         },
116
                     },
110
                     },
117
                     production: {
111
                     production: {

Načítá se…
Zrušit
Uložit