lqdvi/app2-api
2
0
Fork 0
Code Issues 24 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of wopr.rodax-software.com:lqdvi/app2-api

Browse Source
This commit is contained in:
David Arranz 2019-07-22 19:03:30 +02:00
commit 0e63b8b7fd
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/environments/development.js
View File

@ -14,7 +14,7 @@ module.exports = {
server: { server: {
hostname: process.env.HOSTNAME || '127.0.0.1', hostname: process.env.HOSTNAME || '127.0.0.1',
port: process.env.PORT || 1337 port: process.env.PORT || 18888
}, },
paginate: { paginate: {

2
config/environments/production.js
View File

@ -22,6 +22,6 @@ module.exports = {
server: { server: {
hostname: process.env.HOSTNAME || '127.0.0.1', hostname: process.env.HOSTNAME || '127.0.0.1',
port: process.env.PORT || 80 port: process.env.PORT || 18888
} }
} }

2
package.json
View File

@ -7,7 +7,7 @@
"main": "server.js", "main": "server.js",
"scripts": { "scripts": {
"start": "NODE_ENV=development nodemon server.js", "start": "NODE_ENV=development nodemon server.js",
"start:prod": "NODE_ENV=production pm2 start server.js -n 'api' -i 0", "start:prod": "NODE_ENV=production pm2 start server.js -n 'api2' -i 0",
"lint": "eslint **/*.js --quiet", "lint": "eslint **/*.js --quiet",
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
}, },

8
server.js
View File

@ -10,8 +10,8 @@ const { express, logger, models } = require('./core');
const currentState = assign({ const currentState = assign({
launchedAt: Date.now(), launchedAt: Date.now(),
appPath: process.cwd(), appPath: process.cwd(),
host: process.env.HOST || process.env.HOSTNAME || 'localhost', //host: process.env.HOST || process.env.HOSTNAME || 'localhost',
port: process.env.PORT || 1337, //port: process.env.PORT || 18888,
environment: toLower(process.env.NODE_ENV) || 'development', environment: toLower(process.env.NODE_ENV) || 'development',
connections: {} connections: {}
}, config); }, config);
@ -51,7 +51,7 @@ server.on('error', err => {
try { try {
models.sequelize.sync({ force: false }).then(() => { models.sequelize.sync({ force: false }).then(() => {
// Launch server. // Launch server.
server.listen(currentState.port, (err) => { server.listen(currentState.server.port, (err) => {
if (err) { if (err) {
logger.debug(`⚠️ Server wasn't able to start properly.`); logger.debug(`⚠️ Server wasn't able to start properly.`);
logger.error(err); logger.error(err);
@ -64,7 +64,7 @@ try {
logger.info('Process PID: ' + process.pid); logger.info('Process PID: ' + process.pid);
//logger.info(`Version: ${this.config.info.strapi} (node v${this.config.info.node})`); //logger.info(`Version: ${this.config.info.strapi} (node v${this.config.info.node})`);
logger.info('To shut down your server, press <CTRL> + C at any time'); logger.info('To shut down your server, press <CTRL> + C at any time');
logger.info(`⚡️ Server: http://${currentState.host}:${currentState.port}`); logger.info(`⚡️ Server: http://${currentState.server.hostname}:${currentState.server.port}`);
}); });
}); });