puma 2.3.2 → 2.4.0

data/History.txt

@@ -1,3 +1,26 @@
+=== 2.4.0 / 2013-07-22
+
+* 5 minor features:
+  * Add PUMA_JRUBY_DAEMON_OPTS to get around agent starting twice
+  * Add ability to drain accept socket on shutdown
+  * Add port to DSL
+  * Adds support for using puma config file in capistrano deploys.
+  * Make phased_restart fallback to restart if not available
+
+* 10 bug fixes:
+
+  * Be sure to only delete the pid in the master. Fixes #334
+  * Call out -C/--config flags
+  * Change parser symbol names to avoid clash. Fixes #179
+  * Convert thread pool sizes to integers
+  * Detect when the jruby daemon child doesn't start properly
+  * Fix typo in CLI help
+  * Improve the logging output when hijack is used. Fixes #332
+  * Remove unnecessary thread pool size conversions
+  * Setup :worker_boot as an Array. Fixes #317
+  * Use 127.0.0.1 as REMOTE_ADDR of unix client. Fixes #309
+
+
 === 2.3.2 / 2013-07-08
 
 * 1 bug fix:

data/README.md

@@ -78,38 +78,37 @@ Puma will automatically scale the number of threads based on how much traffic is
 Puma 2 offers clustered mode, allowing you to use forked processes to handle multiple incoming requests concurrently, in addition to threads already provided. You can tune the number of workers with the `-w` (or `--workers`) flag:
 
     $ puma -t 8:32 -w 3
-    
-On a ruby implementation that offers native threads, you should tune this number to match the number of cores available. 
-Note that threads are still used in clustered mode, and the `-t` thread flag setting is per worker, so `-w 2 -t 16:16` will be 32 threads.
 
-This code can be used to setup the process before booting the application, allowing 
-you to do some puma-specific things that you don't want to embed in your application. 
-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.
+On a ruby implementation that offers native threads, you should tune this number to match the number of cores available.
+Note that threads are still used in clustered mode, and the `-t` thread flag setting is per worker, so `-w 2 -t 16:16` will be 32 threads.
 
 If you're running in Clustered Mode you can optionally choose to preload your application before starting up the workers. To do this simply specify the `--preload` flag in invocation:
 
     # CLI invocation
     $ puma -t 8:32 -w 3 --preload
-    
+
 If you're using a configuration file, use the `preload_app!` method, and be sure to specify your config file's location with the `-C` flag:
 
     $ puma -C config/puma.rb
-    
+
     # config/puma.rb
     threads 8,32
     workers 3
-    preload_app! 
-
+    preload_app!
 
-Additionally, you can specify a block in your configuration that will be run on boot of each worker:
+Additionally, you can specify a block in your configuration file that will be run on boot of each worker:
 
     # config/puma.rb
     on_worker_boot do
       # configuration here
     end
-        
-If you're preloading your application and using ActiveRecord, it's recommend you setup your connection pool here: 
+
+This code can be used to setup the process before booting the application, allowing
+you to do some puma-specific things that you don't want to embed in your application.
+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:
 
     # config/puma.rb
     on_worker_boot do
@@ -142,15 +141,11 @@ Puma comes with a builtin status/control app that can be used query and control
 
     $ puma --control tcp://127.0.0.1:9293 --control-token foo
 
-This directs puma to start the control server on localhost port 9293. Additionally, all requests to the control server will need to include `token=foo` as a query parameter. This allows for simple authentication. Check out https://github.com/puma/puma/blob/master/lib/puma/app/status.rb to see what the app has available.
+This directs puma to start the control server on localhost port 9293. Additionally, all requests to the control server will need to include `token=foo` as a query parameter. This allows for simple authentication. Check out [status.rb](https://github.com/puma/puma/blob/master/lib/puma/app/status.rb) to see what the app has available.
 
 ### Configuration file
 
-You can also provide a configuration file which puma will use:
-
-    $ puma --config /path/to/config
-
-or
+You can also provide a configuration file which puma will use with the `-C` (or `--config`) flag:
 
     $ puma -C /path/to/config
 
@@ -158,7 +153,7 @@ Take the following [sample configuration](https://github.com/puma/puma/blob/mast
 
 ## Restart
 
-Puma includes the ability to restart itself, allowing for new versions to be easily upgraded to. When available (MRI, Rubinius, JRuby), puma performs a "hot restart". This is the same functionality available in *unicorn* and *nginx* which keep the server sockets open between restarts. This makes sure that no pending requests are dropped while the restart is taking place.
+Puma includes the ability to restart itself allowing easy upgrades to new versions. When available (MRI, Rubinius, JRuby), puma performs a "hot restart". This is the same functionality available in *unicorn* and *nginx* which keep the server sockets open between restarts. This makes sure that no pending requests are dropped while the restart is taking place.
 
 To perform a restart, there are 2 builtin mechanisms:
 
@@ -171,11 +166,11 @@ If the new process is unable to load, it will simply exit. You should therefore
 
 ### 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` call `on_restart`. The block passed to `on_restart` will be called, unsurprisingly, just before puma restarts itself.
+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.
 
-### Platform Constaints
+### Platform Constraints
 
 Because of various platforms not being implement certain things, the following differences occur when puma is used on different platforms:
 
@@ -195,7 +190,7 @@ or
 
 will cause the server to perform a restart. `pumactl` is a simple CLI frontend to the control/status app described above.
 
-Allowed commands: status, restart, halt, stop
+Allowed commands: `status`, `restart`, `halt`, `stop`
 
 ## Managing multiple Pumas / init.d / upstart scripts
 
@@ -215,7 +210,7 @@ and then
 
 ```bash
 $ bundle exec cap puma:start
-$ bundle exec cap puma:restart 
+$ bundle exec cap puma:restart
 $ bundle exec cap puma:stop
 ```
 

data/ext/puma_http11/http11_parser.c

@@ -36,21 +36,21 @@ static void snake_upcase_char(char *c)
 /** Data **/
 
 #line 39 "ext/http11/http11_parser.c"
-static const int http_parser_start = 1;
-static const int http_parser_first_final = 57;
-static const int http_parser_error = 0;
+static const int puma_parser_start = 1;
+static const int puma_parser_first_final = 57;
+static const int puma_parser_error = 0;
 
-static const int http_parser_en_main = 1;
+static const int puma_parser_en_main = 1;
 
 
 #line 82 "ext/http11/http11_parser.rl"
 
-int http_parser_init(http_parser *parser)  {
+int puma_parser_init(puma_parser *parser)  {
   int cs = 0;
   
 #line 52 "ext/http11/http11_parser.c"
 	{
-	cs = http_parser_start;
+	cs = puma_parser_start;
 	}
 
 #line 86 "ext/http11/http11_parser.rl"
@@ -69,7 +69,7 @@ int http_parser_init(http_parser *parser)  {
 
 
 /** exec **/
-size_t http_parser_execute(http_parser *parser, const char *buffer, size_t len, size_t off)  {
+size_t puma_parser_execute(puma_parser *parser, const char *buffer, size_t len, size_t off)  {
   const char *p, *pe;
   int cs = parser->cs;
 
@@ -1191,7 +1191,7 @@ case 56:
 
 #line 114 "ext/http11/http11_parser.rl"
 
-  if (!http_parser_has_error(parser))
+  if (!puma_parser_has_error(parser))
     parser->cs = cs;
   parser->nread += p - (buffer + off);
 
@@ -1205,21 +1205,21 @@ case 56:
   return(parser->nread);
 }
 
-int http_parser_finish(http_parser *parser)
+int puma_parser_finish(puma_parser *parser)
 {
-  if (http_parser_has_error(parser) ) {
+  if (puma_parser_has_error(parser) ) {
     return -1;
-  } else if (http_parser_is_finished(parser) ) {
+  } else if (puma_parser_is_finished(parser) ) {
     return 1;
   } else {
     return 0;
   }
 }
 
-int http_parser_has_error(http_parser *parser) {
-  return parser->cs == http_parser_error;
+int puma_parser_has_error(puma_parser *parser) {
+  return parser->cs == puma_parser_error;
 }
 
-int http_parser_is_finished(http_parser *parser) {
-  return parser->cs >= http_parser_first_final;
+int puma_parser_is_finished(puma_parser *parser) {
+  return parser->cs >= puma_parser_first_final;
 }

data/ext/puma_http11/http11_parser.h

@@ -16,16 +16,16 @@
 
 #define BUFFER_LEN 1024
 
-struct http_parser;
+struct puma_parser;
 
-typedef void (*element_cb)(struct http_parser* hp,
+typedef void (*element_cb)(struct puma_parser* hp,
                            const char *at, size_t length);
 
-typedef void (*field_cb)(struct http_parser* hp,
+typedef void (*field_cb)(struct puma_parser* hp,
                          const char *field, size_t flen,
                          const char *value, size_t vlen);
 
-typedef struct http_parser { 
+typedef struct puma_parser {
   int cs;
   size_t body_start;
   int content_len;
@@ -49,15 +49,15 @@ typedef struct http_parser {
 
   char buf[BUFFER_LEN];
   
-} http_parser;
+} puma_parser;
 
-int http_parser_init(http_parser *parser);
-int http_parser_finish(http_parser *parser);
-size_t http_parser_execute(http_parser *parser, const char *data,
+int puma_parser_init(puma_parser *parser);
+int puma_parser_finish(puma_parser *parser);
+size_t puma_parser_execute(puma_parser *parser, const char *data,
                            size_t len, size_t off);
-int http_parser_has_error(http_parser *parser);
-int http_parser_is_finished(http_parser *parser);
+int puma_parser_has_error(puma_parser *parser);
+int puma_parser_is_finished(puma_parser *parser);
 
-#define http_parser_nread(parser) (parser)->nread 
+#define puma_parser_nread(parser) (parser)->nread
 
 #endif

data/ext/puma_http11/http11_parser.rl

@@ -29,7 +29,7 @@ static void snake_upcase_char(char *c)
 
 %%{
   
-  machine http_parser;
+  machine puma_parser;
 
   action mark { MARK(mark, fpc); }
 
@@ -73,14 +73,14 @@ static void snake_upcase_char(char *c)
     fbreak;
   }
 
-  include http_parser_common "http11_parser_common.rl";
+  include puma_parser_common "http11_parser_common.rl";
 
 }%%
 
 /** Data **/
 %% write data;
 
-int http_parser_init(http_parser *parser)  {
+int puma_parser_init(puma_parser *parser)  {
   int cs = 0;
   %% write init;
   parser->cs = cs;
@@ -98,7 +98,7 @@ int http_parser_init(http_parser *parser)  {
 
 
 /** exec **/
-size_t http_parser_execute(http_parser *parser, const char *buffer, size_t len, size_t off)  {
+size_t puma_parser_execute(puma_parser *parser, const char *buffer, size_t len, size_t off)  {
   const char *p, *pe;
   int cs = parser->cs;
 
@@ -112,7 +112,7 @@ size_t http_parser_execute(http_parser *parser, const char *buffer, size_t len,
 
   %% write exec;
 
-  if (!http_parser_has_error(parser))
+  if (!puma_parser_has_error(parser))
     parser->cs = cs;
   parser->nread += p - (buffer + off);
 
@@ -126,21 +126,21 @@ size_t http_parser_execute(http_parser *parser, const char *buffer, size_t len,
   return(parser->nread);
 }
 
-int http_parser_finish(http_parser *parser)
+int puma_parser_finish(puma_parser *parser)
 {
-  if (http_parser_has_error(parser) ) {
+  if (puma_parser_has_error(parser) ) {
     return -1;
-  } else if (http_parser_is_finished(parser) ) {
+  } else if (puma_parser_is_finished(parser) ) {
     return 1;
   } else {
     return 0;
   }
 }
 
-int http_parser_has_error(http_parser *parser) {
-  return parser->cs == http_parser_error;
+int puma_parser_has_error(puma_parser *parser) {
+  return parser->cs == puma_parser_error;
 }
 
-int http_parser_is_finished(http_parser *parser) {
-  return parser->cs >= http_parser_first_final;
+int puma_parser_is_finished(puma_parser *parser) {
+  return parser->cs >= puma_parser_first_final;
 }

data/ext/puma_http11/http11_parser_common.rl

@@ -1,6 +1,6 @@
 %%{
   
-  machine http_parser_common;
+  machine puma_parser_common;
 
 #### HTTP PROTOCOL GRAMMAR
 # line endings

data/ext/puma_http11/puma_http11.c

@@ -38,10 +38,10 @@ static VALUE global_http_version;
 static VALUE global_request_path;
 
 /** Defines common length and error messages for input length validation. */
-#define DEF_MAX_LENGTH(N,length) const size_t MAX_##N##_LENGTH = length; const char *MAX_##N##_LENGTH_ERR = "HTTP element " # N  " is longer than the " # length " allowed length."
+#define DEF_MAX_LENGTH(N,length) const size_t MAX_##N##_LENGTH = length; const char *MAX_##N##_LENGTH_ERR = "HTTP element " # N  " is longer than the " # length " allowed length (was %d)"
 
 /** Validates the max length of given input and throws an HttpParserError exception if over. */
-#define VALIDATE_MAX_LENGTH(len, N) if(len > MAX_##N##_LENGTH) { rb_raise(eHttpParserError, "%s", MAX_##N##_LENGTH_ERR); }
+#define VALIDATE_MAX_LENGTH(len, N) if(len > MAX_##N##_LENGTH) { rb_raise(eHttpParserError, MAX_##N##_LENGTH_ERR, len); }
 
 /** Defines global strings in the init method. */
 #define DEF_GLOBAL(N, val)   global_##N = rb_str_new2(val); rb_global_variable(&global_##N)
@@ -173,7 +173,7 @@ static VALUE find_common_field_value(const char *field, size_t flen)
 #endif /* !HAVE_QSORT_BSEARCH */
 }
 
-void http_field(http_parser* hp, const char *field, size_t flen,
+void http_field(puma_parser* hp, const char *field, size_t flen,
                                  const char *value, size_t vlen)
 {
   VALUE v = Qnil;
@@ -204,7 +204,7 @@ void http_field(http_parser* hp, const char *field, size_t flen,
   rb_hash_aset(hp->request, f, v);
 }
 
-void request_method(http_parser* hp, const char *at, size_t length)
+void request_method(puma_parser* hp, const char *at, size_t length)
 {
   VALUE val = Qnil;
 
@@ -212,7 +212,7 @@ void request_method(http_parser* hp, const char *at, size_t length)
   rb_hash_aset(hp->request, global_request_method, val);
 }
 
-void request_uri(http_parser* hp, const char *at, size_t length)
+void request_uri(puma_parser* hp, const char *at, size_t length)
 {
   VALUE val = Qnil;
 
@@ -222,7 +222,7 @@ void request_uri(http_parser* hp, const char *at, size_t length)
   rb_hash_aset(hp->request, global_request_uri, val);
 }
 
-void fragment(http_parser* hp, const char *at, size_t length)
+void fragment(puma_parser* hp, const char *at, size_t length)
 {
   VALUE val = Qnil;
 
@@ -232,7 +232,7 @@ void fragment(http_parser* hp, const char *at, size_t length)
   rb_hash_aset(hp->request, global_fragment, val);
 }
 
-void request_path(http_parser* hp, const char *at, size_t length)
+void request_path(puma_parser* hp, const char *at, size_t length)
 {
   VALUE val = Qnil;
 
@@ -242,7 +242,7 @@ void request_path(http_parser* hp, const char *at, size_t length)
   rb_hash_aset(hp->request, global_request_path, val);
 }
 
-void query_string(http_parser* hp, const char *at, size_t length)
+void query_string(puma_parser* hp, const char *at, size_t length)
 {
   VALUE val = Qnil;
 
@@ -252,7 +252,7 @@ void query_string(http_parser* hp, const char *at, size_t length)
   rb_hash_aset(hp->request, global_query_string, val);
 }
 
-void http_version(http_parser* hp, const char *at, size_t length)
+void http_version(puma_parser* hp, const char *at, size_t length)
 {
   VALUE val = rb_str_new(at, length);
   rb_hash_aset(hp->request, global_http_version, val);
@@ -261,7 +261,7 @@ void http_version(http_parser* hp, const char *at, size_t length)
 /** Finalizes the request header to have a bunch of stuff that's
   needed. */
 
-void header_done(http_parser* hp, const char *at, size_t length)
+void header_done(puma_parser* hp, const char *at, size_t length)
 {
   hp->body = rb_str_new(at, length);
 }
@@ -275,14 +275,14 @@ void HttpParser_free(void *data) {
   }
 }
 
-void HttpParser_mark(http_parser* hp) {
+void HttpParser_mark(puma_parser* hp) {
   if(hp->request) rb_gc_mark(hp->request);
   if(hp->body) rb_gc_mark(hp->body);
 }
 
 VALUE HttpParser_alloc(VALUE klass)
 {
-  http_parser *hp = ALLOC_N(http_parser, 1);
+  puma_parser *hp = ALLOC_N(puma_parser, 1);
   TRACE();
   hp->http_field = http_field;
   hp->request_method = request_method;
@@ -294,7 +294,7 @@ VALUE HttpParser_alloc(VALUE klass)
   hp->header_done = header_done;
   hp->request = Qnil;
 
-  http_parser_init(hp);
+  puma_parser_init(hp);
 
   return Data_Wrap_Struct(klass, HttpParser_mark, HttpParser_free, hp);
 }
@@ -307,9 +307,9 @@ VALUE HttpParser_alloc(VALUE klass)
  */
 VALUE HttpParser_init(VALUE self)
 {
-  http_parser *http = NULL;
-  DATA_GET(self, http_parser, http);
-  http_parser_init(http);
+  puma_parser *http = NULL;
+  DATA_GET(self, puma_parser, http);
+  puma_parser_init(http);
 
   return self;
 }
@@ -324,9 +324,9 @@ VALUE HttpParser_init(VALUE self)
  */
 VALUE HttpParser_reset(VALUE self)
 {
-  http_parser *http = NULL;
-  DATA_GET(self, http_parser, http);
-  http_parser_init(http);
+  puma_parser *http = NULL;
+  DATA_GET(self, puma_parser, http);
+  puma_parser_init(http);
 
   return Qnil;
 }
@@ -341,11 +341,11 @@ VALUE HttpParser_reset(VALUE self)
  */
 VALUE HttpParser_finish(VALUE self)
 {
-  http_parser *http = NULL;
-  DATA_GET(self, http_parser, http);
-  http_parser_finish(http);
+  puma_parser *http = NULL;
+  DATA_GET(self, puma_parser, http);
+  puma_parser_finish(http);
 
-  return http_parser_is_finished(http) ? Qtrue : Qfalse;
+  return puma_parser_is_finished(http) ? Qtrue : Qfalse;
 }
 
 
@@ -368,12 +368,12 @@ VALUE HttpParser_finish(VALUE self)
  */
 VALUE HttpParser_execute(VALUE self, VALUE req_hash, VALUE data, VALUE start)
 {
-  http_parser *http = NULL;
+  puma_parser *http = NULL;
   int from = 0;
   char *dptr = NULL;
   long dlen = 0;
 
-  DATA_GET(self, http_parser, http);
+  DATA_GET(self, puma_parser, http);
 
   from = FIX2INT(start);
   dptr = rb_extract_chars(data, &dlen);
@@ -383,15 +383,15 @@ VALUE HttpParser_execute(VALUE self, VALUE req_hash, VALUE data, VALUE start)
     rb_raise(eHttpParserError, "%s", "Requested start is after data buffer end.");
   } else {
     http->request = req_hash;
-    http_parser_execute(http, dptr, dlen, from);
+    puma_parser_execute(http, dptr, dlen, from);
 
     rb_free_chars(dptr);
-    VALIDATE_MAX_LENGTH(http_parser_nread(http), HEADER);
+    VALIDATE_MAX_LENGTH(puma_parser_nread(http), HEADER);
 
-    if(http_parser_has_error(http)) {
+    if(puma_parser_has_error(http)) {
       rb_raise(eHttpParserError, "%s", "Invalid HTTP format, parsing fails.");
     } else {
-      return INT2FIX(http_parser_nread(http));
+      return INT2FIX(puma_parser_nread(http));
     }
   }
 }
@@ -406,10 +406,10 @@ VALUE HttpParser_execute(VALUE self, VALUE req_hash, VALUE data, VALUE start)
  */
 VALUE HttpParser_has_error(VALUE self)
 {
-  http_parser *http = NULL;
-  DATA_GET(self, http_parser, http);
+  puma_parser *http = NULL;
+  DATA_GET(self, puma_parser, http);
 
-  return http_parser_has_error(http) ? Qtrue : Qfalse;
+  return puma_parser_has_error(http) ? Qtrue : Qfalse;
 }
 
 
@@ -421,10 +421,10 @@ VALUE HttpParser_has_error(VALUE self)
  */
 VALUE HttpParser_is_finished(VALUE self)
 {
-  http_parser *http = NULL;
-  DATA_GET(self, http_parser, http);
+  puma_parser *http = NULL;
+  DATA_GET(self, puma_parser, http);
 
-  return http_parser_is_finished(http) ? Qtrue : Qfalse;
+  return puma_parser_is_finished(http) ? Qtrue : Qfalse;
 }
 
 
@@ -437,8 +437,8 @@ VALUE HttpParser_is_finished(VALUE self)
  */
 VALUE HttpParser_nread(VALUE self)
 {
-  http_parser *http = NULL;
-  DATA_GET(self, http_parser, http);
+  puma_parser *http = NULL;
+  DATA_GET(self, puma_parser, http);
 
   return INT2FIX(http->nread);
 }
@@ -450,8 +450,8 @@ VALUE HttpParser_nread(VALUE self)
  * If the request included a body, returns it.
  */
 VALUE HttpParser_body(VALUE self) {
-  http_parser *http = NULL;
-  DATA_GET(self, http_parser, http);
+  puma_parser *http = NULL;
+  DATA_GET(self, puma_parser, http);
 
   return http->body;
 }

data/lib/puma/capistrano.rb

@@ -17,18 +17,49 @@ Capistrano::Configuration.instance.load do
   namespace :puma do
     desc 'Start puma'
     task :start, :roles => lambda { fetch(:puma_role) }, :on_no_matching_servers => :continue do
-      puma_env = fetch(:rack_env, fetch(:rails_env, 'production'))
-      run "cd #{current_path} && #{fetch(:puma_cmd)} -q -d -e #{puma_env} -b '#{fetch(:puma_socket)}' -S #{fetch(:puma_state)} --control 'unix://#{shared_path}/sockets/pumactl.sock'", :pty => false
+      run "cd #{current_path} && #{fetch(:puma_cmd)} #{start_options}", :pty => false
     end
 
     desc 'Stop puma'
     task :stop, :roles => lambda { fetch(:puma_role) }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && #{fetch(:pumactl_cmd)} -S #{fetch(:puma_state)} stop"
+      run "cd #{current_path} && #{fetch(:pumactl_cmd)} -S #{state_path} stop"
     end
 
     desc 'Restart puma'
     task :restart, :roles => lambda { fetch(:puma_role) }, :on_no_matching_servers => :continue do
-      run "cd #{current_path} && #{fetch(:pumactl_cmd)} -S #{fetch(:puma_state)} restart"
+      run "cd #{current_path} && #{fetch(:pumactl_cmd)} -S #{state_path} restart"
     end
   end
+
+  def start_options
+    if config_file
+      "-q -d -e #{puma_env} -C #{config_file}"
+    else
+      "-q -d -e #{puma_env} -b '#{fetch(:puma_socket)}' -S #{state_path} --control 'unix://#{shared_path}/sockets/pumactl.sock'"
+    end
+  end
+
+  def config_file
+    @_config_file ||= begin
+      file = fetch(:puma_config_file, nil)
+      file = "./config/puma/#{puma_env}.rb" if !file && File.exists?("./config/puma/#{puma_env}.rb")
+      file
+    end
+  end
+
+  def puma_env
+    fetch(:rack_env, fetch(:rails_env, 'production'))
+  end
+
+  def state_path
+    (config_file ? configuration.options[:state] : nil) || fetch(:puma_state)
+  end
+
+  def configuration
+    require 'puma/configuration'
+
+    config = Puma::Configuration.new(:config_file => config_file)
+    config.load
+    config
+  end
 end

data/lib/puma/cli.rb

@@ -148,7 +148,7 @@ module Puma
           $LOAD_PATH.unshift(*arg.split(':'))
         end
 
-        o.on "-p", "--port PORT", "Define what port TCP port to bind to",
+        o.on "-p", "--port PORT", "Define the TCP port to bind to",
                                   "Use -b for more advanced options" do |arg|
           @options[:binds] << "tcp://#{Configuration::DefaultTCPHost}:#{arg}"
         end
@@ -178,11 +178,11 @@ module Puma
         o.on '-t', '--threads INT', "min:max threads to use (default 0:16)" do |arg|
           min, max = arg.split(":")
           if max
-            @options[:min_threads] = min.to_i
-            @options[:max_threads] = max.to_i
+            @options[:min_threads] = min
+            @options[:max_threads] = max
           else
             @options[:min_threads] = 0
-            @options[:max_threads] = arg.to_i
+            @options[:max_threads] = arg
           end
         end
 
@@ -235,7 +235,13 @@ module Puma
           f.puts Process.pid
         end
 
-        at_exit { delete_pidfile }
+        cur = Process.pid
+
+        at_exit do
+          if cur == Process.pid
+            delete_pidfile
+          end
+        end
       end
     end
 
@@ -443,6 +449,9 @@ module Puma
       when :exit
         # nothing
       end
+
+    ensure
+      delete_pidfile
     end
 
     def setup_signals
@@ -454,6 +463,14 @@ module Puma
         log "*** SIGUSR2 not implemented, signal based restart unavailable!"
       end
 
+      begin
+        Signal.trap "SIGUSR1" do
+          phased_restart
+        end
+      rescue Exception
+        log "*** SIGUSR1 not implemented, signal based restart unavailable!"
+      end
+
       begin
         Signal.trap "SIGTERM" do
           stop
@@ -482,8 +499,8 @@ module Puma
     end
 
     def phased_restart
-      return false unless @runner.respond_to? :phased_restart
-      @runner.phased_restart
+      return restart unless @runner.respond_to? :phased_restart
+      return restart unless @runner.phased_restart
     end
 
     def stats

data/lib/puma/cluster.rb

@@ -233,16 +233,6 @@ module Puma
         end
       end
 
-      if preload?
-        Signal.trap "SIGUSR1" do
-          log "App preloaded, phased restart unavailable"
-        end
-      else
-        Signal.trap "SIGUSR1" do
-          phased_restart
-        end
-      end
-
       # Used by the workers to detect if the master process dies.
       # If select says that @check_pipe is ready, it's because the
       # master has exited and @suicide_pipe has been automatically

data/lib/puma/configuration.rb

@@ -19,6 +19,7 @@ module Puma
       @options = options
       @options[:binds] ||= []
       @options[:on_restart] ||= []
+      @options[:worker_boot] ||= []
     end
 
     attr_reader :options
@@ -187,12 +188,26 @@ module Puma
         @options[:binds] << url
       end
 
+      # Define the TCP port to bind to. Use +bind+ for more advanced options.
+      #
+      def port(port)
+        @options[:binds] << "tcp://#{Configuration::DefaultTCPHost}:#{port}"
+      end
+
       # Daemonize the server into the background. Highly suggest that
       # this be combined with +pidfile+ and +stdout_redirect+.
       def daemonize(which=true)
         @options[:daemon] = which
       end
 
+      # When shutting down, drain the accept socket of pending
+      # connections and proces them. This loops over the accept
+      # socket until there are no more read events and then stops
+      # looking and waits for the requests to finish.
+      def drain_on_shutdown(which=true)
+        @options[:drain_on_shutdown] = which
+      end
+
       # Set the environment in which the Rack's app will run.
       def environment(environment)
         @options[:environment] = environment

data/lib/puma/const.rb

@@ -28,8 +28,8 @@ module Puma
   # too taxing on performance.
   module Const
 
-    PUMA_VERSION = VERSION = "2.3.2".freeze
-    CODE_NAME = "Delicious Thin Mints"
+    PUMA_VERSION = VERSION = "2.4.0".freeze
+    CODE_NAME = "Crunchy Munchy Lunchy"
 
     FAST_TRACK_KA_TIMEOUT = 0.2
 

data/lib/puma/events.rb

@@ -20,6 +20,8 @@ module Puma
       @stdout.sync = true
       @stderr.sync = true
 
+      @debug = ENV.key? 'PUMA_DEBUG'
+
       @on_booted = []
     end
 
@@ -35,6 +37,10 @@ module Puma
       @stdout.write str
     end
 
+    def debug(str)
+      log("% #{str}") if @debug
+    end
+
     # Write +str+ to +@stderr+
     #
     def error(str)

data/lib/puma/jruby_restart.rb

@@ -44,6 +44,10 @@ module Puma
     def self.daemon_start(dir, argv)
       ENV['PUMA_DAEMON_RESTART'] = Process.pid.to_s
 
+      if k = ENV['PUMA_JRUBY_DAEMON_OPTS']
+        ENV['JRUBY_OPTS'] = k
+      end
+
       cmd = argv.first
       argv = ([:string] * argv.size).zip(argv).flatten
       argv << :string

data/lib/puma/rack_patch.rb

@@ -13,7 +13,10 @@ module Rack
       status, header, body = @app.call(env)
       header = Utils::HeaderHash.new(header)
 
-      if ary = env['rack.after_reply']
+      # If we've been hijacked, then output a special line
+      if env['rack.hijack_io']
+        log_hijacking(env, 'HIJACK', header, began_at)
+      elsif ary = env['rack.after_reply']
         ary << lambda { log(env, status, header, began_at) }
       else
         body = BodyProxy.new(body) { log(env, status, header, began_at) }
@@ -21,5 +24,22 @@ module Rack
 
       [status, header, body]
     end
+
+    HIJACK_FORMAT = %{%s - %s [%s] "%s %s%s %s" HIJACKED -1 %0.4f\n}
+
+    def log_hijacking(env, status, header, began_at)
+      now = Time.now
+
+      logger = @logger || env['rack.errors']
+      logger.write HIJACK_FORMAT % [
+        env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
+        env["REMOTE_USER"] || "-",
+        now.strftime("%d/%b/%Y %H:%M:%S"),
+        env["REQUEST_METHOD"],
+        env["PATH_INFO"],
+        env["QUERY_STRING"].empty? ? "" : "?"+env["QUERY_STRING"],
+        env["HTTP_VERSION"],
+        now - began_at ]
+    end
   end
 end

data/lib/puma/runner.rb

@@ -115,7 +115,7 @@ module Puma
       min_t = @options[:min_threads]
       max_t = @options[:max_threads]
 
-      server = Puma::Server.new app, @cli.events
+      server = Puma::Server.new app, @cli.events, @options
       server.min_threads = min_t
       server.max_threads = max_t
       server.inherit_binder @cli.binder

data/lib/puma/server.rb

@@ -13,6 +13,8 @@ require 'puma/delegation'
 require 'puma/accept_nonblock'
 require 'puma/util'
 
+require 'puma/rack_patch'
+
 require 'puma/puma_http11'
 
 unless Puma.const_defined? "IOBuffer"
@@ -46,7 +48,7 @@ module Puma
     # Server#run returns a thread that you can join on to wait for the server
     # to do it's work.
     #
-    def initialize(app, events=Events.stdio)
+    def initialize(app, events=Events.stdio, options={})
       @app = app
       @events = events
 
@@ -70,6 +72,8 @@ module Puma
 
       @leak_stack_on_error = true
 
+      @options = options
+
       ENV['RACK_ENV'] ||= "development"
     end
 
@@ -327,7 +331,13 @@ module Puma
       # server; that client may be a proxy, gateway, or other
       # intermediary acting on behalf of the actual source client."
       #
-      env[REMOTE_ADDR] = client.peeraddr.last
+
+      addr = client.peeraddr.last
+
+      # Set unix socket addrs to localhost
+      addr = "127.0.0.1" if addr.empty?
+
+      env[REMOTE_ADDR] = addr
     end
 
     def default_server_port(env)
@@ -594,6 +604,28 @@ module Puma
     # Wait for all outstanding requests to finish.
     #
     def graceful_shutdown
+      if @options[:drain_on_shutdown]
+        count = 0
+
+        while true
+          ios = IO.select @binder.ios, nil, nil, 0
+          break unless ios
+
+          ios.first.each do |sock|
+            begin
+              if io = sock.accept_nonblock
+                count += 1
+                c = Client.new io, @binder.env(sock)
+                @thread_pool << c
+              end
+            rescue SystemCallError
+            end
+          end
+        end
+
+        @events.debug "Drained #{count} additional connections."
+      end
+
       @thread_pool.shutdown if @thread_pool
     end
 

data/lib/puma/single.rb

@@ -55,6 +55,11 @@ module Puma
             exit
           end
 
+          Signal.trap "SIGCHLD" do
+            log "! Error starting new process as daemon, exitting"
+            exit 1
+          end
+
           pid = @cli.jruby_daemon_start
           sleep
         end

data/lib/puma/thread_pool.rb

@@ -20,8 +20,8 @@ module Puma
       @spawned = 0
       @waiting = 0
 
-      @min = min
-      @max = max
+      @min = Integer(min)
+      @max = Integer(max)
       @block = block
       @extra = extra
 
@@ -34,7 +34,7 @@ module Puma
       @auto_trim = nil
 
       @mutex.synchronize do
-        min.times { spawn_thread }
+        @min.times { spawn_thread }
       end
     end
 

data/lib/rack/handler/puma.rb

@@ -31,8 +31,8 @@ module Rack
         puts "* Listening on tcp://#{options[:Host]}:#{options[:Port]}"
 
         server.add_tcp_listener options[:Host], options[:Port]
-        server.min_threads = Integer(min)
-        server.max_threads = Integer(max)
+        server.min_threads = min
+        server.max_threads = max
         yield server if block_given?
 
         begin

data/puma.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "puma"
-  s.version = "2.3.2"
+  s.version = "2.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Phoenix"]
-  s.date = "2013-07-09"
+  s.date = "2013-07-22"
   s.description = "Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications. Puma is intended for use in both development and production environments. In order to get the best throughput, it is highly recommended that you use a  Ruby implementation with real threads like Rubinius or JRuby."
   s.email = ["evan@phx.io"]
   s.executables = ["puma", "pumactl"]

data/test/test_thread_pool.rb

@@ -32,6 +32,16 @@ class TestThreadPool < Test::Unit::TestCase
     assert_equal 1, pool.spawned
   end
 
+  def test_converts_pool_sizes
+    pool = new_pool('0', '1')
+
+    assert_equal 0, pool.spawned
+
+    pool << 1
+
+    assert_equal 1, pool.spawned
+  end
+
   def test_append_queues_on_max
     finish = false
     pool = new_pool(0, 1) { Thread.pass until finish }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puma
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack