Skip to content

Commit

Permalink
Removed unnecesary QM_WEB_STRING environment variable
Browse files Browse the repository at this point in the history
  • Loading branch information
wilkinson committed Jan 25, 2015
1 parent 8a68d37 commit 229bf02
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# Thanks for stopping by :-)
#
# ~~ (c) SRW, 19 May 2010
# ~~ last updated 15 Jan 2015
# ~~ last updated 25 Jan 2015

PROJ_ROOT := $(realpath $(dir $(firstword $(MAKEFILE_LIST))))

Expand Down Expand Up @@ -175,8 +175,7 @@ node-app: | $(BUILD_DIR)/node-app/
$(CD) $(BUILD_DIR)/$@ ; \
$(NPM) install ; \
$(call run-procfile, \
QM_API_STRING=$(strip $(QM_API_STRING)) \
QM_WEB_STRING='"$(BUILD_DIR)/$@/katamari.json"')
QM_API_STRING=$(strip $(QM_API_STRING)))

ruby-app: | $(BUILD_DIR)/ruby-app/
@ $(MAKE) \
Expand Down
8 changes: 2 additions & 6 deletions src/node-app/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
// See https://docs.qmachine.org/en/latest/nodejs.html for more information.
//
// ~~ (c) SRW, 06 Oct 2012
// ~~ last updated 24 Jan 2015
// ~~ last updated 25 Jan 2015

(function () {
'use strict';
Expand All @@ -22,7 +22,7 @@
/*properties
cpus, enable_api_server, enable_cors, enable_web_server, env,
launch_service, length, mongo, parse, persistent_storage,
static_content, QM_API_STRING, QM_WEB_STRING, TRAVIS, worker_procs
QM_API_STRING, TRAVIS, worker_procs
*/

// Declarations
Expand All @@ -49,10 +49,6 @@
options.persistent_storage = JSON.parse(process.env.QM_API_STRING);
}

if (process.env.QM_WEB_STRING !== undefined) {
options.static_content = JSON.parse(process.env.QM_WEB_STRING);
}

if (process.env.TRAVIS === 'true') {
// This is for use with running the unit tests on Travis CI. On their
// original infrastructure, the VMs run on 1.5 cores with burst capacity,
Expand Down

0 comments on commit 229bf02

Please sign in to comment.