Merge pull request #12 from hatena/fix-enc-bytes

fix nbytes returning from Read with encoding.

Author: daiksy

check-log/check-log.go

@@ -16,6 +16,7 @@ import (
 	"github.com/jessevdk/go-flags"
 	"github.com/mackerelio/checkers"
 	"github.com/mattn/go-encoding"
+	enc "golang.org/x/text/encoding"
 )
 
 type logOpts struct {
@@ -37,6 +38,7 @@ type logOpts struct {
 	excludeReg      *regexp.Regexp
 	fileList        []string
 	origArgs        []string
+	decoder         *enc.Decoder
 }
 
 func (opts *logOpts) prepare() error {
@@ -220,11 +222,11 @@ func (opts *logOpts) searchLog(logFile string) (int64, int64, string, error) {
 
 	var r io.Reader = f
 	if opts.Encoding != "" {
-		enc := encoding.GetEncoding(opts.Encoding)
-		if enc == nil {
+		e := encoding.GetEncoding(opts.Encoding)
+		if e == nil {
 			return 0, 0, "", fmt.Errorf("unknown encoding:" + opts.Encoding)
 		}
-		r = enc.NewDecoder().Reader(f)
+		opts.decoder = e.NewDecoder()
 	}
 
 	warnNum, critNum, readBytes, errLines, err := opts.searchReader(r)
@@ -258,6 +260,13 @@ func (opts *logOpts) searchReader(rdr io.Reader) (warnNum, critNum, readBytes in
 			break
 		}
 		readBytes += int64(len(lineBytes))
+
+		if opts.decoder != nil {
+			lineBytes, err = opts.decoder.Bytes(lineBytes)
+			if err != nil {
+				break
+			}
+		}
 		line := strings.Trim(string(lineBytes), "\r\n")
 		if matched, matches := opts.match(line); matched {
 			if len(matches) > 1 && (opts.WarnLevel > 0 || opts.CritLevel > 0) {

check-log/check_log_test.go

@@ -330,14 +330,27 @@ func TestRunWithEncoding(t *testing.T) {
 	opts, _ := parseArgs([]string{"-s", dir, "-f", logf, "-p", `エラー`, "--encoding", "euc-jp"})
 	opts.prepare()
 
-	fatal := "\xa5\xa8\xa5\xe9\xa1\xbc\n" // エラー
 	testEncoding := func() {
-		fh.Write([]byte(fatal))
+		fh.Write([]byte("\xa5\xa8\xa5\xe9\xa1\xbc\n")) // エラー
 		w, c, errLines, err := opts.searchLog(logf)
 		assert.Equal(t, err, nil, "err should be nil")
 		assert.Equal(t, int64(1), w, "something went wrong")
 		assert.Equal(t, int64(1), c, "something went wrong")
 		assert.Equal(t, "エラー\n", errLines, "something went wrong")
+
+		fh.Write([]byte("\xb0\xdb\xbe\xef\n")) // 異常
+		w, c, errLines, err = opts.searchLog(logf)
+		assert.Equal(t, err, nil, "err should be nil")
+		assert.Equal(t, int64(0), w, "something went wrong")
+		assert.Equal(t, int64(0), c, "something went wrong")
+		assert.Equal(t, "", errLines, "something went wrong")
+
+		fh.Write([]byte("\xa5\xa8\xa5\xe9\xa1\xbc\n")) // エラー
+		w, c, errLines, err = opts.searchLog(logf)
+		assert.Equal(t, err, nil, "err should be nil")
+		assert.Equal(t, int64(1), w, "something went wrong")
+		assert.Equal(t, int64(1), c, "something went wrong")
+		assert.Equal(t, "エラー\n", errLines, "something went wrong")
 	}
 	testEncoding()
 }