procfile env var interp

brave-intl · Aug 30, 2017 · cc5f072 · cc5f072
1 parent d17b700
commit cc5f072
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/Procfile b/Procfile
@@ -1,4 +1,2 @@
-ledger-web: npm run ledger-server
-ledger-worker: npm run ledger-worker
-eyeshade-web: npm run eyeshade-server
-eyeshade-worker: npm run eyeshade-worker
+web: npm run $SERVICE-server
+worker: npm run $SERVICE-worker
diff --git a/bat-utils/index.js b/bat-utils/index.js
@@ -9,7 +9,7 @@ const prefix = 'boot-'
 const parent = path.join(cwd, '..')
 const npminfo = require(path.join((underscore.last(parent.split(path.sep)) !== 'node_modules') ? cwd : path.join(parent, '..'),
     'package'))
-if (process.env.SERVICE) npminfo.name = process.env.SERVICE
+if (process.env.SERVICE) npminfo.name = 'bat-' + process.env.SERVICE
 process.npminfo = underscore.pick(npminfo,
                                   [ 'name', 'version', 'description', 'author', 'license', 'bugs', 'homepage', 'dependencies' ])
 

diff --git a/config.js b/config.js
@@ -1,5 +1,5 @@
 const perServiceEnvs = ['MONGODB_URI', 'GITHUB_CLIENT_ID', 'GITHUB_CLIENT_SECRET', 'SLACK_CHANNEL', 'SLACK_ICON_URL']
-if (process.env.SERVICE === 'bat-eyeshade') {
+if (process.env.SERVICE === 'eyeshade') {
   process.env.PORT = process.env.PORT || 3002
   perServiceEnvs.forEach(function(baseEnv) {
     process.env[baseEnv] = process.env[baseEnv] || process.env['EYESHADE_' + baseEnv]
@@ -38,7 +38,7 @@ if (process.env.BITGO_TOKEN || process.env.COINBASE_WIDGET_CODE) {
   module.exports.wallet = { }
 }
 
-if (process.env.SERVICE !== 'bat-eyeshade') {
+if (process.env.SERVICE !== 'eyeshade') {
   if (process.env.BITGO_TOKEN) {
     module.exports.wallet.bitgo =
     { accessToken       : process.env.BITGO_TOKEN
@@ -54,7 +54,7 @@ if (process.env.SERVICE !== 'bat-eyeshade') {
   }
 }
 
-if (process.env.SERVICE === 'bat-eyeshade' && process.env.PUBLISHERS_URL) {
+if (process.env.SERVICE === 'eyeshade' && process.env.PUBLISHERS_URL) {
   module.exports.publishers =
   { url                 : process.env.PUBLISHERS_URL || 'http://127.0.0.1:3000'
   , access_token        : process.env.PUBLISHERS_TOKEN || '00000000-0000-4000-0000-000000000000'

diff --git a/package.json b/package.json
@@ -8,12 +8,12 @@
     "start": "echo use 'npm run start-[ledger|eyeshade]' or 'npm run start-[ledger|eyeshade]-worker'",
     "ledger-server": "./node_modules/.bin/babel-node ledger/server.js",
     "ledger-worker": "./node_modules/.bin/babel-node --optimize_for_size --max_old_space_size=460 --gc_interval=100 ledger/worker.js",
-    "start-ledger": "DEBUG=*,-babel,-mongo:*,mongo:queries ./node_modules/.bin/babel-node ledger/server.js",
-    "start-ledger-worker": "DEBUG=*,-babel,-mongo:*,mongo:queries ./node_modules/.bin/babel-node --optimize_for_size --max_old_space_size=460 --gc_interval=100 ledger/worker.js",
+    "start-ledger": "DEBUG=*,-babel,-mongo:*,mongo:queries SERVICE=ledger ./node_modules/.bin/babel-node ledger/server.js",
+    "start-ledger-worker": "DEBUG=*,-babel,-mongo:*,mongo:queries SERVICE=ledger ./node_modules/.bin/babel-node --optimize_for_size --max_old_space_size=460 --gc_interval=100 ledger/worker.js",
     "eyeshade-server": "./node_modules/.bin/babel-node eyeshade/server.js",
     "eyeshade-worker": "./node_modules/.bin/babel-node --optimize_for_size --max_old_space_size=460 --gc_interval=100 eyeshade/worker.js",
-    "start-eyeshade": "DEBUG=*,-babel,-mongo:*,mongo:queries SERVICE=bat-eyeshade ./node_modules/.bin/babel-node eyeshade/server.js",
-    "start-eyeshade-worker": "DEBUG=*,-babel,-mongo:*,mongo:queries SERVICE=bat-eyeshade ./node_modules/.bin/babel-node --optimize_for_size --max_old_space_size=460 --gc_interval=100 eyeshade/worker.js",
+    "start-eyeshade": "DEBUG=*,-babel,-mongo:*,mongo:queries SERVICE=eyeshade ./node_modules/.bin/babel-node eyeshade/server.js",
+    "start-eyeshade-worker": "DEBUG=*,-babel,-mongo:*,mongo:queries SERVICE=eyeshade ./node_modules/.bin/babel-node --optimize_for_size --max_old_space_size=460 --gc_interval=100 eyeshade/worker.js",
     "test": "npm run test-security",
     "test-security": "nsp check"
   },