From b344f0a1c68c195d2aca5b608ffbf8c7b0ea38cf Mon Sep 17 00:00:00 2001
From: Michael Crosby <crosbymichael@gmail.com>
Date: Wed, 2 Dec 2015 17:17:12 -0800
Subject: [PATCH] add waitgroup to journal

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
---
 journal.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/journal.go b/journal.go
index 2163f18..1c0b3fb 100644
--- a/journal.go
+++ b/journal.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
+	"sync"
 
 	"github.com/Sirupsen/logrus"
 )
@@ -25,6 +26,7 @@ func newJournal(path string) (*journal, error) {
 		enc: json.NewEncoder(f),
 		wc:  make(chan *Event, 2048),
 	}
+	j.wg.Add(1)
 	go j.start()
 	return j, nil
 }
@@ -33,9 +35,11 @@ type journal struct {
 	f   *os.File
 	enc *json.Encoder
 	wc  chan *Event
+	wg  sync.WaitGroup
 }
 
 func (j *journal) start() {
+	defer j.wg.Done()
 	for e := range j.wc {
 		et := &entry{
 			Event: e,
@@ -51,7 +55,7 @@ func (j *journal) write(e *Event) {
 }
 
 func (j *journal) Close() error {
-	// TODO: add waitgroup to make sure journal is flushed
 	close(j.wc)
+	j.wg.Wait()
 	return j.f.Close()
 }