Skip to content

Commit

Permalink
Fix dump config function to move into server module
Browse files Browse the repository at this point in the history
  • Loading branch information
naritta committed Apr 28, 2016
1 parent ef49db5 commit 68448fe
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions lib/fluent/supervisor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,14 @@ def kill_worker
end
end
end

def supervisor_dump_config_handler
$log.info config[:fluentd_conf].to_s
end

def supervisor_get_dump_config_handler
{conf: config[:fluentd_conf].to_s}
end
end

module WorkerModule
Expand Down Expand Up @@ -221,7 +229,7 @@ def self.load_config(path, params = {})
WorkerModule.name,
path,
JSON.dump(params)],
fluentd: fluentd_conf,
fluentd_conf: fluentd_conf,
main_cmd: main_cmd,
}
pre_params = params.dup
Expand Down Expand Up @@ -511,14 +519,6 @@ def main_process(&block)
exit! 1
end

def supervisor_dump_config_handler
$log.info @conf.to_s
end

def supervisor_get_dump_config_handler
{conf: @conf.to_s}
end

def read_config
$log.info "reading config file", path: @config_path
@config_fname = File.basename(@config_path)
Expand Down

0 comments on commit 68448fe

Please sign in to comment.