puma 2.2.0-java → 2.2.1-java

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of puma might be problematic. Click here for more details.

data/Gemfile CHANGED
@@ -1,6 +1,7 @@
1
1
  source "http://rubygems.org"
2
2
 
3
3
  gem "hoe"
4
+ gem "hoe-git"
4
5
  gem "rdoc"
5
6
  gem "rake-compiler"
6
7
  gem "rack"
@@ -96,6 +96,14 @@ module Puma
96
96
  end
97
97
  end
98
98
 
99
+ def restart_args
100
+ if cmd = @options[:restart_cmd]
101
+ cmd.split(' ') + @original_argv
102
+ else
103
+ @restart_argv
104
+ end
105
+ end
106
+
99
107
  def restart!
100
108
  @options[:on_restart].each do |blk|
101
109
  blk.call self
@@ -114,7 +122,7 @@ module Puma
114
122
  end
115
123
 
116
124
  require 'puma/jruby_restart'
117
- JRubyRestart.chdir_exec(@restart_dir, @restart_argv)
125
+ JRubyRestart.chdir_exec(@restart_dir, restart_args)
118
126
  else
119
127
  redirects = {:close_others => true}
120
128
  @binder.listeners.each_with_index do |(l,io),i|
@@ -122,11 +130,7 @@ module Puma
122
130
  redirects[io.to_i] = io.to_i
123
131
  end
124
132
 
125
- if cmd = @options[:restart_cmd]
126
- argv = cmd.split(' ') + @original_argv
127
- else
128
- argv = @restart_argv
129
- end
133
+ argv = restart_args
130
134
 
131
135
  Dir.chdir @restart_dir
132
136
 
@@ -236,6 +240,10 @@ module Puma
236
240
  @options[:pidfile] = arg
237
241
  end
238
242
 
243
+ o.on "--preload", "Preload the app. Cluster mode only" do
244
+ @options[:preload_app] = true
245
+ end
246
+
239
247
  o.on "-q", "--quiet", "Quiet down the output" do
240
248
  @options[:quiet] = true
241
249
  end
@@ -292,7 +300,7 @@ module Puma
292
300
  end
293
301
  end
294
302
 
295
- def set_rack_environment
303
+ def set_rack_environment
296
304
  # Try the user option first, then the environment variable,
297
305
  # finally default to development
298
306
 
@@ -323,7 +331,7 @@ module Puma
323
331
  state = { "pid" => Process.pid }
324
332
 
325
333
  cfg = @config.dup
326
-
334
+
327
335
  [ :logger, :worker_boot, :on_restart ].each { |o| cfg.options.delete o }
328
336
 
329
337
  state["config"] = cfg
@@ -504,7 +512,7 @@ module Puma
504
512
  exit
505
513
  end
506
514
 
507
- pid = JRubyRestart.daemon_start(@restart_dir, @restart_argv)
515
+ pid = JRubyRestart.daemon_start(@restart_dir, restart_args)
508
516
  sleep
509
517
  end
510
518
  else
@@ -28,7 +28,7 @@ module Puma
28
28
  # too taxing on performance.
29
29
  module Const
30
30
 
31
- PUMA_VERSION = VERSION = "2.2.0".freeze
31
+ PUMA_VERSION = VERSION = "2.2.1".freeze
32
32
 
33
33
  FAST_TRACK_KA_TIMEOUT = 0.2
34
34
 
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = "puma"
5
- s.version = "2.2.0"
5
+ s.version = "2.2.1"
6
6
 
7
7
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
8
8
  s.authors = ["Evan Phoenix"]
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: puma
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 2.2.0
5
+ version: 2.2.1
6
6
  platform: java
7
7
  authors:
8
8
  - Evan Phoenix