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

Allow the Windows Service name Fluentd runs as to be configurable. #1548

Merged
merged 2 commits into from
Apr 21, 2017

Conversation

iantalarico
Copy link
Contributor

@iantalarico iantalarico commented Apr 19, 2017

This will allow the name, display name and description fluentd is running as when it is a Windows Service to be configured.

This also removes an unneeded option 'winsvcreg'

This will allow the name, display name and description fluentd is running as when it is a Windows Service to be configured.
@@ -385,6 +385,9 @@ def self.default_options
standalone_worker: false,
signame: nil,
winsvcreg: nil,
winsvc_name: 'fluentdwinsvc',
Copy link
Member

Choose a reason for hiding this comment

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

default_options is bad place for these options because
default_options is for Supervisor, not command line.
This is why test failed.

BTW, winsvcreg can be removed from default_options.
There is no use for now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is there another similar place I could add these? I couldn't find one. I can make one in fluentd?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just moved these under the fluentd.windows check. PTAL

@repeatedly
Copy link
Member

LGTM

@nurse Do you see any concern?

@nurse
Copy link
Contributor

nurse commented Apr 21, 2017

@repeatedly Looks good!

@repeatedly repeatedly merged commit 6c2fc7f into fluent:master Apr 21, 2017
@repeatedly
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants