aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-11-01 19:17:25 +0100
committerChocobozzz <florian.bigard@gmail.com>2016-11-01 19:17:25 +0100
commitd16b5172ae95f2389084ba2a301088358605771f (patch)
treed0e193bf10b4291ca5486432a4953b1748bc17ba
parentb1233aa856d9b7cd18179c96a0a4856d3ab3b319 (diff)
downloadPeerTube-d16b5172ae95f2389084ba2a301088358605771f.tar.gz
PeerTube-d16b5172ae95f2389084ba2a301088358605771f.tar.zst
PeerTube-d16b5172ae95f2389084ba2a301088358605771f.zip
Server: use constants to get port configuration
-rw-r--r--server.js4
-rw-r--r--server/initializers/constants.js3
2 files changed, 4 insertions, 3 deletions
diff --git a/server.js b/server.js
index 28ad4fc08..b29fba633 100644
--- a/server.js
+++ b/server.js
@@ -40,9 +40,6 @@ const mongoose = require('mongoose')
40const routes = require('./server/controllers') 40const routes = require('./server/controllers')
41const Request = mongoose.model('Request') 41const Request = mongoose.model('Request')
42 42
43// Get configurations
44const port = config.get('listen.port')
45
46// ----------- Command line ----------- 43// ----------- Command line -----------
47 44
48// ----------- App ----------- 45// ----------- App -----------
@@ -129,6 +126,7 @@ app.use(function (err, req, res, next) {
129 res.sendStatus(err.status || 500) 126 res.sendStatus(err.status || 500)
130}) 127})
131 128
129const port = constants.CONFIG.LISTEN.PORT
132installer.installApplication(function (err) { 130installer.installApplication(function (err) {
133 if (err) throw err 131 if (err) throw err
134 132
diff --git a/server/initializers/constants.js b/server/initializers/constants.js
index 0efbbb916..d345776ff 100644
--- a/server/initializers/constants.js
+++ b/server/initializers/constants.js
@@ -31,6 +31,9 @@ const OAUTH_LIFETIME = {
31// --------------------------------------------------------------------------- 31// ---------------------------------------------------------------------------
32 32
33const CONFIG = { 33const CONFIG = {
34 LISTEN: {
35 PORT: config.get('listen.port')
36 },
34 DATABASE: { 37 DATABASE: {
35 DBNAME: 'peertube' + config.get('database.suffix'), 38 DBNAME: 'peertube' + config.get('database.suffix'),
36 HOSTNAME: config.get('database.hostname'), 39 HOSTNAME: config.get('database.hostname'),