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

Add an option to disable shared socket forcedly #3250

Merged
merged 3 commits into from
Feb 16, 2021
Merged

Add an option to disable shared socket forcedly #3250

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bdd5dd
Add an option to disable shared socket forcedly
ashie Feb 15, 2021
de4439b
Make sure to clean ENV value on testing disable_shared_socket
ashie Feb 16, 2021
3f70cc7
Fix testing disable_shared_socket on Windows
ashie Feb 16, 2021
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
Prev Previous commit
Fix testing disable_shared_socket on Windows 
Should wait starting event thread before calling after_run.

Signed-off-by: Takuro Ashie <ashie@clear-code.com>
  • Loading branch information
@ashie
ashie committed Feb 16, 2021
commit 3f70cc77a773fc89239635dfd7756f28e664beb1
2 changes: 2 additions & 0 deletions test/test_supervisor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ def test_enable_shared_socket
begin
ENV.delete('SERVERENGINE_SOCKETMANAGER_PATH')
server.before_run
sleep 0.1 if Fluent.windows? # Wait for starting windows event thread
assert_not_nil(ENV['SERVERENGINE_SOCKETMANAGER_PATH'])
ensure
server.after_run
Expand All @@ -539,6 +540,7 @@ def server.config
begin
ENV.delete('SERVERENGINE_SOCKETMANAGER_PATH')
server.before_run
sleep 0.1 if Fluent.windows? # Wait for starting windows event thread
assert_nil(ENV['SERVERENGINE_SOCKETMANAGER_PATH'])
ensure
server.after_run
Expand Down