@@ -9,6 +9,7 @@ import (

 	"os"

 	"time"

+	"golang.org/x/net/context"

 	"gopkg.in/fsnotify.v1"

 	"github.com/Sirupsen/logrus"

@@ -172,9 +173,22 @@ func followLogs(f *os.File, logWatcher *logger.LogWatcher, notifyRotate chan int

 	}

 	defer func() {

 		f.Close()

+		fileWatcher.Remove(name)

 		fileWatcher.Close()

 	}()

+	ctx, cancel := context.WithCancel(context.Background())

+	defer cancel()

+	go func() {

+		select {

+		case <-logWatcher.WatchClose():

+			fileWatcher.Remove(name)

+			cancel()

+		case <-ctx.Done():

+			return

+		}

+	}()

+

 	var retries int

 	handleRotate := func() error {

 		f.Close()

@@ -209,8 +223,7 @@ func followLogs(f *os.File, logWatcher *logger.LogWatcher, notifyRotate chan int

 			case fsnotify.Rename, fsnotify.Remove:

 				select {

 				case <-notifyRotate:

-				case <-logWatcher.WatchClose():

-					fileWatcher.Remove(name)

+				case <-ctx.Done():

 					return errDone

 				}

 				if err := handleRotate(); err != nil {

@@ -232,8 +245,7 @@ func followLogs(f *os.File, logWatcher *logger.LogWatcher, notifyRotate chan int

 				return errRetry

 			}

 			return err

-		case <-logWatcher.WatchClose():

-			fileWatcher.Remove(name)

+		case <-ctx.Done():

 			return errDone

 		}

 	}

@@ -290,7 +302,7 @@ func followLogs(f *os.File, logWatcher *logger.LogWatcher, notifyRotate chan int

 		}

 		select {

 		case logWatcher.Msg <- msg:

-		case <-logWatcher.WatchClose():

+		case <-ctx.Done():

 			logWatcher.Msg <- msg

 			for {

 				msg, err := decodeLogLine(dec, l)