From da55eeee6038fbfa5f45f7f4ec7fe23e7aecd54a Mon Sep 17 00:00:00 2001 From: Trent Mick Date: Fri, 2 Nov 2012 13:36:46 -0700 Subject: [PATCH] back to dtrace-provider dep --- CHANGES.md | 4 +++- Makefile | 2 +- lib/bunyan.js | 2 +- package.json | 2 +- test/dtrace.test.js | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e7eea4f..365f68a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,7 +2,9 @@ ## bunyan 0.16.3 (not yet released) -(nothing yet) +- Drop 'trentm-dtrace-provider' fork dep now that + has been resolved. + Back to dtrace-provider. ## bunyan 0.16.2 diff --git a/Makefile b/Makefile index b1ac5ab..06f0d0f 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ distclean: .PHONY: test test: $(TAP) [[ -n "$(SKIP_DTRACE)" ]] || \ - node -e 'require("trentm-dtrace-provider").createDTraceProvider("isthisthingon")' && \ + node -e 'require("dtrace-provider").createDTraceProvider("isthisthingon")' && \ $(SUDO) $(TAP) --tap test/dtrace.test.js $(TAP) --tap $(TEST_FILES) diff --git a/lib/bunyan.js b/lib/bunyan.js index 3ed0dbf..14adadb 100644 --- a/lib/bunyan.js +++ b/lib/bunyan.js @@ -26,7 +26,7 @@ var fs = require('fs'); var util = require('util'); var assert = require('assert'); try { - var dtrace = require('trentm-dtrace-provider'); + var dtrace = require('dtrace-provider'); } catch (e) { dtrace = null; } diff --git a/package.json b/package.json index 51ceda2..36bbe01 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "keywords": ["log", "logging", "log4j", "json"], "dependencies": { - "trentm-dtrace-provider": "0.2.4" + "dtrace-provider": "0.2.4" }, "devDependencies": { "tap": "0.2.0", diff --git a/test/dtrace.test.js b/test/dtrace.test.js index 9ea3b56..ccce639 100644 --- a/test/dtrace.test.js +++ b/test/dtrace.test.js @@ -15,9 +15,9 @@ var bunyan = require('../lib/bunyan'); var dtracePlats = ['sunos', 'darwin', 'freebsd']; var runDtraceTests = true; try { - require('trentm-dtrace-provider') + require('dtrace-provider') } catch (e) { - console.log('# skip dtrace tests: no trentm-dtrace-provider module'); + console.log('# skip dtrace tests: no dtrace-provider module'); runDtraceTests = false; } if (!runDtraceTests) {