Test
This commit is contained in:
parent
a3145f6840
commit
61367646bf
1 changed files with 5 additions and 7 deletions
12
server.js
12
server.js
|
@ -2,24 +2,22 @@
|
||||||
var express = require('express');
|
var express = require('express');
|
||||||
var webapp = express();
|
var webapp = express();
|
||||||
var Promise = require('promise');
|
var Promise = require('promise');
|
||||||
var morgan = require('morgan');
|
//var morgan = require('morgan');
|
||||||
|
|
||||||
//OpenShift Settings
|
//OpenShift Settings
|
||||||
var ip = process.env.PORT || process.env.OPENSHIFT_NODEJS_PORT || 'localhost';
|
var ip = process.env.PORT || process.env.OPENSHIFT_NODEJS_PORT || 'localhost';
|
||||||
var port = process.env.IP || process.env.OPENSHIFT_NODEJS_IP || 8080;
|
var port = process.env.IP || process.env.OPENSHIFT_NODEJS_IP || 8080;
|
||||||
|
|
||||||
//Reporting
|
//Reporting
|
||||||
webapp.use(morgan('combined'));
|
//webapp.use(morgan('combined'));
|
||||||
|
|
||||||
//External Routing
|
//External Routing
|
||||||
|
|
||||||
webapp.get('/', function(req, res) {
|
app.get('/test', function (req, res) {
|
||||||
console.log('route correct');
|
res.send('Hello World!');
|
||||||
//res.sendFile(__dirname + '/public/views/pages/index.html');
|
|
||||||
res.send('works');
|
|
||||||
});
|
});
|
||||||
|
|
||||||
webapp.use('/public', express.static(__dirname + '/public'));
|
//webapp.use('/public', express.static(__dirname + '/public'));
|
||||||
|
|
||||||
//Webapp Initialize
|
//Webapp Initialize
|
||||||
webapp.listen(port, ip);
|
webapp.listen(port, ip);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue