Skip to content

Commit

Permalink
Remove code and dependencies for logging
Browse files Browse the repository at this point in the history
  • Loading branch information
cpoppema committed Mar 1, 2016
1 parent 13bab6c commit 945cc73
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 90 deletions.
5 changes: 0 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,7 @@
"connect": "^3.4.1",
"connect-route": "^0.1.5",
"crc": "^3.4.0",
"errorhandler": "^1.4.3",
"file-stream-rotator": "0.0.6",
"line-reader": "^0.3.0",
"morgan": "^1.6.1",
"nodemailer": "^2.0.0",
"nodemailer-sendmail-transport": "^1.0.0",
"unorm": "^1.4.1",
"walk": "^2.3.9"
},
Expand Down
80 changes: 0 additions & 80 deletions server.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
'use strict'

/**
* Node modules.
*/
var fs = require('fs')
, path = require('path')

/**
* NPM modules.
*/
var bodyParser = require('body-parser')
, connect = require('connect')
, connectRoute = require('connect-route')
// , errorHandler = require('errorhandler')
, fileStreamRotator = require('file-stream-rotator')
, morgan = require('morgan')
// , nodeMailer = require('nodemailer')
// , sendmailTransport = require('nodemailer-sendmail-transport')

/**
* Local modules.
Expand All @@ -28,38 +17,6 @@ var authMiddleware = require('./auth-middleware')

var app = connect()

/**
* Logging.
*/

// ensure log directory exists
var logDirectory = path.join(__dirname, '/log')
fs.existsSync(logDirectory) || fs.mkdirSync(logDirectory)

// create rotating access stream
var accessLogStream = fileStreamRotator.getStream(
{ filename: path.join(logDirectory, '/access-%DATE%.log')
, frequency: 'daily'
, verbose: false
, date_format: 'YYYY-MM-DD'
})
// create rotating error stream
var errorLogStream = fileStreamRotator.getStream(
{ filename: path.join(logDirectory, '/error-%DATE%.log')
, frequency: 'daily'
, verbose: false
, date_format: 'YYYY-MM-DD'
})

app.use(morgan('combined',
{ stream: accessLogStream
, skip: function(req, res) { return res.statusCode >= 400 }
}))
app.use(morgan('combined',
{ stream: errorLogStream
, skip: function(req, res) { return res.statusCode < 400 }
}))

/**
* Parse the incoming request body as json.
*/
Expand All @@ -82,43 +39,6 @@ app.use(connectRoute(views))

app.use(errorMiddleware())


// if (process.env.NODE_ENV === 'dev') {
// var notifier = require('node-notifier')
// // log everything to stdout
// app.use(morgan('short'), {stream: process.stdout})

// // must be 'used' after url routing otherwise none of the exceptions in a
// // view reaches this 'next' middleware
// app.use(errorHandler({log: function(err, str, req) {
// var title = 'Error in ' + req.method + ' ' + req.url

// notifier.notify(
// { title: title
// , message: str
// , urgency: 'critical'
// })
// }}))
// } else {
// app.use(errorHandler({log: function(err, str, req) {
// var transporter = nodeMailer.createTransport(sendmailTransport({
// path: '/usr/sbin/sendmail'
// }))
// transporter.sendMail(
// { to: (process.env.ERROR_MAILTO || 'root@localhost')
// , from: (process.env.ERROR_MAILFROM || 'root@localhost')
// , subject: 'ERROR: ' + err.constructor.name + ' in ' + req.method + ' ' + req.url
// , text: err.stack
// // , html: err.stack.replace(/(?:\r\n|\r|\n)/g, '<br>')
// },
// function callback(err, info) {
// if (err) {
// console.error(err)
// }
// })
// }}))
// }

/**
* Server start.
*/
Expand Down
5 changes: 0 additions & 5 deletions store.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,6 @@ Store.prototype.getList = function getList(done) {
}
})

walker.on('errors', function onError(root, nodeStatsArray, next) {
console.log('error', nodeStatsArray)
next()
})

walker.on('end', function onFinished() {
// sort case insensitive and accent insensitive
secrets = secrets.sort(function compareSecret(secret1, secret2) {
Expand Down

0 comments on commit 945cc73

Please sign in to comment.