Emit "milestone" event for certain metrics

macbre · Feb 27, 2014 · ba3add3 · ba3add3
1 parent dff0488
commit ba3add3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/core/modules/requestsMonitor/requestsMonitor.js b/core/modules/requestsMonitor/requestsMonitor.js
@@ -275,17 +275,13 @@ exports.module = function(phantomas) {
 	});
 
 	// TTFB / TTLB metrics
-	var ttfbMeasured = false,
-		ipc = new (require('../../ipc'))('milestone');
+	var ttfbMeasured = false;
 
 	phantomas.on('recv', function(entry, res) {
 		// check the first response which is not a redirect (issue #74)
 		if (!ttfbMeasured && !entry.isRedirect) {
-			phantomas.setMetric('timeToFirstByte', entry.timeToFirstByte);
-			phantomas.setMetric('timeToLastByte', entry.timeToLastByte);
-
-			ipc.push('timeToFirstByte', entry.timeToFirstByte);
-			ipc.push('timeToLastByte', entry.timeToLastByte);
+			phantomas.setMetric('timeToFirstByte', entry.timeToFirstByte, true);
+			phantomas.setMetric('timeToLastByte', entry.timeToLastByte, true);
 
 			ttfbMeasured = true;
 

diff --git a/lib/index.js b/lib/index.js
@@ -115,9 +115,16 @@ function phantomas(url, options, callback) {
 	// handle page loading milestones (#240)
 	var milestoneDebug = require('debug')('phantomas:milestone');
 
-	ipc.on('milestone', function(ev, time) {
-		milestoneDebug('%s: %d ms', ev, time);
-		events.emit('milestone', ev, time);
+	ipc.on('metric', function(metric, value) {
+		switch(metric) {
+			case 'timeToFirstByte':
+			case 'timeToLastByte':
+			case 'onDOMReadyTime':
+			case 'windowOnLoadTime':
+				milestoneDebug('%s: %d ms', metric, value);
+				events.emit('milestone', metric, value);
+				break;
+		}
 	});
 
 	// process results