Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions lib/fluent/supervisor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -721,6 +721,18 @@ def run_supervisor(dry_run: false)
$log.error 'config error', file: @config_path, error: e
$log.debug_backtrace
exit!(1)
rescue ScriptError => e # LoadError, NotImplementedError, SyntaxError
if e.respond_to?(:path)
$log.error e.message, path: e.path, error: e
else
$log.error e.message, error: e
end
$log.debug_backtrace
exit!(1)
rescue => e
$log.error "unexpected error", error: e
$log.debug_backtrace
exit!(1)
end

if dry_run
Expand Down
2 changes: 1 addition & 1 deletion test/command/test_fluentd.rb
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ def assert_fluentd_fails_to_start(cmdline, *pattern_list, timeout: 20)

assert_fluentd_fails_to_start(
create_cmdline(conf_path, "-p", File.dirname(plugin_path)),
/in_buggy.rb:\d+:.+\(SyntaxError\)/
/\[error\]: .+in_buggy.rb:\d+: syntax error/
)
end
end
Expand Down
Loading