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

35 commits

Author SHA1 Message Date
schneems
89f37432de Remove unused methods 2017-03-09 11:38:27 -06:00
schneems
995ed8bd45 Test specifying config via config_files. 2017-03-09 11:38:26 -06:00
schneems
7215699419 Remove un-used class method 2017-03-09 11:38:26 -06:00
schneems
cda9317e71 Split out config into explicit user and file parts 2017-03-09 11:38:26 -06:00
schneems
01b38fc316 UserFileDefaultOptions Spike 2017-03-09 11:38:26 -06:00
Evan Phoenix
326234cd36 Fix default SSL mode back to none. Fixes #1036 2016-08-03 10:57:50 -07:00
Jori Hardman
78d62e975b Allow persistent_timeout to be configured via the dsl. 2016-07-15 12:03:44 -05:00
Frank Wong
4bdff124ae Fix puma/puma#968 Default verify_mode to peer 2016-04-30 12:47:03 +08:00
Frank Wong
8e4580abbf Fix puma/puma#968 Cannot bind SSL port due to missing verify_mode option 2016-04-23 16:16:06 +08:00
Evan Phoenix
c2d1577fea Better document the hooks. Fixes #840 2016-04-07 13:50:16 -07:00
Evan Phoenix
448c022e1b Add ability to force threads to stop on shutdown. Fixes #938 2016-04-07 10:25:21 -07:00
Evan Phoenix
8b05d0a763 Simplify and fix logic for directory to use when restarting for all phases 2016-03-20 14:09:30 -07:00
Evan Phoenix
da4cad809c Add 'import' directive to config file. Fixes #916 2016-03-05 16:07:12 -08:00
Evan Phoenix
03ed48ca90 Don't log requests by default. Fixes #852 2016-02-25 13:09:02 -08:00
Evan Phoenix
50bd13562d Add 'get' to allow for config to probe existing config 2016-02-19 17:06:42 -08:00
Evan Phoenix
33e0fa9999 Manage nested configuration better 2016-02-07 14:51:54 -08:00
Evan Phoenix
541393ebf9 Add ability for plugins to alter the config on load 2016-02-06 23:10:48 -08:00
Evan Phoenix
663666c5b7 Add plugin mechanism and initial plugin 2016-02-06 22:28:02 -08:00
Evan Phoenix
f788af0c8f Continue API cleanup, preparing for 3.0 2016-02-06 19:00:29 -08:00
Ed Robinson
6836b8293d Exit if max_threads == 0
Fixes #866
2016-01-29 01:00:17 +00:00
Evan Phoenix
b180bd0a02 Merge pull request #837 from YuriSolovyov/ssl-keystore-jruby
Support passing JRuby keystore info in ssl_bind DSL
2016-01-27 19:43:40 -08:00
Ben Osheroff
8356182079 allow umask for unix:/// style control urls
this lets us rely on unix permissions to control access to the
control_url.
2016-01-15 09:32:04 -08:00
Evan Phoenix
3c8763669b Split on comma and space 2016-01-06 10:39:31 -08:00
Evan Phoenix
5ce24bf7c2 When using a header for the remote address, use the first word only 2016-01-06 10:33:50 -08:00
Evan Phoenix
d5914573c9 Add 'set_remote_address' config option 2016-01-06 10:12:09 -08:00
YuriSolovyov
c28b48ff57 Support passing JRuby keystore info in ssl_bind DSL 2015-12-01 19:29:44 +03:00
Evan Phoenix
6a7e90a16c Merge pull request #817 from unleashed/worker-boot-timeout
cluster: add worker_boot_timeout option
2015-11-06 09:57:15 -08:00
Alejandro Martinez Ruiz
a01419c9c1 cluster: add worker_boot_timeout option
When your workers are loading, the normal operation timeout is in
effect. If you spawn many workers or have them perform a lot of work
or wait for just long enough before actually booting, they will be
killed by the worker ping timeout.

If you want to control the exact timeout for your workers to boot,
specify the `worker_boot_timeout` option. Otherwise, it defaults to
the value of the `worker_timeout` option.
2015-11-06 17:46:48 +01:00
schneems
d1678f00c7 [ci skip] More explicit docs for worker_timeout
Had a customer who thought setting this was preventing against long running requests (it doesn't). These docs clarify the purpose of setting this value, that it is used to detect hung processes.
2015-11-03 09:33:49 -06:00
Chris Schneider
dbe952aea2 Fix error message in DSL that was slightly inaccurate
An equal number of min and max threads is fine by the code around this
message.
2015-10-13 09:30:42 -06:00
Nathan Samson
6c4f788bb7 Add before_fork hooks option.
This is usefull to close database or other remote connections
that were opened during the preload_app phase of the master process.
2015-08-06 02:03:36 +02:00
Evan Phoenix
e3b1f3264c Fix the Config constants not being available in the DSL. Fixes #683 2015-04-11 13:12:27 -07:00
Evan Phoenix
5fadbc8d9f Add shutdown_debug config option 2015-04-10 22:52:38 -07:00
Chulki Lee
67fa78e6c5 clean up dsl.rb 2015-03-14 22:59:21 -07:00
Chulki Lee
4b2264f31c extract dsl.rb 2015-03-14 22:59:14 -07:00