aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2015-10-25 12:09:29 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2015-10-25 12:22:17 +0100
commit5e634d62d599c60a34f405e26ef0c3037e9a37a3 (patch)
treeb46460fff2593f1eb7d0e8ed86489910a5d55f93 /src
parent1b77c103b2fe6532ddf8f0625ebafeec8c1f5304 (diff)
downloaddiller-server-5e634d62d599c60a34f405e26ef0c3037e9a37a3.tar.gz
diller-server-5e634d62d599c60a34f405e26ef0c3037e9a37a3.tar.bz2
diller-server-5e634d62d599c60a34f405e26ef0c3037e9a37a3.tar.xz
diller-server-5e634d62d599c60a34f405e26ef0c3037e9a37a3.zip
o Experimenting with grunt.
Diffstat (limited to 'src')
-rw-r--r--src/DillerConfig.js3
-rw-r--r--src/web/DillerWeb.js3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/DillerConfig.js b/src/DillerConfig.js
index 652561a..81ff046 100644
--- a/src/DillerConfig.js
+++ b/src/DillerConfig.js
@@ -53,11 +53,14 @@ function configureLogging(app) {
}
function DillerConfig() {
+ var httpPort = process.env.HTTP_PORT || 8080;
+
return {
isProd: isProd,
updateDillerRpc: !isProd(),
mqttUrl: mqttUrl,
postgresqlConfig: postgresqlConfig,
+ httpPort: httpPort,
configureLogging: configureLogging,
log: function () {
return log;
diff --git a/src/web/DillerWeb.js b/src/web/DillerWeb.js
index a5bdf6b..c261af7 100644
--- a/src/web/DillerWeb.js
+++ b/src/web/DillerWeb.js
@@ -105,8 +105,7 @@ function DillerWeb(diller, db, config) {
}
function listen() {
- var port = process.env.HTTP_PORT || 8080;
- app.listen(port);
+ app.listen(config.httpPort);
}
function generateRpc() {