Skip to content

Commit

Permalink
Switch to plot instead of bunyan
Browse files Browse the repository at this point in the history
  • Loading branch information
imlucas committed Feb 22, 2013
1 parent 6f78a4f commit b97bb12
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 37 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,3 +1,4 @@
.DS_Store
node_modules/
npm-debug.log
magneto-test.log
46 changes: 15 additions & 31 deletions lib/server.js
@@ -1,25 +1,13 @@
"use strict";

var express = require('express'),
DB = require('./db');

var app = express();

var Logger = require('bunyan');
var log = new Logger({
name: 'magneto',
streams: [
{
stream: process.stdout,
level: 'debug'
}
],
serializers: {
req: Logger.stdSerializers.req
}
});
DB = require('./db'),
app = express(),
util = require('util'),
log = require('plog')('magneto.server').level('silly');

app.use(function(err, req, res, next){
log.error(err.message);
log.error(err.stack);
res.send(err.code, err.message);
});
Expand All @@ -28,28 +16,22 @@ app.post('/', function(req, res, next){
req.body = '';

req.on('data', function (chunk) {
req.body += chunk.toString('utf8');
req.body += chunk.toString('utf8');
});

req.on('error', function (err) {
return next(err);
return next(err);
});

req.on('end', function (){
var data = (req.body) ? JSON.parse(req.body) : {},
opRegex = /DynamoDB_\d+\.([a-zA-z]+)/,
operation = opRegex.exec(req.header('x-amz-target'))[1],
response;

// log.debug({'data': data});
opRegex = /DynamoDB_\d+\.([a-zA-z]+)/,
operation = opRegex.exec(req.header('x-amz-target'))[1],
response;

log.debug(operation + ' => ' + util.inspect(data, false, 10));
response = DB.process(operation, data);
log.debug({
'data': data,
'operation': operation,
'response': response
});

log.debug(operation + ' <= ' + util.inspect(response, false, 10));
res.send(response);
});
});
Expand All @@ -76,7 +58,9 @@ app.get('/shutdown', function(){

module.exports = app;
module.exports.log = log;

// Deprecated.
module.exports.setLogLevel = function(level){
log._level = level;
// log._level = level;
return log;
};
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -26,7 +26,7 @@
"dependencies": {
"nub": "0.0.0",
"express": "3.0.0",
"bunyan": "0.13.0"
"plog": "0.0.4"
},
"devDependencies": {
"sequence": "2.2.1",
Expand Down
14 changes: 9 additions & 5 deletions test/magneto.test.js
Expand Up @@ -2,23 +2,27 @@

var assert = require("assert"),
sequence = require('sequence'),
when = require('when');
when = require('when'),
plog = require('plog');

var dynamo = require('dynamo'),
client = dynamo.createClient();

client.useSession = false;

var connected = false,
magneto = require('../'),
bunyan = require('bunyan');

magneto.setLogLevel(bunyan.ERROR);
magneto = require('../');

var db = client.get('us-east-1');
db.host = 'localhost';
db.port = 8080;

plog.find(/magneto*/)
.file('magneto-test.log')
.level('silly')
.remove('console');


describe('Magneto @func', function(){
beforeEach(function(done){
if(connected === false){
Expand Down

0 comments on commit b97bb12

Please sign in to comment.