puma 2.16.0-java → 3.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61f32b937898d82e169b2ddfab31d7c633bf6c03
-  data.tar.gz: de39ce9cf5d481094723fafb9876aedd1beb1fb2
+  metadata.gz: 69f64076ecd1fa06c746e71e44eb434ecd0793cd
+  data.tar.gz: fb698f2745ee24731207d9322c0b137f54d9eb0e
 SHA512:
-  metadata.gz: 4e133511b033a6c697bfb984473b859c8c21a90b1569b38321e2575954b96de6afb6857865f6afb3b7ab47ec184946fb4d7065fd784066414ccd0743256d6504
-  data.tar.gz: df26c8bf5da213547eb48b291b25dc3c75b1d957b5e9d348f14b5d374515eb740c11961c9acffc0c25fc8f57a9abb139119964e6fdb1b5724149ea051a496dab
+  metadata.gz: 53f16055692cc03f8a26167433d22f25556664779130c14b26f708917e055e85b9b6bb1575da8da91327b142f5b8764101b968e1d9fa55190e0996d512863fb2
+  data.tar.gz: 8aa7f714ddf879e207f64d50a99d32d43f4c49727cde9360b4ba6f39ebe02340bf1b83b6fc75ac6c9222a5faf5409237d44c0e8940cf52defef3220bd9e2307a

data/Gemfile

@@ -8,6 +8,6 @@ gem "rake-compiler"
 gem "test-unit", "~> 3.0"
 
 gem "rack"
-gem 'minitest', '~> 4.0'
+gem 'minitest', '~> 5.8'
 
 gem "jruby-openssl", :platform => "jruby"

data/History.txt

@@ -1,3 +1,53 @@
+=== 3.0.0 / 2016-02-25
+
+* 2 major changes:
+
+  * Ruby pre-2.0 is no longer supported. We'll do our best to not add
+    features that break those rubies but will no longer be testing
+    with them.
+  * Don't log requests by default. Fixes #852
+
+* 2 major features:
+
+  * Plugin support! Plugins can interact with configuration as well
+    as provide augment server functionality!
+  * Experimental env['async.callback'] support
+
+* 4 minor features:
+
+  * Listen to unix socket with provided backlog if any
+  * Improves the clustered stats to report worker stats
+  * Pass the env to the lowlevel_error handler. Fixes #854
+  * Treat path-like hosts as unix sockets. Fixes #824
+
+* 5 bug fixes:
+
+  * Clean thread locals when using keepalive. Fixes #823
+  * Cleanup compiler warnings. Fixes #815
+  * Expose closed? for use by the reactor. Fixes #835
+  * Move signal handlers to separate method to prevent space leak. Fixes #798
+  * Signal not full on worker exit #876
+
+* 5 doc fixes:
+
+  * Update README.md with various grammar fixes
+  * Use newest version of Minitest
+  * Add directory configuration docs, fix typo [ci skip]
+  * Remove old COPYING notice. Fixes #849
+
+* 10 merged PRs:
+
+  * Merge pull request #871 from deepj/travis
+  * Merge pull request #874 from wallclockbuilder/master
+  * Merge pull request #883 from dadah89/igor/trim_only_worker
+  * Merge pull request #884 from uistudio/async-callback
+  * Merge pull request #888 from mlarraz/tick_minitest
+  * Merge pull request #890 from todd/directory_docs
+  * Merge pull request #891 from ctaintor/improve_clustered_status
+  * Merge pull request #893 from spastorino/add_missing_require
+  * Merge pull request #897 from zendesk/master
+  * Merge pull request #899 from kch/kch-readme-fixes
+
 === 2.16.0 / 2016-01-27
 
 * 7 minor features:

data/Manifest.txt

@@ -1,4 +1,3 @@
-COPYING
 DEPLOYMENT.md
 Gemfile
 History.txt
@@ -39,6 +38,7 @@ lib/puma/compat.rb
 lib/puma/configuration.rb
 lib/puma/const.rb
 lib/puma/control_cli.rb
+lib/puma/convenient.rb
 lib/puma/daemon_ext.rb
 lib/puma/delegation.rb
 lib/puma/detect.rb
@@ -47,8 +47,11 @@ lib/puma/events.rb
 lib/puma/io_buffer.rb
 lib/puma/java_io_buffer.rb
 lib/puma/jruby_restart.rb
+lib/puma/launcher.rb
 lib/puma/minissl.rb
 lib/puma/null_io.rb
+lib/puma/plugin.rb
+lib/puma/plugin/tmp_restart.rb
 lib/puma/rack/backports/uri/common_18.rb
 lib/puma/rack/backports/uri/common_192.rb
 lib/puma/rack/backports/uri/common_193.rb
@@ -59,6 +62,7 @@ lib/puma/reactor.rb
 lib/puma/runner.rb
 lib/puma/server.rb
 lib/puma/single.rb
+lib/puma/state_file.rb
 lib/puma/tcp_logger.rb
 lib/puma/thread_pool.rb
 lib/puma/util.rb

data/README.md

@@ -1,6 +1,9 @@
 # Puma: A Ruby Web Server Built For Concurrency
 
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/puma/puma?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Build Status](https://secure.travis-ci.org/puma/puma.png)](http://travis-ci.org/puma/puma) [![Dependency Status](https://gemnasium.com/puma/puma.png)](https://gemnasium.com/puma/puma) <a href="https://codeclimate.com/github/puma/puma"><img src="https://codeclimate.com/github/puma/puma.png" /></a>
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/puma/puma?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Build Status](https://secure.travis-ci.org/puma/puma.svg)](http://travis-ci.org/puma/puma)
+[![Dependency Status](https://gemnasium.com/puma/puma.svg)](https://gemnasium.com/puma/puma)
+[![Code Climate](https://codeclimate.com/github/puma/puma.svg)](https://codeclimate.com/github/puma/puma)
 
 ## Description
 
@@ -71,7 +74,7 @@ Puma utilizes a dynamic thread pool which you can modify. You can set the minimu
 
     $ puma -t 8:32
 
-Puma will automatically scale the number of threads based on how much traffic is present. The current default is `0:16`. Feel free to experiment, but be careful not to set the number of maximum threads to a very large number, as you may exhaust resources on the system (or hit resource limits).
+Puma will automatically scale the number of threads, from the minimum until it caps out at the maximum, based on how much traffic is present. The current default is `0:16`. Feel free to experiment, but be careful not to set the number of maximum threads to a very large number, as you may exhaust resources on the system (or hit resource limits).
 
 ### Clustered mode
 
@@ -108,7 +111,7 @@ you to do some Puma-specific things that you don't want to embed in your applica
 For instance, you could fire a log notification that a worker booted or send something to statsd.
 This can be called multiple times to add hooks.
 
-If you're preloading your application and using ActiveRecord, it's recommend you setup your connection pool here:
+If you're preloading your application and using ActiveRecord, it's recommended that you setup your connection pool here:
 
     # config/puma.rb
     on_worker_boot do
@@ -127,7 +130,7 @@ On top of that, you can specify a block in your configuration file that will be
 This code can be used to clean up before forking to clients, allowing
 you to do some Puma-specific things that you don't want to embed in your application.
 
-If you're preloading your application and using ActiveRecord, it's recommend you close any connections to the database here to prevent connection leakage:
+If you're preloading your application and using ActiveRecord, it's recommended that you close any connections to the database here to prevent connection leakage:
 
     # config/puma.rb
     before_fork do
@@ -136,7 +139,7 @@ If you're preloading your application and using ActiveRecord, it's recommend you
 
 This rule applies to any connections to external services (Redis, databases, memcache, ...) that might be started automatically by the framework.
 
-When you use preload_app, your new code goes all in the master process, and is then copied in the workers (meaning it’s only compatible with cluster mode). General rule is to use preload_app when your workers die often and need fast starts. If you don’t have many workers, you probably should not use preload_app.
+When you use preload_app, all of your new code goes into the master process, and is then copied into the workers (meaning it’s only compatible with cluster mode). General rule is to use preload_app when your workers die often and need fast starts. If you don’t have many workers, you probably should not use preload_app.
 
 Note that preload_app can’t be used with phased restart, since phased restart kills and restarts workers one-by-one, and preload_app is all about copying the code of master into the workers.
 
@@ -174,7 +177,7 @@ Need a bit of security? Use SSL sockets!
 
 ### Control/Status Server
 
-Puma comes with a builtin status/control app that can be used query and control Puma itself. Here is an example of starting Puma with the control server:
+Puma comes with a builtin status/control app that can be used to query and control Puma itself. Here is an example of starting Puma with the control server:
 
     $ puma --control tcp://127.0.0.1:9293 --control-token foo
 
@@ -209,26 +212,35 @@ If the new process is unable to load, it will simply exit. You should therefore
 
 ### Normal vs Hot vs Phased Restart
 
-A hot restart means that no requests while deploying your new code will be lost, since the server socket is kept open between restarts.
+A hot restart means that no requests will be lost while deploying your new code, since the server socket is kept open between restarts.
 
 But beware, hot restart does not mean that the incoming requests won’t hang for multiple seconds while your new code has not fully deployed. If you need a zero downtime and zero hanging requests deploy, you must use phased restart.
 
-When you run pumactl phased-restart, Puma kills workers one-by-one, meaning that at least another worker is still available to serve requests, which lead in zero hanging request (yay!).
+When you run pumactl phased-restart, Puma kills workers one-by-one, meaning that at least another worker is still available to serve requests, which lead to zero hanging requests (yay!).
 
 But again beware, upgrading an application sometimes involves upgrading the database schema. With phased restart, there may be a moment during the deployment where processes belonging to the previous version and processes belonging to the new version both exist at the same time. Any database schema upgrades you perform must therefore be backwards-compatible with the old application version.
 
-if you perform a lot of database migrations, you probably should not use phased restart and use a normal/hot restart instead (pumactl restart). That way, no code is shared while deploying (in that case, preload_app might help for quicker deployment, see below).
+If you perform a lot of database migrations, you probably should not use phased restart and use a normal/hot restart instead (pumactl restart). That way, no code is shared while deploying (in that case, preload_app might help for quicker deployment, see below).
 
+### Release Directory
+
+If you symlink releases into a common working directory (i.e., `/current` from Capistrano), Puma won't pick up your new changes when running phased restarts without additional configuration. You should set your working directory within Puma's config to specify the directory it should use. This is a change from earlier versions of Puma (< 2.15) that would infer the directory for you.
+
+```ruby
+# config/puma.rb
+
+directory '/var/www/current'
+```
 
 ### Cleanup Code
 
 Puma isn't able to understand all the resources that your app may use, so it provides a hook in the configuration file you pass to `-C` called `on_restart`. The block passed to `on_restart` will be called, unsurprisingly, just before Puma restarts itself.
 
-You should place code to close global log files, redis connections, etc in this block so that their file descriptors don't leak into the restarted process. Failure to do so will result in slowly running out of descriptors and eventually obscure crashes as the server is restart many times.
+You should place code to close global log files, redis connections, etc in this block so that their file descriptors don't leak into the restarted process. Failure to do so will result in slowly running out of descriptors and eventually obscure crashes as the server is restarted many times.
 
 ### Platform Constraints
 
-Because of various platforms not being implement certain things, the following differences occur when Puma is used on different platforms:
+Because of various platforms not being able to implement certain things, the following differences occur when Puma is used on different platforms:
 
   * **JRuby**, **Windows**: server sockets are not seamless on restart, they must be closed and reopened. These platforms have no way to pass descriptors into a new process that is exposed to ruby
   * **JRuby**, **Windows**: cluster mode is not supported due to a lack of  fork(2)
@@ -240,7 +252,7 @@ Because of various platforms not being implement certain things, the following d
 
 ## Managing multiple Pumas / init.d / upstart scripts
 
-If you want an easy way to manage multiple scripts at once check [tools/jungle](https://github.com/puma/puma/tree/master/tools/jungle) for init.d and upstart scripts.
+If you want an easy way to manage multiple scripts at once, check [tools/jungle](https://github.com/puma/puma/tree/master/tools/jungle) for init.d and upstart scripts.
 
 ## Capistrano deployment
 
@@ -281,4 +293,4 @@ $ bundle exec rake
 
 ## License
 
-Puma is copyright 2014 Evan Phoenix and contributors. It is licensed under the BSD 3-Clause license. See the include LICENSE file for details.
+Puma is copyright 2014 Evan Phoenix and contributors. It is licensed under the BSD 3-Clause license. See the included LICENSE file for details.

data/ext/puma_http11/http11_parser.java.rl

@@ -7,8 +7,8 @@ public class Http11Parser {
 /** Machine **/
 
 %%{
-  
-  machine http_parser;
+
+  machine puma_parser;
 
   action mark {parser.mark = fpc; }
 
@@ -60,7 +60,7 @@ public class Http11Parser {
     fbreak;
   }
 
-  include http_parser_common "http11_parser_common.rl";
+  include puma_parser_common "http11_parser_common.rl";
 
 }%%
 
@@ -152,10 +152,10 @@ public class Http11Parser {
   }
 
   public boolean has_error() {
-    return parser.cs == http_parser_error;
+    return parser.cs == puma_parser_error;
   }
 
   public boolean is_finished() {
-    return parser.cs == http_parser_first_final;
+    return parser.cs == puma_parser_first_final;
   }
 }

data/ext/puma_http11/io_buffer.c

@@ -116,7 +116,7 @@ static VALUE buf_to_str(VALUE self) {
   struct buf_int* b;
   Data_Get_Struct(self, struct buf_int, b);
 
-  return rb_str_new(b->top, b->cur - b->top);
+  return rb_str_new((const char*)(b->top), b->cur - b->top);
 }
 
 static VALUE buf_used(VALUE self) {

data/ext/puma_http11/mini_ssl.c

@@ -1,7 +1,13 @@
 #define RSTRING_NOT_MODIFIED 1
 
 #include <ruby.h>
+#include <ruby/version.h>
+
+#if RUBY_API_VERSION_MAJOR == 1
 #include <rubyio.h>
+#else
+#include <ruby/io.h>
+#endif
 
 #ifdef HAVE_OPENSSL_BIO_H
 
@@ -347,7 +353,7 @@ VALUE engine_peercert(VALUE self) {
     }
   }
 
-  rb_cert_buf = rb_str_new(buf, bytes);
+  rb_cert_buf = rb_str_new((const char*)(buf), bytes);
   if(!cert_buf) {
     OPENSSL_free(buf);
   }

data/ext/puma_http11/org/jruby/puma/Http11Parser.java

@@ -15,7 +15,7 @@ public class Http11Parser {
 /** Data **/
 
 // line 18 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
-private static byte[] init__http_parser_actions_0()
+private static byte[] init__puma_parser_actions_0()
 {
 	return new byte [] {
 	    0,    1,    0,    1,    2,    1,    3,    1,    4,    1,    5,    1,
@@ -25,10 +25,10 @@ private static byte[] init__http_parser_actions_0()
 	};
 }
 
-private static final byte _http_parser_actions[] = init__http_parser_actions_0();
+private static final byte _puma_parser_actions[] = init__puma_parser_actions_0();
 
 
-private static short[] init__http_parser_key_offsets_0()
+private static short[] init__puma_parser_key_offsets_0()
 {
 	return new short [] {
 	    0,    0,    8,   17,   27,   29,   30,   31,   32,   33,   34,   36,
@@ -39,10 +39,10 @@ private static short[] init__http_parser_key_offsets_0()
 	};
 }
 
-private static final short _http_parser_key_offsets[] = init__http_parser_key_offsets_0();
+private static final short _puma_parser_key_offsets[] = init__puma_parser_key_offsets_0();
 
 
-private static char[] init__http_parser_trans_keys_0()
+private static char[] init__puma_parser_trans_keys_0()
 {
 	return new char [] {
 	   36,   95,   45,   46,   48,   57,   65,   90,   32,   36,   95,   45,
@@ -80,10 +80,10 @@ private static char[] init__http_parser_trans_keys_0()
 	};
 }
 
-private static final char _http_parser_trans_keys[] = init__http_parser_trans_keys_0();
+private static final char _puma_parser_trans_keys[] = init__puma_parser_trans_keys_0();
 
 
-private static byte[] init__http_parser_single_lengths_0()
+private static byte[] init__puma_parser_single_lengths_0()
 {
 	return new byte [] {
 	    0,    2,    3,    4,    2,    1,    1,    1,    1,    1,    0,    1,
@@ -94,10 +94,10 @@ private static byte[] init__http_parser_single_lengths_0()
 	};
 }
 
-private static final byte _http_parser_single_lengths[] = init__http_parser_single_lengths_0();
+private static final byte _puma_parser_single_lengths[] = init__puma_parser_single_lengths_0();
 
 
-private static byte[] init__http_parser_range_lengths_0()
+private static byte[] init__puma_parser_range_lengths_0()
 {
 	return new byte [] {
 	    0,    3,    3,    3,    0,    0,    0,    0,    0,    0,    1,    1,
@@ -108,10 +108,10 @@ private static byte[] init__http_parser_range_lengths_0()
 	};
 }
 
-private static final byte _http_parser_range_lengths[] = init__http_parser_range_lengths_0();
+private static final byte _puma_parser_range_lengths[] = init__puma_parser_range_lengths_0();
 
 
-private static short[] init__http_parser_index_offsets_0()
+private static short[] init__puma_parser_index_offsets_0()
 {
 	return new short [] {
 	    0,    0,    6,   13,   21,   24,   26,   28,   30,   32,   34,   36,
@@ -122,10 +122,10 @@ private static short[] init__http_parser_index_offsets_0()
 	};
 }
 
-private static final short _http_parser_index_offsets[] = init__http_parser_index_offsets_0();
+private static final short _puma_parser_index_offsets[] = init__puma_parser_index_offsets_0();
 
 
-private static byte[] init__http_parser_indicies_0()
+private static byte[] init__puma_parser_indicies_0()
 {
 	return new byte [] {
 	    0,    0,    0,    0,    0,    1,    2,    3,    3,    3,    3,    3,
@@ -158,10 +158,10 @@ private static byte[] init__http_parser_indicies_0()
 	};
 }
 
-private static final byte _http_parser_indicies[] = init__http_parser_indicies_0();
+private static final byte _puma_parser_indicies[] = init__puma_parser_indicies_0();
 
 
-private static byte[] init__http_parser_trans_targs_0()
+private static byte[] init__puma_parser_trans_targs_0()
 {
 	return new byte [] {
 	    2,    0,    3,   38,    4,   24,   28,   25,    5,   20,    6,    7,
@@ -174,10 +174,10 @@ private static byte[] init__http_parser_trans_targs_0()
 	};
 }
 
-private static final byte _http_parser_trans_targs[] = init__http_parser_trans_targs_0();
+private static final byte _puma_parser_trans_targs[] = init__puma_parser_trans_targs_0();
 
 
-private static byte[] init__http_parser_trans_actions_0()
+private static byte[] init__puma_parser_trans_actions_0()
 {
 	return new byte [] {
 	    1,    0,   11,    0,    1,    1,    1,    1,   13,   13,    1,    0,
@@ -190,14 +190,14 @@ private static byte[] init__http_parser_trans_actions_0()
 	};
 }
 
-private static final byte _http_parser_trans_actions[] = init__http_parser_trans_actions_0();
+private static final byte _puma_parser_trans_actions[] = init__puma_parser_trans_actions_0();
 
 
-static final int http_parser_start = 1;
-static final int http_parser_first_final = 57;
-static final int http_parser_error = 0;
+static final int puma_parser_start = 1;
+static final int puma_parser_first_final = 57;
+static final int puma_parser_error = 0;
 
-static final int http_parser_en_main = 1;
+static final int puma_parser_en_main = 1;
 
 
 // line 69 "ext/puma_http11/http11_parser.java.rl"
@@ -238,7 +238,7 @@ static final int http_parser_en_main = 1;
           
 // line 240 "ext/puma_http11/org/jruby/puma/Http11Parser.java"
 	{
-	cs = http_parser_start;
+	cs = puma_parser_start;
 	}
 
 // line 104 "ext/puma_http11/http11_parser.java.rl"
@@ -290,9 +290,9 @@ static final int http_parser_en_main = 1;
 	}
 case 1:
 	_match: do {
-	_keys = _http_parser_key_offsets[cs];
-	_trans = _http_parser_index_offsets[cs];
-	_klen = _http_parser_single_lengths[cs];
+	_keys = _puma_parser_key_offsets[cs];
+	_trans = _puma_parser_index_offsets[cs];
+	_klen = _puma_parser_single_lengths[cs];
 	if ( _klen > 0 ) {
 		int _lower = _keys;
 		int _mid;
@@ -302,9 +302,9 @@ case 1:
 				break;
 
 			_mid = _lower + ((_upper-_lower) >> 1);
-			if ( data[p] < _http_parser_trans_keys[_mid] )
+			if ( data[p] < _puma_parser_trans_keys[_mid] )
 				_upper = _mid - 1;
-			else if ( data[p] > _http_parser_trans_keys[_mid] )
+			else if ( data[p] > _puma_parser_trans_keys[_mid] )
 				_lower = _mid + 1;
 			else {
 				_trans += (_mid - _keys);
@@ -315,7 +315,7 @@ case 1:
 		_trans += _klen;
 	}
 
-	_klen = _http_parser_range_lengths[cs];
+	_klen = _puma_parser_range_lengths[cs];
 	if ( _klen > 0 ) {
 		int _lower = _keys;
 		int _mid;
@@ -325,9 +325,9 @@ case 1:
 				break;
 
 			_mid = _lower + (((_upper-_lower) >> 1) & ~1);
-			if ( data[p] < _http_parser_trans_keys[_mid] )
+			if ( data[p] < _puma_parser_trans_keys[_mid] )
 				_upper = _mid - 2;
-			else if ( data[p] > _http_parser_trans_keys[_mid+1] )
+			else if ( data[p] > _puma_parser_trans_keys[_mid+1] )
 				_lower = _mid + 2;
 			else {
 				_trans += ((_mid - _keys)>>1);
@@ -338,15 +338,15 @@ case 1:
 	}
 	} while (false);
 
-	_trans = _http_parser_indicies[_trans];
-	cs = _http_parser_trans_targs[_trans];
+	_trans = _puma_parser_indicies[_trans];
+	cs = _puma_parser_trans_targs[_trans];
 
-	if ( _http_parser_trans_actions[_trans] != 0 ) {
-		_acts = _http_parser_trans_actions[_trans];
-		_nacts = (int) _http_parser_actions[_acts++];
+	if ( _puma_parser_trans_actions[_trans] != 0 ) {
+		_acts = _puma_parser_trans_actions[_trans];
+		_nacts = (int) _puma_parser_actions[_acts++];
 		while ( _nacts-- > 0 )
 	{
-			switch ( _http_parser_actions[_acts++] )
+			switch ( _puma_parser_actions[_acts++] )
 			{
 	case 0:
 // line 13 "ext/puma_http11/http11_parser.java.rl"
@@ -479,10 +479,10 @@ case 5:
   }
 
   public boolean has_error() {
-    return parser.cs == http_parser_error;
+    return parser.cs == puma_parser_error;
   }
 
   public boolean is_finished() {
-    return parser.cs == http_parser_first_final;
+    return parser.cs == puma_parser_first_final;
   }
 }