diff --git a/.gitignore b/.gitignore index 81928bc..783a15e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ # Logs +log logs *.log diff --git a/lib/server.js b/lib/server.js index 8d3970a..7e99ac8 100644 --- a/lib/server.js +++ b/lib/server.js @@ -1,15 +1,31 @@ var db = require('./db') var express = require('express') +var fs = require('fs') var http = require('http') var path = require('path') var peer = require('peer') var socketIO = require('socket.io') -var morgan = require('morgan') +var winston = require('winston') +var expressWinston = require('express-winston') var app = express() var server = http.Server(app) var io = socketIO(server) +var logDir = path.resolve(__dirname, '../log') + +winston.add(winston.transports.DailyRotateFile, { + filename: logDir + '/access.log', + level: 'info' +}) + +winston.add(winston.transports.File, { + filename: logDir + '/error.log', + level: 'error', + handleExceptions: true, + json: false +}) + server.listen(process.env.PORT || 3000, function () { var host = server.address().address var port = server.address().port @@ -17,7 +33,11 @@ server.listen(process.env.PORT || 3000, function () { }) app.use('/peer', peer.ExpressPeerServer(server)) -app.use(morgan('dev')) + +app.use(expressWinston.logger({ + winstonInstance: winston, + expressFormat: true +})) app.get('/js', require('./middleware/javascript')) app.get('/css', require('./middleware/css')) diff --git a/package.json b/package.json index d584cab..0f15404 100644 --- a/package.json +++ b/package.json @@ -24,9 +24,9 @@ "browserify-middleware": "^5.0.2", "classnames": "^1.2.0", "express": "^4.12.0", + "express-winston": "^0.3.1", "filepizza-peerjs": "^1.0.0", "filepizza-socket": "^1.0.0", - "morgan": "^1.5.2", "newrelic": "^1.21.1", "nib": "^1.1.0", "node-uuid": "^1.4.3", @@ -40,6 +40,7 @@ "socket.io-client": "^1.3.5", "stylus": "^0.50.0", "webrtcsupport": "^2.1.2", + "winston": "^1.0.1", "xkcd-password": "^1.2.0" }, "engines": {