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.

Sign up for GitHub

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 MessgePackFactory.init outside of Engine #2648

Merged
merged 1 commit into from
Oct 11, 2019
Merged

Move MessgePackFactory.init outside of Engine #2648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions lib/fluent/engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ def init(system_config)

@root_agent = RootAgent.new(log: log, system_config: @system_config)

MessagePackFactory.init

self
end

Expand Down
3 changes: 3 additions & 0 deletions lib/fluent/supervisor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
require 'fluent/plugin'
require 'fluent/rpc'
require 'fluent/system_config'
require 'fluent/msgpack_factory'
require 'serverengine'

if Fluent.windows?
Expand Down Expand Up @@ -546,6 +547,7 @@ def run_worker
main_process do
create_socket_manager if @standalone_worker
change_privilege if @standalone_worker
MessagePackFactory.init
init_engine
run_configure
run_engine
Expand Down Expand Up @@ -577,6 +579,7 @@ def dry_run
begin
Fluent::Engine.dry_run_mode = true
change_privilege
MessagePackFactory.init
init_engine
run_configure
rescue Fluent::ConfigError => e
Expand Down