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

Fix cleanup resource #1483

Merged
merged 3 commits into from
Mar 2, 2017
Merged

Fix cleanup resource #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c3c0b3
Add cleanup_resources function to handle fluentd's resources in shutdown
repeatedly Mar 1, 2017
4a44d04
Sync environment detection with ServerEngine
repeatedly Mar 1, 2017
475ed45
Should not call cleanup_resources when worker is under supervisor
repeatedly Mar 1, 2017
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
6 changes: 3 additions & 3 deletions lib/fluent/env.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
# limitations under the License.
#

require 'serverengine/utils'

module Fluent
DEFAULT_CONFIG_PATH = ENV['FLUENT_CONF'] || '/etc/fluent/fluent.conf'
DEFAULT_PLUGIN_DIR = ENV['FLUENT_PLUGIN'] || '/etc/fluent/plugin'
DEFAULT_SOCKET_PATH = ENV['FLUENT_SOCKET'] || '/var/run/fluent/fluent.sock'
DEFAULT_OJ_OPTIONS = {bigdecimal_load: :float, mode: :compat, use_to_json: true}
IS_WINDOWS = /mswin|mingw/ === RUBY_PLATFORM
private_constant :IS_WINDOWS

def self.windows?
IS_WINDOWS
ServerEngine.windows?
end
end
10 changes: 10 additions & 0 deletions lib/fluent/supervisor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def before_run

def after_run
stop_rpc_server if @rpc_endpoint
Fluent::Supervisor.cleanup_resources
end

def run_rpc_server
Expand Down Expand Up @@ -387,6 +388,14 @@ def self.default_options
}
end

def self.cleanup_resources
unless Fluent.windows?
if ENV.has_key?('SERVERENGINE_SOCKETMANAGER_PATH')
FileUtils.rm_f(ENV['SERVERENGINE_SOCKETMANAGER_PATH'])
end
end
end

def initialize(opt)
@daemonize = opt[:daemonize]
@supervise = opt[:supervise]
Expand Down Expand Up @@ -493,6 +502,7 @@ def run_worker
init_engine
run_configure
run_engine
self.class.cleanup_resources if @standalone_worker
exit 0
end
end
Expand Down