fix pg provider and moving instrumentation to backup file

Author: goenning

examples/express/server.js

@@ -2,7 +2,7 @@ var miniprofiler = require('../../lib/miniprofiler.js');
 var pg = require('pg');
 
 var express = require('express');
-var connString = 'postgres://postgres:postgres@localhost/async_demo';
+var connString = 'postgres://postgres:postgres@localhost/miniprofiler';
 
 var app = express();
 app.use(miniprofiler.profile());
@@ -15,12 +15,21 @@ app.get('/', function(req, res) {
 	res.render('home');
 });
 
+app.get('/sleep', function(req, res) {
+	pg.connect(connString, function(err, client, done) {
+		client.query('SELECT pg_sleep(1)', [], function(err, result) {
+      done();
+      res.render('home');
+		});
+	});
+});
+
 app.get('/multi-query', function(req, res) {
 	pg.connect(connString, function(err, client, done) {
 		client.query('SELECT pg_sleep(1)', [], function(err, result) {
 			client.query('SELECT $1::int AS number', ['2'], function(err, result) {
 				done();
-				res.render('multi-query');
+        res.render('home');
 			});
 		});
 	});

lib/_instrument.js

@@ -0,0 +1,103 @@
+//Backup for instrument functions
+//Do we need this?
+
+//exports.instrument = addProfilingInstrumentation;
+
+/*
+ * Modifies `toInstrument` such that each function has been instrumented for miniprofiler purposes.
+ *
+ *
+ * Descends recursively, but will terminate even if there are cycles in the object graph.
+ *
+ * Adds `miniprofiler_instrumented` to `toInstrument`, any contained objects, and any contained functions.
+
+function addProfilingInstrumentation(toInstrument) {
+	if(!toInstrument){
+		throw new Error('toInstrument must be set');
+	}
+
+	if(!_.isObject(toInstrument)) {
+		throw new Error('toInstrument must be an object');
+	}
+
+	if(!toInstrument.miniprofiler_instrumented) {
+		addProfilingImpl(toInstrument);
+	}
+
+	return toInstrument;
+}
+
+
+function instrument(func, defaultName) {
+	var name = func.name || defaultName || 'Unnamed';
+
+	var ret = function() {
+		var toApply = func;
+		var that = this;
+		var args = Array.prototype.slice.call(arguments);
+
+		if(args) {
+			for(var i = 0; i < args.length; i++){
+				var arg = args[i];
+				if(arg && _.isFunction(arg)){
+					args[i] = instrument(arg, name+' arg #'+i);
+				}
+			}
+		}
+
+		return step(
+				name,
+				function() {
+					var ret = toApply.apply(that, args);
+
+					return ret;
+				}
+			);
+	};
+
+	ret.miniprofiler_instrumented = true;
+
+	return ret;
+}
+
+function addProfilingImpl(toInstrument) {
+	if(toInstrument.miniprofiler_instrumented) {
+		throw new Error('already instrumented');
+	}
+
+	toInstrument.miniprofiler_instrumented = true;
+
+	for(var prop in toInstrument) {
+		if(!toInstrument.hasOwnProperty(prop)) continue;
+
+		var toWrap = toInstrument[prop];
+
+		if(!toWrap || toWrap.miniprofiler_instrumented) continue;
+
+		if(Array.isArray(toWrap)){
+			for(var i = 0; i < toWrap.length; i++) {
+				var member = toWrap[i];
+				if(member.miniprofiler_instrumented) continue;
+
+				addProfilingImpl(member);
+			}
+
+			continue;
+		}
+
+		if(_.isFunction(toWrap)) {
+			var wrappedFunc = instrument(toWrap, prop);
+
+			toInstrument[prop] = wrappedFunc;
+
+			continue;
+		}
+
+    if(_.isObject(toWrap)) {
+      addProfilingImpl(toWrap);
+
+      continue;
+    }
+	}
+}
+*/

lib/miniprofiler.js

@@ -23,7 +23,6 @@ _.templateSettings = {
 
 // EXPORTS
 exports.configure = configure;
-exports.instrument = addProfilingInstrumentation;
 exports.profile = middleware;
 exports.for = {
 	pg: require('./providers/miniprofiler.pg.js')
@@ -179,7 +178,7 @@ function middleware(f) {
 			res.on('finish', function() {
 				stopProfiling(req);
 			});
-			res.setHeader('X-MiniProfiler-Ids', '["' + id + '"]');
+			res.setHeader('X-MiniProfiler-Ids', `["${id}"]`);
 		}
 		next();
 	};
@@ -234,37 +233,10 @@ function configure(options){
 	configured = true;
 }
 
-/*
- * Modifies `toInstrument` such that each function has been instrumented for miniprofiler purposes.
- *
- *
- * Descends recursively, but will terminate even if there are cycles in the object graph.
- *
- * Adds `miniprofiler_instrumented` to `toInstrument`, any contained objects, and any contained functions.
- */
-function addProfilingInstrumentation(toInstrument) {
-	if(!toInstrument){
-		throw new Error('toInstrument must be set');
-	}
-
-	if(!_.isObject(toInstrument)) {
-		throw new Error('toInstrument must be an object');
-	}
-
-	if(!toInstrument.miniprofiler_instrumented)
-	{
-		addProfilingImpl(toInstrument);
-	}
-
-	return toInstrument;
-}
-
 /*
  * Begins profiling the given request.
  */
 function startProfiling(request, enabled) {
-	if(!configured) throw new Error('configure() must be called before the first call to startProfiling');
-
 	var currentRequestExtension = {
 		enabled: enabled
 	};
@@ -515,76 +487,3 @@ function describeCustomTimings(customTimings, root) {
 function makeStep(name, time, parent){
 	return { name: name, startTime: time, stopTime: null, parent: parent, steps: [], customTimings: {} };
 }
-
-function instrument(func, defaultName) {
-	var name = func.name || defaultName || 'Unnamed';
-
-	var ret = function() {
-		var toApply = func;
-		var that = this;
-		var args = Array.prototype.slice.call(arguments);
-
-		if(args) {
-			for(var i = 0; i < args.length; i++){
-				var arg = args[i];
-				if(arg && _.isFunction(arg)){
-					args[i] = instrument(arg, name+' arg #'+i);
-				}
-			}
-		}
-
-		return step(
-				name,
-				function() {
-					var ret = toApply.apply(that, args);
-
-					return ret;
-				}
-			);
-	};
-
-	ret.miniprofiler_instrumented = true;
-
-	return ret;
-}
-
-function addProfilingImpl(toInstrument) {
-	if(toInstrument.miniprofiler_instrumented) {
-		throw new Error('already instrumented');
-	}
-
-	toInstrument.miniprofiler_instrumented = true;
-
-	for(var prop in toInstrument) {
-		if(!toInstrument.hasOwnProperty(prop)) continue;
-
-		var toWrap = toInstrument[prop];
-
-		if(!toWrap || toWrap.miniprofiler_instrumented) continue;
-
-		if(Array.isArray(toWrap)){
-			for(var i = 0; i < toWrap.length; i++) {
-				var member = toWrap[i];
-				if(member.miniprofiler_instrumented) continue;
-
-				addProfilingImpl(member);
-			}
-
-			continue;
-		}
-
-		if(_.isObject(toWrap)) {
-			addProfilingImpl(toWrap);
-
-			continue;
-		}
-
-		if(_.isFunction(toWrap)) {
-			var wrappedFunc = instrument(toWrap, prop);
-
-			toInstrument[prop] = wrappedFunc;
-
-			continue;
-		}
-	}
-}

lib/providers/miniprofiler.pg.js

@@ -1,10 +1,10 @@
 var pgQuery;
 
 module.exports = function(pg) {
-	pgQuery = pgQuery || pg.Client.prototype.query;
 	return function(req, res, next) {
+    pgQuery = pgQuery || pg.Client.prototype.query;
     if (req.miniprofiler.enabled) {
-      pg.Client.query = function(config, values, callback) {
+      pg.Client.prototype.query = function(config, values, callback) {
 				req.miniprofiler.timeQuery('sql', config.toString(), pgQuery.bind(this), config, values, callback);
 			};
 		}