From 2a06128515711aac35d7688dca54861d4ab8103d Mon Sep 17 00:00:00 2001 From: joewaa Date: Sun, 11 Jun 2017 06:16:02 +0800 Subject: [PATCH] server update --- server.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/server.js b/server.js index ee2286a..270ad96 100644 --- a/server.js +++ b/server.js @@ -1,18 +1,19 @@ // OpenShift sample Node application var express = require('express'), - //fs = require('fs'), + fs = require('fs'), app = express(), - //eps = require('ejs'), - //morgan = require('morgan'), + eps = require('ejs'), + morgan = require('morgan'), mongoose = require('mongoose'), Task = require('./api/models/todoListModel'), bodyParser = require('body-parser'); -//Object.assign=require('object-assign') -/* +Object.assign=require('object-assign') + app.engine('html', require('ejs').renderFile); app.use(morgan('combined')) -*/ + + var port = process.env.PORT || process.env.OPENSHIFT_NODEJS_PORT || 8080, ip = process.env.IP || process.env.OPENSHIFT_NODEJS_IP || '0.0.0.0', mongoURL = process.env.OPENSHIFT_MONGODB_DB_URL || process.env.MONGO_URL, @@ -46,9 +47,9 @@ app.use(bodyParser.json()); var routes = require('./api/routes/todoListRoutes'); routes(app); -/* -var db = null, - dbDetails = new Object(); + + +var db = null, dbDetails = new Object(); var initDb = function(callback) { if (mongoURL == null) return; @@ -113,8 +114,7 @@ app.use(function(err, req, res, next){ initDb(function(err){ console.log('Error connecting to Mongo. Message:\n'+err); }); -*/ + app.listen(port, ip); console.log('Server running on http://%s:%s', ip, port); - module.exports = app ;