Comparing version 0.0.3 to 0.0.4
@@ -47,2 +47,13 @@ /* | ||
// Logging | ||
log: { | ||
levels: { | ||
info: true, | ||
err: true | ||
} | ||
}, | ||
// Email Configuration | ||
@@ -49,0 +60,0 @@ |
@@ -6,2 +6,7 @@ /* | ||
// Load modules | ||
var Config = require('./config'); | ||
// Declare internals | ||
@@ -32,25 +37,28 @@ | ||
if (typeof message === 'string') { | ||
if (Config.settings.log.levels[level]) { | ||
internals.print(level, message, req); | ||
} | ||
else if (req) { | ||
if (typeof message === 'string') { | ||
if (message.type === 'oauth') { | ||
internals.print(level, 'OAuth: ' + message.error + ' (' + message.text + ')', req); | ||
internals.print(level, message, req); | ||
} | ||
else { | ||
else if (req) { | ||
internals.print(level, 'HTTP: ' + message.code + ' ' + (message.message || message.text), req); | ||
} | ||
if (message.type === 'oauth') { | ||
if (message.log) { | ||
internals.print(level, 'OAuth: ' + message.error + ' (' + message.text + ')', req); | ||
} | ||
else { | ||
internals.print(level, 'Log: ' + JSON.stringify(message.log), req); | ||
internals.print(level, 'HTTP: ' + message.code + ' ' + (message.message || message.text), req); | ||
} | ||
if (message.log) { | ||
internals.print(level, 'Log: ' + JSON.stringify(message.log), req); | ||
} | ||
} | ||
} | ||
else { | ||
else { | ||
internals.print(level, JSON.stringify(message)); | ||
internals.print(level, JSON.stringify(message)); | ||
} | ||
} | ||
@@ -57,0 +65,0 @@ }; |
@@ -28,6 +28,9 @@ /* | ||
Utils.email(Config.settings.email.admin, 'ERROR: Exception on ' + Config.settings.name + ' server', err.stack, '', function (err) { | ||
if (Config.settings.email.admin) { | ||
process.exit(1); | ||
}); | ||
Utils.email(Config.settings.email.admin, 'ERROR: Exception on ' + Config.settings.name + ' server', err.stack, '', function (err) { | ||
process.exit(1); | ||
}); | ||
} | ||
}); | ||
@@ -46,4 +49,7 @@ | ||
Utils.email(Config.settings.email.admin, 'NOTICE: ' + Config.settings.name + ' server started', 'Started on ' + Os.hostname()); | ||
if (Config.settings.email.admin) { | ||
Utils.email(Config.settings.email.admin, 'NOTICE: ' + Config.settings.name + ' server started', 'Started on ' + Os.hostname()); | ||
} | ||
// Create server | ||
@@ -50,0 +56,0 @@ |
{ | ||
"name" : "hapi", | ||
"description" : "HTTP API Server based on Express with native OAuth 2.0 support", | ||
"version" : "0.0.3", | ||
"version" : "0.0.4", | ||
"author" : "Eran Hammer-Lahav <eran@hueniverse.com>", | ||
@@ -6,0 +6,0 @@ "repository" : "git://github.com/hueniverse/hapi", |
35611
912