Compare `5a85fc6 ... +0 ... da76b6c`

56.98% 68.42% -0.01%

Showing 5 of 5 files from the diff.

75.98% 0.00% -1.74%

reader/utils.go changed.

64.20% 66.67% -0.10%

reader/bufreader/bufreader.go changed.

60.17% 100.00% +0.11%

mgr/runner.go changed.

61.27% 50.00% -0.11%

reader/tailx/tailx.go changed.

92.31% 100.00% +0.15%

parser/raw/raw.go changed.

@@ -276,6 +276,11 @@

		return true
	}

	if hour == 0 && minute == 0 {
		now := time.Now()
		hour = now.Hour()
		minute = now.Minute()
	}
	if !runTime.isStartLessThanEnd() {
		if runTime.GreaterThanStart(hour, minute) || runTime.LessThanEnd(hour, minute) {
			return true

@@ -356,7 +356,7 @@

	// Use readSlice to look for array,
	// accumulating full buffers.
	var frag []byte
	var full [][]byte
	var full = make([][]byte, 0, 10)
	var err error
	for {
		var e error

@@ -459,15 +459,14 @@


//ReadLine returns a string line as a normal Reader
func (b *BufReader) ReadLine() (ret string, err error) {
	now := time.Now()
	if !reader.InRunTime(now.Hour(), now.Minute(), b.runTime) {
	if !reader.InRunTime(0, 0, b.runTime) {
		time.Sleep(10 * time.Second)
		return "", nil
	}

	if b.multiLineRegexp == nil {
		ret, err = b.ReadString('\n')
		if os.IsNotExist(err) {
		if err != nil && os.IsNotExist(err) {
			if b.lastErrShowTime.Add(5 * time.Second).Before(time.Now()) {
				if !IsSelfRunner(b.Meta.RunnerName) {
					log.Errorf("runner[%v] ReadLine err %v", b.Meta.RunnerName, err)

@@ -656,10 +656,14 @@

func (r *LogExportRunner) rawReadLines(dataSourceTag string) (lines, froms []string) {
	var line string
	var err error
	lines = make([]string, 0, r.batchLen)
	if dataSourceTag != "" {
		froms = make([]string, 0, r.batchLen)
	}
	for !utils.BatchFullOrTimeout(r.RunnerName, &r.stopped, r.batchLen, r.batchSize, r.lastSend,
		r.MaxBatchLen, r.MaxBatchSize, r.MaxBatchInterval) {
		line, err = r.reader.ReadLine()
		if os.IsNotExist(err) {
		if err != nil && os.IsNotExist(err) {
			log.Debugf("Runner[%v] reader %s - error: %v, sleep 3 second...", r.Name(), r.reader.Name(), err)
			time.Sleep(3 * time.Second)
			break

@@ -294,8 +294,7 @@

			}
			return
		}
		now := time.Now()
		if !reader.InRunTime(now.Hour(), now.Minute(), ar.runtime) {
		if !reader.InRunTime(0, 0, ar.runtime) {
			time.Sleep(time.Minute)
			continue
		}

@@ -834,8 +833,7 @@

		ticker := time.NewTicker(r.statInterval)
		defer ticker.Stop()
		for {
			now := time.Now()
			if reader.InRunTime(now.Hour(), now.Minute(), r.runTime) {
			if reader.InRunTime(0, 0, r.runTime) {
				r.checkExpiredFiles()
				utils.CheckNotExistFile(r.meta.RunnerName, r.expireMap)
				r.statLogPath()

@@ -60,18 +60,21 @@


func (p *Parser) Parse(lines []string) ([]Data, error) {
	var (
		datas     = make([]Data, len(lines))
		se        = &StatsError{}
		datas = make([]Data, len(lines))
		se    = &StatsError{
			DatasourceSkipIndex: make([]int, 0, len(lines)),
		}
		dataIndex = 0
	)
	for idx, line := range lines {
		//raw格式的不应该trime空格，只需要判断剔除掉全空就好了
		if len(strings.TrimSpace(line)) <= 0 {
		//raw格式的不应该trime空格，只需要判断剔除掉全空就好了，rawReadLines中已剔除空格
		if len(line) <= 0 {
			se.DatasourceSkipIndex = append(se.DatasourceSkipIndex, idx)
			continue
		}
		d := Data{}
		d[p.keyRaw] = line
		d := Data{
			p.keyRaw: line,
		}
		if p.withTimeStamp {
			d[p.keyTimestamp] = time.Now().Format(time.RFC3339Nano)
		}

Learn more Showing 6 files with coverage changes found.

Changes in reader/dirx/dir_reader.go

-6

→

Loading file...

Changes in logkit.go

-2

→

Loading file...

Changes in reader/tailx/tailx.go

-1

-4

→

Loading file...

Changes in reader/dirx/dirx.go

-1

→

Loading file...

Changes in cli/upgrade.go

-2

→

Loading file...

Changes in reader/script/script.go

-1

-4

→

Loading file...

56.98% 68.42% -0.01%

optimize

redHJ

da76b6c

CI Passed

-4

56.99% 45.65% +0.03%

tailx stop fix

redHJ

5a85fc6

CI Passed

Files		•	•	•	Coverage
conf	ø	ø	ø	ø	97.67%
mgr	+3	+3	ø	ø	^0.03% 66.17%
parser	+1	+1	ø	ø	^0.01% 87.13%
queue	ø	ø	ø	ø	74.13%
rateio	ø	ø	ø	ø	95.74%
reader	+1	-3	+8	-4	^-0.04% 47.80%
router	ø	ø	ø	ø	54.13%
samples	ø	ø	ø	ø	100.00%
sender	ø	ø	ø	ø	45.15%
transforms	ø	ø	ø	ø	55.67%
utils	ø	ø	ø	ø	58.88%
audit/audit.go	ø	ø	ø	ø	73.63%
cleaner/cleaner.go	ø	ø	ø	ø	58.82%
cli/upgrade.go	ø	+2	ø	-2	^0.81% 47.56%
logkit.go	ø	-2	ø	+2	^-1.12% 35.20%
self/logrunner.go	ø	ø	ø	ø	53.88%
times/times.go	ø	ø	ø	ø	91.30%
Project Totals (139 files)	25,720	14,656	1,668	9,396	56.98%

276	276		return true
277	277		}
278	278
	279	+	if hour == 0 && minute == 0 {
	280	+	now := time.Now()
	281	+	hour = now.Hour()
	282	+	minute = now.Minute()
	283	+	}
279	284		if !runTime.isStartLessThanEnd() {
280	285		if runTime.GreaterThanStart(hour, minute) \|\| runTime.LessThanEnd(hour, minute) {
281	286		return true

356	356		// Use readSlice to look for array,
357	357		// accumulating full buffers.
358	358		var frag []byte
359		-	var full [][]byte
	359	+	var full = make([][]byte, 0, 10)
360	360		var err error
361	361		for {
362	362		var e error

459	459
460	460		//ReadLine returns a string line as a normal Reader
461	461		func (b *BufReader) ReadLine() (ret string, err error) {
462		-	now := time.Now()
463		-	if !reader.InRunTime(now.Hour(), now.Minute(), b.runTime) {
	462	+	if !reader.InRunTime(0, 0, b.runTime) {
464	463		time.Sleep(10 * time.Second)
465	464		return "", nil
466	465		}
467	466
468	467		if b.multiLineRegexp == nil {
469	468		ret, err = b.ReadString('\n')
470		-	if os.IsNotExist(err) {
	469	+	if err != nil && os.IsNotExist(err) {
471	470		if b.lastErrShowTime.Add(5 * time.Second).Before(time.Now()) {
472	471		if !IsSelfRunner(b.Meta.RunnerName) {
473	472		log.Errorf("runner[%v] ReadLine err %v", b.Meta.RunnerName, err)

656	656		func (r *LogExportRunner) rawReadLines(dataSourceTag string) (lines, froms []string) {
657	657		var line string
658	658		var err error
	659	+	lines = make([]string, 0, r.batchLen)
	660	+	if dataSourceTag != "" {
	661	+	froms = make([]string, 0, r.batchLen)
	662	+	}
659	663		for !utils.BatchFullOrTimeout(r.RunnerName, &r.stopped, r.batchLen, r.batchSize, r.lastSend,
660	664		r.MaxBatchLen, r.MaxBatchSize, r.MaxBatchInterval) {
661	665		line, err = r.reader.ReadLine()
662		-	if os.IsNotExist(err) {
	666	+	if err != nil && os.IsNotExist(err) {
663	667		log.Debugf("Runner[%v] reader %s - error: %v, sleep 3 second...", r.Name(), r.reader.Name(), err)
664	668		time.Sleep(3 * time.Second)
665	669		break

294	294		}
295	295		return
296	296		}
297		-	now := time.Now()
298		-	if !reader.InRunTime(now.Hour(), now.Minute(), ar.runtime) {
	297	+	if !reader.InRunTime(0, 0, ar.runtime) {
299	298		time.Sleep(time.Minute)
300	299		continue
301	300		}

Compare `5a85fc6 ... +0 ... da76b6c`

No flags found

2 Commits

834	833		ticker := time.NewTicker(r.statInterval)
835	834		defer ticker.Stop()
836	835		for {
837		-	now := time.Now()
838		-	if reader.InRunTime(now.Hour(), now.Minute(), r.runTime) {
	836	+	if reader.InRunTime(0, 0, r.runTime) {
839	837		r.checkExpiredFiles()
840	838		utils.CheckNotExistFile(r.meta.RunnerName, r.expireMap)
841	839		r.statLogPath()

60	60
61	61		func (p *Parser) Parse(lines []string) ([]Data, error) {
62	62		var (
63		-	datas = make([]Data, len(lines))
64		-	se = &StatsError{}
	63	+	datas = make([]Data, len(lines))
	64	+	se = &StatsError{
	65	+	DatasourceSkipIndex: make([]int, 0, len(lines)),
	66	+	}
65	67		dataIndex = 0
66	68		)
67	69		for idx, line := range lines {
68		-	//raw格式的不应该trime空格，只需要判断剔除掉全空就好了
69		-	if len(strings.TrimSpace(line)) <= 0 {
	70	+	//raw格式的不应该trime空格，只需要判断剔除掉全空就好了，rawReadLines中已剔除空格
	71	+	if len(line) <= 0 {
70	72		se.DatasourceSkipIndex = append(se.DatasourceSkipIndex, idx)
71	73		continue
72	74		}
73		-	d := Data{}
74		-	d[p.keyRaw] = line
	75	+	d := Data{
	76	+	p.keyRaw: line,
	77	+	}
75	78		if p.withTimeStamp {
76	79		d[p.keyTimestamp] = time.Now().Format(time.RFC3339Nano)
77	80		}

Navigation	Overlay
`t` Navigate files	`h` Toggle hits
`y` Change url to tip of branch	`m` Toggle misses
`b / v` Jump to prev/next hit line	`p` Toggle partial
`z / x` Jump to prev/next missed or partial line	`1..9` Toggle flags
`shift + o` Open current page in GitHub	`a` Toggle all on
`/ or ?` Show keyboard shortcuts dialog	`c` Toggle context lines or commits

Compare 5a85fc6 ... +0 ... da76b6c

No flags found

2 Commits

Compare `5a85fc6 ... +0 ... da76b6c`