Merge pull request #33 from Grindlemire/logrus_support

Logrus support and Versioning for Death

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 
 go:
-   - 1.6
+   - "1.10"
 
 install:
 - go get golang.org/x/tools/cmd/cover

README.md

@@ -5,8 +5,18 @@
 
 ## Get The Library
 
+Use gopkg.in to import death based on your logger.
+
+Version | Go Get URL | source | doc | Notes |
+--------|------------|--------|-----|-------|
+2.x     | [gopkg.in/vrecan/death.v2](https://gopkg.in/vrecan/death.v2)| [source]() | [doc]() | This supports loggers who _do not_ return an error from their `Error` and `Warn` functions like [logrus](https://github.com/sirupsen/logrus)
+1.x     | [gopkg.in/vrecan/death.v1](https://gopkg.in/vrecan/death.v1)| [souce](https://github.com/vrecan/death/tree/v1.0) | [doc](https://godoc.org/gopkg.in/vrecan/death.v1) | This supports loggers who _do_ return an error from their `Error` and `Warn` functions like [seelog](https://github.com/cihub/seelog)
+
+
+
+Example
 ```bash
-go get github.com/vrecan/death
+go get gopkg.in/vrecan/death.v2
 ```
 ## Use The Library
 

death.go

@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	LOG "github.com/cihub/seelog"
+	log "github.com/sirupsen/logrus"
 )
 
 //Death manages the death of your application.
@@ -24,10 +24,10 @@ type Death struct {
 
 //Logger interface to log.
 type Logger interface {
-	Error(v ...interface{}) error
+	Error(v ...interface{})
 	Debug(v ...interface{})
 	Info(v ...interface{})
-	Warn(v ...interface{}) error
+	Warn(v ...interface{})
 }
 
 //closer is a wrapper to the struct we are going to close with metadata
@@ -45,21 +45,23 @@ func NewDeath(signals ...os.Signal) (death *Death) {
 		sigChannel:  make(chan os.Signal, 1),
 		callChannel: make(chan struct{}, 1),
 		wg:          &sync.WaitGroup{},
-		log:         LOG.Current}
+		log:         log.StandardLogger()}
 	signal.Notify(death.sigChannel, signals...)
 	death.wg.Add(1)
 	go death.listenForSignal()
 	return death
 }
 
 //SetTimeout Overrides the time death is willing to wait for a objects to be closed.
-func (d *Death) SetTimeout(t time.Duration) {
+func (d *Death) SetTimeout(t time.Duration) *Death {
 	d.timeout = t
+	return d
 }
 
 //SetLogger Overrides the default logger (seelog)
-func (d *Death) SetLogger(l Logger) {
+func (d *Death) SetLogger(l Logger) *Death {
 	d.log = l
+	return d
 }
 
 //WaitForDeath wait for signal and then kill all items that need to die.

death_unix_test.go

@@ -133,18 +133,16 @@ func (l *MockLogger) Debug(v ...interface{}) {
 	}
 }
 
-func (l *MockLogger) Error(v ...interface{}) error {
+func (l *MockLogger) Error(v ...interface{}) {
 	for _, log := range v {
 		l.Logs = append(l.Logs, log)
 	}
-	return nil
 }
 
-func (l *MockLogger) Warn(v ...interface{}) error {
+func (l *MockLogger) Warn(v ...interface{}) {
 	for _, log := range v {
 		l.Logs = append(l.Logs, log)
 	}
-	return nil
 }
 
 type neverClose struct {