Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move prospector log to its own package #4273

Merged
merged 1 commit into from
May 11, 2017

Conversation

ruflin
Copy link
Contributor

@ruflin ruflin commented May 10, 2017

This is the last step in reorganising the packages related to prospector and harvester. Follow up PR's will mainly focusing on abstracting out common functionality, standardise naming and have proper interfaces.

  • Merge log harvester and log prospector config into one config
  • Rename Log to prospector as part of the new package structure
  • Move log harvester logic to log prospector package
  • Keep common harvester logic in its own package
  • stdin harvester still heavily depends on log harvester, needs to be split up and simplified at a later stage
  • Further cleanup of Prospector interface. Wait() only exists as a temporary solution.

@ruflin ruflin added Filebeat Filebeat in progress Pull request is currently in progress. labels May 10, 2017
default:
return fmt.Errorf("Invalid input type: %v", p.config.InputType)
return fmt.Errorf("Invalid prospector type: %v. Change input_type.", p.config.InputType)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[golint] reported by reviewdog 🐶
error strings should not be capitalized or end with punctuation or a newline

@@ -509,3 +511,16 @@ func (l *Log) updateState(state file.State) error {

return nil
}

func (p *Prospector) Wait() {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[golint] reported by reviewdog 🐶
exported method Prospector.Wait should have comment or be unexported

p.Stop()
}

func (p *Prospector) Stop() {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[golint] reported by reviewdog 🐶
exported method Prospector.Stop should have comment or be unexported

state,
nil,
outlet,
)

return h, err
}

func (p *Prospector) Wait() {}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[golint] reported by reviewdog 🐶
exported method Prospector.Wait should have comment or be unexported

state,
nil,
outlet,
)

return h, err
}

func (p *Prospector) Wait() {}
func (p *Prospector) Stop() {}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[golint] reported by reviewdog 🐶
exported method Prospector.Stop should have comment or be unexported

@ruflin ruflin force-pushed the log-prospector-package branch 3 times, most recently from 78335f9 to 1e9e26c Compare May 10, 2017 09:55
@ruflin ruflin added review and removed in progress Pull request is currently in progress. labels May 10, 2017
@ruflin ruflin mentioned this pull request May 10, 2017
14 tasks
@ruflin ruflin force-pushed the log-prospector-package branch from 1e9e26c to 3255a7c Compare May 10, 2017 11:55
@ruflin
Copy link
Contributor Author

ruflin commented May 10, 2017

jenkins, retest it

@@ -18,7 +18,7 @@ import (

"github.com/satori/go.uuid"

"github.com/elastic/beats/filebeat/config"
cfg "github.com/elastic/beats/filebeat/config"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

filebeatConfig?

@ruflin ruflin force-pushed the log-prospector-package branch from 3255a7c to c4b0d62 Compare May 10, 2017 22:52
default:
return fmt.Errorf("Invalid input type: %v", p.config.InputType)
return fmt.Errorf("invalid prospector type: %v. Change input_type.", p.config.InputType)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[golint] reported by reviewdog 🐶
error strings should not be capitalized or end with punctuation or a newline

This is the last step in reorganising the packages related to prospector and harvester. Follow up PR's will mainly focusing on abstracting out common functionality, standardise naming and have proper interfaces.

* Merge log harvester and log prospector config into one config
* Rename Log to prospector as part of the new package structure
* Move log harvester logic to log prospector package
* Keep common harvester logic in its own package
* stdin harvester still heavily depends on log harvester, needs to be split up and simplified at a later stage
* Further cleanup of Prospector interface. `Wait()` only exists as a temporary solution.
@ruflin ruflin force-pushed the log-prospector-package branch from c4b0d62 to 676e836 Compare May 11, 2017 07:31
@7AC 7AC merged commit 9554daf into elastic:master May 11, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants