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

Make the default umask a string #3679

Merged
merged 1 commit into from Mar 18, 2022
Merged

Conversation

syedriko
Copy link
Contributor

Signed-off-by: Sergey Yedrikov syedriko@redhat.com

This is a correction to a previous commit that added the --umask command line parameter.
The default umask needs to be a string, otherwise the following happens:

2022-03-16 05:14:45 +0000 [error]: unexpected error error_class=ArgumentError error="wrong number of arguments (given 1, expected 0)"
2022-03-16 05:14:45 +0000 [error]: /usr/local/share/gems/gems/fluentd-1.14.5/lib/fluent/supervisor.rb:714:in `to_i'

Which issue(s) this PR fixes:
None

Copy link
Member

@ashie ashie left a comment

Choose a reason for hiding this comment

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

Ah, sorry I missed it.
In addition, default values should be placed in Supervisor.default_options

opts = Fluent::Supervisor.default_options

def self.default_options
{
config_path: Fluent::DEFAULT_CONFIG_PATH,
plugin_dirs: [Fluent::DEFAULT_PLUGIN_DIR],
log_level: Fluent::Log::LEVEL_INFO,
log_path: nil,
daemonize: nil,
libs: [],
setup_path: nil,
chuser: nil,
chgroup: nil,
root_dir: nil,
suppress_interval: 0,
suppress_repeated_stacktrace: true,
ignore_repeated_log_interval: nil,
without_source: nil,
enable_input_metrics: nil,
enable_size_metrics: nil,
use_v1_config: true,
strict_config_value: nil,
supervise: true,
standalone_worker: false,
signame: nil,
conf_encoding: 'utf-8',
disable_shared_socket: nil
}

Signed-off-by: Sergey Yedrikov <syedriko@redhat.com>
@ashie ashie merged commit 6927305 into fluent:master Mar 18, 2022
@ashie
Copy link
Member

ashie commented Mar 18, 2022

Thanks!

@syedriko syedriko deleted the umask_cli_correction branch March 18, 2022 15:32
@ashie ashie added this to the v1.14.6 milestone Mar 30, 2022
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.

None yet

2 participants