server.js updated.

This commit is contained in:
joewaa 2017-06-10 23:44:16 +08:00 committed by GitHub
parent cfa8b2c9fc
commit dac43a3a47

View file

@ -1,15 +1,18 @@
// OpenShift sample Node application // OpenShift sample Node application
var express = require('express'), var express = require('express'),
fs = require('fs'), //fs = require('fs'),
app = express(), app = express(),
eps = require('ejs'), //eps = require('ejs'),
morgan = require('morgan'); //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.engine('html', require('ejs').renderFile);
app.use(morgan('combined')) app.use(morgan('combined'))
*/
var port = process.env.PORT || process.env.OPENSHIFT_NODEJS_PORT || 8080, var port = process.env.PORT || process.env.OPENSHIFT_NODEJS_PORT || 8080,
ip = process.env.IP || process.env.OPENSHIFT_NODEJS_IP || '0.0.0.0', ip = process.env.IP || process.env.OPENSHIFT_NODEJS_IP || '0.0.0.0',
mongoURL = process.env.OPENSHIFT_MONGODB_DB_URL || process.env.MONGO_URL, mongoURL = process.env.OPENSHIFT_MONGODB_DB_URL || process.env.MONGO_URL,
@ -34,6 +37,16 @@ if (mongoURL == null && process.env.DATABASE_SERVICE_NAME) {
} }
} }
mongoose.Promise = global.Promise;
mongoose.connect(mongoURL)
app.use(bodyParser.urlencoded({ extended: true}));
app.use(bodyParser.json());
var routes = require('./api/routes/todoListRoutes');
routes(app);
/*
var db = null, var db = null,
dbDetails = new Object(); dbDetails = new Object();
@ -100,7 +113,7 @@ app.use(function(err, req, res, next){
initDb(function(err){ initDb(function(err){
console.log('Error connecting to Mongo. Message:\n'+err); console.log('Error connecting to Mongo. Message:\n'+err);
}); });
*/
app.listen(port, ip); app.listen(port, ip);
console.log('Server running on http://%s:%s', ip, port); console.log('Server running on http://%s:%s', ip, port);