1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Commit graph

11 commits

Author SHA1 Message Date
Jonathan del Strother
3c5d12db6b
Preserve BUNDLE_APP_CONFIG on worker fork (#2688)
Without this, if puma is launched with BUNDLE_APP_CONFIG set, that will
be lost inside of unbundled_env, which causes the worker processes to use a
potentially different bundler configuration.
2021-09-03 10:52:35 -07:00
MSP-Greg
51ea1b44ea
Update helper.rb TestSkips, add HAS_UNIX_SOCKET to puma.rb [changelog skip] (#2576)
* Update helper.rb TestSkips, add HAS_UNIX_SOCKET to puma.rb

* Tests - skip updates

* test_integration_cluster.rb - fix some test warnings & RuboCop
2021-03-15 08:10:43 -06:00
Yoann Lecuyer
c68e20dd4e
Add debug to worker timeout and startup (#2559)
Logs reason for worker timeout and the startup time when worker boots
2021-03-11 11:17:44 -06:00
Benoit Daloze
d8b25115d4
Fix warnings for !HAS_FORK [changelog skip] (#2187)
* Add missing requires in test_puma_server_ssl.rb

* Skip teardown if setup was skipped in test_preserve_bundler_env

* Otherwise we get
puma/test/helpers/integration.rb:27: warning: instance variable @ios_to_close not initialized
puma/test/helpers/integration.rb:34: warning: instance variable @bind_path not initialized
See https://travis-ci.org/github/puma/puma/jobs/662767158#L469
* Same pattern as in test/test_integration_cluster.rb.
2020-03-16 09:29:18 -06:00
Chris LaRose
c87f088396
Leave BUNDLE_GEMFILE unset in workers if it was unset in the master (#2154)
* Leave BUNDLE_GEMFILE unset in workers if it was unset in the master

Co-Authored-By: Tim Morgan <tim@timmorgan.org>

* Use Bundler.original_env instead of raw environment variables

Co-authored-by: Tim Morgan <tim@timmorgan.org>
Co-authored-by: Nate Berkopec <nate.berkopec@gmail.com>
2020-03-10 11:46:20 -06:00
Tim Morgan
62f075f468 Add back test skip for platforms without USR2 2020-02-14 10:48:23 -06:00
Tim Morgan
f73cd57233 Remove diagnostic logging 2020-02-13 16:55:35 -06:00
Tim Morgan
08dc10f1af Reenable logging in the test 2020-02-13 15:46:11 -06:00
Tim Morgan
2ed158ecac OMG it works! Remove diagnostic logging. 2020-02-13 15:18:51 -06:00
Tim Morgan
cbf32d5540 Add some logging to help diagnose Travis build failure 2020-02-13 14:32:10 -06:00
Tim Morgan
c83401cfcf Move test into separate file
This test was failing on Travis when run in parallel with other tests in
the TestIntegrationCluster test. Removing the line "parallelize_me!"
from the top of the file worked, but I chose to move the test into its own
file to keep the existing tests running in parallel.
2020-02-13 13:59:16 -06:00