minor fixes

kvch · kvch · commit 27e7561c1d5f · 2020-10-05T13:59:37.000+02:00
diff --git a/filebeat/input/filestream/identifier_inode_deviceid.go b/filebeat/input/filestream/identifier_inode_deviceid.go
@@ -28,6 +28,7 @@ import (
 
 	loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile"
 	"github.com/elastic/beats/v7/libbeat/common"
+	"github.com/elastic/beats/v7/libbeat/common/file"
 	"github.com/elastic/beats/v7/libbeat/logp"
 )
 
@@ -92,11 +93,12 @@ func (i *inodeMarkerIdentifier) markerContents() string {
 }
 
 func (i *inodeMarkerIdentifier) GetSource(e loginp.FSEvent) fileSource {
+	osstate := file.GetOSState(e.Info)
 	return fileSource{
 		info:                e.Info,
 		newPath:             e.NewPath,
 		oldPath:             e.OldPath,
-		name:                fmt.Sprintf("%s%s%s-%s", i.name, identitySep, s.FileStateOS.InodeString(), i.markerContents()),
+		name:                fmt.Sprintf("%s%s%s-%s", i.name, identitySep, osstate.InodeString(), i.markerContents()),
 		identifierGenerator: i.name,
 	}
 }
diff --git a/filebeat/input/filestream/prospector.go b/filebeat/input/filestream/prospector.go
@@ -111,12 +111,12 @@ func (p *fileProspector) Run(ctx input.Context, s *statestore.Store, hg *loginp.
 					}
 				}
 
-				p.startReading(ctx, hg, src, fe.NewPath)
+				hg.Run(ctx, src)
 
 			case loginp.OpWrite:
 				log.Debugf("File %s has been updated", fe.NewPath)
 
-				p.startReading(ctx, hg, src, fe.NewPath)
+				hg.Run(ctx, src)
 
 			case loginp.OpDelete:
 				log.Debugf("File %s has been removed", fe.OldPath)
@@ -141,11 +141,6 @@ func (p *fileProspector) Run(ctx input.Context, s *statestore.Store, hg *loginp.
 		return nil
 	})
 
-	tg.Go(func() error {
-		p.monitor.run(ctx.Cancelation, hg)
-		return nil
-	})
-
 	errs := tg.Wait()
 	if len(errs) > 0 {
 		log.Error("%s", sderr.WrapAll(errs, "running prospector failed"))

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ import (`
`28`	`28`
`29`	`29`	`loginp "github.com/elastic/beats/v7/filebeat/input/filestream/internal/input-logfile"`
`30`	`30`	`"github.com/elastic/beats/v7/libbeat/common"`
	`31`	`+ "github.com/elastic/beats/v7/libbeat/common/file"`
`31`	`32`	`"github.com/elastic/beats/v7/libbeat/logp"`
`32`	`33`	`)`
`33`	`34`
`@@ -92,11 +93,12 @@ func (i *inodeMarkerIdentifier) markerContents() string {`
`92`	`93`	`}`
`93`	`94`
`94`	`95`	`func (i *inodeMarkerIdentifier) GetSource(e loginp.FSEvent) fileSource {`
	`96`	`+ osstate := file.GetOSState(e.Info)`
`95`	`97`	`return fileSource{`
`96`	`98`	`info: e.Info,`
`97`	`99`	`newPath: e.NewPath,`
`98`	`100`	`oldPath: e.OldPath,`
`99`		`- name: fmt.Sprintf("%s%s%s-%s", i.name, identitySep, s.FileStateOS.InodeString(), i.markerContents()),`
	`101`	`+ name: fmt.Sprintf("%s%s%s-%s", i.name, identitySep, osstate.InodeString(), i.markerContents()),`
`100`	`102`	`identifierGenerator: i.name,`
`101`	`103`	`}`
`102`	`104`	`}`