Clean current output file name (#304)

ylegat · Jun 16, 2016 · 2c49556 · 2c49556
1 parent d0e1858
commit 2c49556
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/output_file.go b/output_file.go
@@ -11,8 +11,8 @@ import (
 	"sort"
 	"strconv"
 	"strings"
-	"time"
 	"sync"
+	"time"
 )
 
 var dateFileNameFuncs = map[string]func() string{
@@ -170,7 +170,7 @@ func (o *FileOutput) filename() string {
 }
 
 func (o *FileOutput) updateName() {
-	o.currentName = o.filename()
+	o.currentName = filepath.Clean(o.filename())
 }
 
 func (o *FileOutput) Write(data []byte) (n int, err error) {

diff --git a/output_file_test.go b/output_file_test.go
@@ -53,6 +53,17 @@ func TestFileOutput(t *testing.T) {
 	close(quit)
 }
 
+func TestFileOutputWithNameCleaning(t *testing.T) {
+	output := &FileOutput{pathTemplate: "./test_requests.gor", config: &FileOutputConfig{flushInterval: time.Minute, append: false}}
+	expectedFileName := "test_requests_0.gor"
+	output.updateName()
+
+	if expectedFileName != output.currentName {
+		t.Errorf("Expected path %s but got %s", expectedFileName, output.currentName)
+	}
+
+}
+
 func TestFileOutputPathTemplate(t *testing.T) {
 	output := &FileOutput{pathTemplate: "/tmp/log-%Y-%m-%d-%S", config: &FileOutputConfig{flushInterval: time.Minute, append: true}}
 	now := time.Now()