Merge pull request #1120 from ploxiln/to_file_gzip_multi

mreiferson · web-flow · commit 6d6f453306c9 · 2019-01-07T10:45:35.000-08:00
nsq_to_file: revert gzip behavior change
diff --git a/apps/nsq_to_file/file_logger.go b/apps/nsq_to_file/file_logger.go
@@ -229,13 +229,19 @@ func (f *FileLogger) Write(p []byte) (int, error) {
 }
 
 func (f *FileLogger) Sync() error {
+	var err error
 	if f.gzipWriter != nil {
-		err := f.gzipWriter.Flush()
+		err = f.gzipWriter.Close()
 		if err != nil {
 			return err
 		}
+		err = f.out.Sync()
+		f.gzipWriter, _ = gzip.NewWriterLevel(f.out, f.opts.GZIPLevel)
+		f.writer = f.gzipWriter
+	} else {
+		err = f.out.Sync()
 	}
-	return f.out.Sync()
+	return err
 }
 
 func (f *FileLogger) currentFilename() string {

Original file line number	Diff line number	Diff line change
`@@ -229,13 +229,19 @@ func (f *FileLogger) Write(p []byte) (int, error) {`
`229`	`229`	`}`
`230`	`230`
`231`	`231`	`func (f *FileLogger) Sync() error {`
	`232`	`+ var err error`
`232`	`233`	`if f.gzipWriter != nil {`
`233`		`- err := f.gzipWriter.Flush()`
	`234`	`+ err = f.gzipWriter.Close()`
`234`	`235`	`if err != nil {`
`235`	`236`	`return err`
`236`	`237`	`}`
	`238`	`+ err = f.out.Sync()`
	`239`	`+ f.gzipWriter, _ = gzip.NewWriterLevel(f.out, f.opts.GZIPLevel)`
	`240`	`+ f.writer = f.gzipWriter`
	`241`	`+ } else {`
	`242`	`+ err = f.out.Sync()`
`237`	`243`	`}`
`238`		`- return f.out.Sync()`
	`244`	`+ return err`
`239`	`245`	`}`
`240`	`246`
`241`	`247`	`func (f *FileLogger) currentFilename() string {`