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.

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

Misc lib file fixes - trapping additional errors, CI helper #3129

Merged
merged 4 commits into from
May 2, 2023

Conversation

MSP-Greg
Copy link
Member

@MSP-Greg MSP-Greg commented Apr 25, 2023

Description

All files except thread_pool.rb have additional handling added. These errors have intermittently been seen in CI.

thread_pool.rb allows setting options[:pool_shutdown_grace_time] during CI, as stubbing a constant is difficult when running parallel CI. At present, it is not exposed via the DSL, but could be added in the future.

Hence, no API or functionality changes.

These commits were originally part of PR #3128.

Your checklist for this pull request

  • I have reviewed the guidelines for contributing to this repository.
  • I have added (or updated) appropriate tests if this PR fixes a bug or adds a feature.
  • My pull request is 100 lines added/removed or less so that it can be easily reviewed.
  • If this PR doesn't need tests (docs change), I added [ci skip] to the title of the PR.
  • If this closes any issues, I have added "Closes #issue" to the PR description or my commit messages.
  • I have updated the documentation accordingly.
  • All new and existing tests passed, including Rubocop.

@@ -48,7 +48,6 @@ def initialize(log_writer, conf = Configuration.new)

@envs = {}
@ios = []
localhost_authority
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Intentional delete?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. It's called early in the ssl section of parse. The call in the above section happens in initialize, so it's called regardless of whether an ssl bind is being used.

@MSP-Greg MSP-Greg merged commit fd259b7 into puma:master May 2, 2023
62 of 64 checks passed
@MSP-Greg MSP-Greg deleted the 00-misc-lib-file-updates branch May 2, 2023 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants