Merge branch 'master' of github.com:kenperkins/winston-papertrail

# Conflicts: # package.json
kenperkins · Apr 29, 2016 · e5aaf6c · e5aaf6c
2 parents 49824d1 + 3898001
commit e5aaf6c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,3 @@
+.*
+*.md
+test
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+#v1.0.2
+- Fixed a bug when logging error objects [dmiddlecamp][7]
+
 # v1.0.1 #
 - Cleaned up formatting for inline meta objects #30 [byrcekahle][6]
 
@@ -61,4 +64,4 @@
 [4]: https://github.com/eric
 [5]: https://github.com/jahqueel
 [6]: https://github.com/brycekahle
-
+[7]: https://github.com/dmiddlecamp
diff --git a/lib/winston-papertrail.js b/lib/winston-papertrail.js
@@ -63,6 +63,7 @@ var os = require('os'),
 var Papertrail = exports.Papertrail = function (options) {
 
     var self = this;
+    winston.Transport.call(self, options);
 
     self._KEEPALIVE_INTERVAL = 15 * 1000;
 

diff --git a/package.json b/package.json
@@ -22,6 +22,9 @@
   "dependencies": {
     "glossy": "^0.1.7"
   },
+  "peerDependencies": {
+    "winston": ">=0.6.x"
+  },
   "main": "./lib/winston-papertrail",
   "scripts": {
     "test": "mocha test/*-test.js --spec"