From 9689148b7dea2e3d12e9fe8594d3e81f6b42c81d Mon Sep 17 00:00:00 2001
From: Lucas Gabriel Lima <lgl15@inf.ufpr.br>
Date: Thu, 15 Sep 2016 11:41:09 -0300
Subject: [PATCH] moved some app.js configs to server.js
---
src/libs/app.js | 5 +----
src/server.js | 11 +++++++++--
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/libs/app.js b/src/libs/app.js
index b11df38f..ffe232b2 100644
--- a/src/libs/app.js
+++ b/src/libs/app.js
@@ -14,16 +14,13 @@ const app = express();
const api = require('./routes/api');
-const mongoose = require('./db/mongoose');
-
-const db = mongoose();
const passport = require('passport');
const jwt = require('jwt-simple');
app.use(passport.initialize());
-process.env.NODE_ENV = process.env.NODE_ENV || 'development';
+require('./middlewares/passport');
app.use(bodyParser.json());
app.use(bodyParser.urlencoded({ extended: false }));
diff --git a/src/server.js b/src/server.js
index d2521c74..54f2e543 100644
--- a/src/server.js
+++ b/src/server.js
@@ -8,8 +8,15 @@ const log = require(`${libs}/log`)(module);
const app = require(`${libs}/app`);
-app.set('port', process.env.PORT || config.get('port') || 3000);
+const mongoose = require('./db/mongoose');
+
+const db = mongoose();
+
+process.env.NODE_ENV = process.env.NODE_ENV || 'development';
+
+app.set('port', config.get('port') || 3000);
const server = app.listen(app.get('port'), () => {
- log.info(`Express server listening on port ${server.address().port}`);
+ debug(`Express server listening on port ${server.address().port}`);
+ log.info(`Express server listening on port ${config.get('port')}`);
});
--
GitLab