back to normal

This commit is contained in:
martind2000 2016-01-07 09:14:10 +00:00
parent 279dadf4bb
commit df8409cb05

46
app.js
View File

@ -1,21 +1,23 @@
var express = require('express'), path = require('path'), favicon = require('serve-favicon');
var logger = require('morgan'), cookieParser = require('cookie-parser'), bodyParser = require('body-parser');
var routes = require('./routes/index');
//var users = require('./routes/users');
var timeroute = require('./routes/time');
//var btcroute = require('./routes/btc');
//var temproute = require('./routes/temp');
//var weightroute = require('./routes/weight');
var app = express();
var express = require('express');
GLOBAL.lastcheck = {"btc": 0, "fx": 0};
app.configure(function () {
"use strict";
app.set('port', process.env.PORT || 8030);
var path = require('path');
var favicon = require('serve-favicon');
var logger = require('morgan');
var cookieParser = require('cookie-parser');
var bodyParser = require('body-parser');
var routes = require('./routes/index');
var users = require('./routes/users');
var timeroute = require('./routes/time');
var btcroute = require('./routes/btc');
var temproute = require('./routes/temp');
var weightroute = require('./routes/weight');
var app = express();
// view engine setup
app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'ejs');
@ -32,9 +34,9 @@ app.configure(function () {
//app.use('/users', users);
app.use('/time', timeroute);
// app.use('/btc', btcroute);
// app.use('/temp', temproute);
//app.use('/weight',weightroute);
app.use('/btc', btcroute);
app.use('/temp',temproute);
app.use('/weight',weightroute);
// catch 404 and forward to error handler
app.use(function(req, res, next) {
@ -43,6 +45,8 @@ app.configure(function () {
next(err);
});
// error handlers
// development error handler
// will print stacktrace
if (app.get('env') === 'development') {
@ -54,6 +58,7 @@ app.configure(function () {
});
});
}
// production error handler
// no stacktraces leaked to user
app.use(function(err, req, res, next) {
@ -63,11 +68,6 @@ app.configure(function () {
error: {}
});
});
});
module.exports = app;
http.createServer(app).listen(app.get('port'), function () {
console.log("Express server listening on port " + app.get('port'));
});