Feature/misc

lib/composer.js

@@ -12,7 +12,10 @@ var internals = {};
 /*
 var config = [{
     pack: {
-        cache: 'redis'
+        cache: 'redis',
+        app: {
+            'app-specific': 'value'
+        }
     }
     servers: [
         {

lib/pack.js

@@ -43,6 +43,7 @@ exports = module.exports = internals.Pack = function (options) {
 
     this.list = {};                                                     // Loaded plugins by name
     this.events = new Events.EventEmitter();                            // Consolidated subscription to all servers' events
+    this.app = options.app || {};
 
     var cacheOptions = Catbox.defaults.apply(options.cache || Defaults.cache);
     if (!options.cache ||
@@ -149,6 +150,7 @@ internals.Pack.prototype._register = function (plugin, permissions, options, cal
 
         var methods = {
             length: selection.servers.length,
+            app: self.app,
 
             api: function (/* key, value */) {
 

lib/request.js

@@ -194,14 +194,15 @@ internals.Request.prototype.log = function (tags, data, timestamp) {
     this._logger.push(item);
     this.server.emit('request', this, item, tagsMap);
 
-    if (data &&
-        this.server.listeners('request').length === 1 &&                 // Pack always listening
+    if (this.server.listeners('request').length === 1 &&                 // Pack always listening
         this.server.settings.debug &&
         this.server.settings.debug.request &&
         Utils.intersect(tagsMap, this.server.settings.debug.request).length) {
 
-        console.error('Unmonitored error: ');
-        console.error(data.stack);
+        console.error('Unmonitored error: ' + item.tags.join(', '));
+        if (data) {
+            console.error(data instanceof Error ? data.stack : data);
+        }
     }
 };
 

test/integration/composer.js

@@ -24,7 +24,10 @@ describe('Composer', function () {
 
         var manifest = {
             pack: {
-                cache: 'memory'
+                cache: 'memory',
+                app: {
+                    my: 'special-value'
+                }
             },
             servers: [
                 {
@@ -60,7 +63,7 @@ describe('Composer', function () {
 
                     composer._packs[0]._servers[0].inject({ method: 'GET', url: '/test1' }, function (res) {
 
-                        expect(res.result).to.equal('testing123');
+                        expect(res.result).to.equal('testing123special-value');
                         done();
                     });
                 });

test/integration/pack/--test1/lib/index.js

@@ -7,7 +7,7 @@ var internals = {};
 
 exports.register = function (pack, options, next) {
 
-    pack.select('test').route({ path: '/test1', method: 'GET', handler: function () { this.reply('testing123'); } });
+    pack.select('test').route({ path: '/test1', method: 'GET', handler: function () { this.reply('testing123' + ((pack.app && pack.app.my) || '')); } });
     pack.api(internals.math);
     pack.api('glue', internals.text.glue);
 

test/integration/request.js

@@ -233,7 +233,7 @@ describe('Request', function () {
             ++prints;
 
             if (prints === 1) {
-                expect(msg).to.equal('Unmonitored error: ');
+                expect(msg).to.equal('Unmonitored error: hapi, uncaught, handler, error');
             }
             else {
                 console.error = orig;

test/unit/request.js

@@ -149,14 +149,21 @@ describe('Request', function () {
 
         it('doesn\'t throw an error when logging without data and debug is configured', function (done) {
 
-            var debugServer = new Hapi.server({ debug: { request: ['uncaught'] }});
+            var debugServer = new Hapi.server({ debug: { request: ['uncaught'] } });
             var request = new Request(debugServer, _req, _res);
 
             var fn = function () {
 
                 request.log('uncaught', null, Date.now());
             };
 
+            var orig = console.error;
+            console.error = function (msg) {
+
+                expect(msg).to.equal('Unmonitored error: uncaught');
+                console.error = orig;
+            };
+
             expect(fn).to.not.throw(Error);
             done();
         });