Merge pull request #181 from clarkie/master

Add colors to the http verbs.
hapijs · Sep 8, 2014 · b10491f · b10491f
2 parents 0b0204a + ebe0016
commit b10491f
Show file tree

Hide file tree

Showing 2 changed files with 160 additions and 3 deletions.
diff --git a/lib/monitor.js b/lib/monitor.js
@@ -510,7 +510,7 @@ internals.Monitor.prototype._request = function () {
         if (self.settings.logRequestHeaders) {
            event.headers = req.headers;
         }
-        
+
         if (self.settings.logRequestPayload) {
            event.requestPayload = request.payload;
         }
@@ -600,6 +600,10 @@ internals.Monitor.prototype._display = function (events) {
                 }
             }
 
+            var methodColors = { 'get': 32, 'delete': 31, 'put': 36, 'post': 33 };
+            var color = methodColors[event.method] || 34;
+            var method = '\x1b[1;' + color + 'm' + event.method + '\x1b[0m';
+
             if (event.statusCode) {
                 var color = (event.statusCode >= 500 ? 31 : (event.statusCode >= 400 ? 33 : (event.statusCode >= 300 ? 36 : 32)));
                 statusCode = ' \x1b[' + color + 'm' + event.statusCode + '\x1b[0m';
@@ -608,7 +612,7 @@ internals.Monitor.prototype._display = function (events) {
             internals.printEvent({
                 timestamp: event.timestamp,
                 tags: ['request'],
-                data: event.instance + ': ' + event.method + ' ' + event.path + ' ' + query + statusCode + ' (' + event.responseTime + 'ms)' + responsePayload
+                data: event.instance + ': ' + method + ' ' + event.path + ' ' + query + statusCode + ' (' + event.responseTime + 'ms)' + responsePayload
             });
         }
         else if (event.event === 'error') {

diff --git a/test/monitor.js b/test/monitor.js
@@ -2082,7 +2082,160 @@ describe('Monitor', function () {
                     done();
                 });
             });
-        })
+        });
+
+        describe('print http verb', function() {
+
+              it('get', function (done) {
+
+                var options = {
+                    subscribers: {}
+                };
+
+                makePack(function (pack, server) {
+
+                    var monitor = new Monitor(pack, options);
+
+                    var events = [{
+                        event: 'request',
+                        instance: 'testInstance',
+                        method: 'get',
+                        statusCode: 200
+                    }];
+
+                    // trap console output so it doesnt show up in stdout
+                    var trapConsole = console.log;
+                    console.log = function(string) {
+
+                        expect(string).to.contain('[1;32mget');
+                    };
+                    monitor._display(events);
+                    // reset console.log back to normal
+                    console.log = trapConsole;
+                    done();
+                });
+            });
+
+            it('post', function (done) {
+
+                var options = {
+                    subscribers: {}
+                };
+
+                makePack(function (pack, server) {
+
+                    var monitor = new Monitor(pack, options);
+
+                    var events = [{
+                        event: 'request',
+                        instance: 'testInstance',
+                        method: 'post',
+                        statusCode: 200
+                    }];
+
+                    // trap console output so it doesnt show up in stdout
+                    var trapConsole = console.log;
+                    console.log = function(string) {
+
+                        expect(string).to.contain('[1;33mpost');
+                    };
+                    monitor._display(events);
+                    // reset console.log back to normal
+                    console.log = trapConsole;
+                    done();
+                });
+            });
+
+            it('put', function (done) {
+
+                var options = {
+                    subscribers: {}
+                };
+
+                makePack(function (pack, server) {
+
+                    var monitor = new Monitor(pack, options);
+
+                    var events = [{
+                        event: 'request',
+                        instance: 'testInstance',
+                        method: 'put',
+                        statusCode: 200
+                    }];
+
+                    // trap console output so it doesnt show up in stdout
+                    var trapConsole = console.log;
+                    console.log = function(string) {
+
+                        expect(string).to.contain('[1;36mput');
+                    };
+                    monitor._display(events);
+                    // reset console.log back to normal
+                    console.log = trapConsole;
+                    done();
+                });
+            });
+
+            it('delete', function (done) {
+
+                var options = {
+                    subscribers: {}
+                };
+
+                makePack(function (pack, server) {
+
+                    var monitor = new Monitor(pack, options);
+
+                    var events = [{
+                        event: 'request',
+                        instance: 'testInstance',
+                        method: 'delete',
+                        statusCode: 200
+                    }];
+
+                    // trap console output so it doesnt show up in stdout
+                    var trapConsole = console.log;
+                    console.log = function(string) {
+
+                        expect(string).to.contain('[1;31mdelete');
+                    };
+                    monitor._display(events);
+                    // reset console.log back to normal
+                    console.log = trapConsole;
+                    done();
+                });
+            });
+
+            it('other', function (done) {
+
+                var options = {
+                    subscribers: {}
+                };
+
+                makePack(function (pack, server) {
+
+                    var monitor = new Monitor(pack, options);
+
+                    var events = [{
+                        event: 'request',
+                        instance: 'testInstance',
+                        method: 'other',
+                        statusCode: 200
+                    }];
+
+                    // trap console output so it doesnt show up in stdout
+                    var trapConsole = console.log;
+                    console.log = function(string) {
+
+                        expect(string).to.contain('[1;34mother');
+                    };
+                    monitor._display(events);
+                    // reset console.log back to normal
+                    console.log = trapConsole;
+                    done();
+                });
+            });
+        });
     });
 
     describe('#_error', function () {