back to normal

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

108
app.js
View File

@ -1,73 +1,73 @@
var express = require('express'), path = require('path'), favicon = require('serve-favicon'); var express = require('express');
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();
GLOBAL.lastcheck = {"btc": 0, "fx": 0}; GLOBAL.lastcheck = {"btc": 0, "fx": 0};
app.configure(function () { var path = require('path');
"use strict"; var favicon = require('serve-favicon');
app.set('port', process.env.PORT || 8030); 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 // view engine setup
app.set('views', path.join(__dirname, 'views')); app.set('views', path.join(__dirname, 'views'));
app.set('view engine', 'ejs'); app.set('view engine', 'ejs');
// uncomment after placing your favicon in /public // uncomment after placing your favicon in /public
//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico'))); //app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
app.use(logger('dev')); app.use(logger('dev'));
app.use(bodyParser.json()); app.use(bodyParser.json());
app.use(bodyParser.urlencoded({extended: true})); app.use(bodyParser.urlencoded({ extended: true }));
app.use(cookieParser()); app.use(cookieParser());
app.use(express.static(path.join(__dirname, 'public'))); app.use(express.static(path.join(__dirname, 'public')));
app.use('/', routes); app.use('/', routes);
//app.use('/users', users); //app.use('/users', users);
app.use('/time', timeroute); app.use('/time', timeroute);
// app.use('/btc', btcroute); app.use('/btc', btcroute);
// app.use('/temp', temproute); app.use('/temp',temproute);
//app.use('/weight',weightroute); app.use('/weight',weightroute);
// catch 404 and forward to error handler // catch 404 and forward to error handler
app.use(function (req, res, next) { app.use(function(req, res, next) {
var err = new Error('Not Found'); var err = new Error('Not Found');
err.status = 404; err.status = 404;
next(err); next(err);
}); });
// development error handler // error handlers
// development error handler
// will print stacktrace // will print stacktrace
if (app.get('env') === 'development') { if (app.get('env') === 'development') {
app.use(function (err, req, res, next) { app.use(function(err, req, res, next) {
res.status(err.status || 500); res.status(err.status || 500);
res.render('error', { res.render('error', {
message: err.message, message: err.message,
error: err error: err
});
});
}
// production error handler
// no stacktraces leaked to user
app.use(function (err, req, res, next) {
res.status(err.status || 500);
res.render('error', {
message: err.message,
error: {}
});
}); });
});
}
// production error handler
// no stacktraces leaked to user
app.use(function(err, req, res, next) {
res.status(err.status || 500);
res.render('error', {
message: err.message,
error: {}
});
}); });
module.exports = app; module.exports = app;
http.createServer(app).listen(app.get('port'), function () {
console.log("Express server listening on port " + app.get('port'));
});