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

24 commits

Author SHA1 Message Date
Evan Phoenix
6ebd5004bd Use options from the config file properly. Fixes #764 2015-08-15 10:05:59 -07:00
James Le Cuirot
dee695f0f1 Make pumactl load config/puma.rb by default
config/puma/#{env}.rb isn't tried because there is no environment
option for pumactl, though this could be added.
2015-06-16 11:13:07 +01:00
Rubén Caro
48b50a312f Add reload_worker_directory 2014-02-25 14:52:20 +01:00
Evan Phoenix
b2c0e0b613 Merge remote-tracking branch 'origin/pr/336'
Conflicts:
	lib/puma/control_cli.rb
2013-08-08 16:10:26 -07:00
Tim McEwan
274350a2e6 make pumactl restart start puma if not running 2013-08-01 20:04:44 +10:00
Igor Bochkariov
83163c3f28 Allow configuring pumactl with config.rb
example:
  echo "pidfile '/tmp/app.pid'; rackup 'config.ru'" > /etc/puma/app.rb
  pumactl -F /etc/puma/app.rb start # starts an app and store pid in /tmp/app.pid
  pumactl -F /etc/puma/app.rb stop  # stops the started earlier app

Integration test t2 included: rake test:integration
Also fixed discrepancy in naming options :pidfile/:pid_file and :state/:status_file
2013-07-19 10:30:15 +04:00
Evan Phoenix
895dc9e438 Pass state path through to pumactl start. Fixes #287 2013-07-05 22:16:46 -07:00
Evan Phoenix
50239b013f Check status data better. Fixes #292 2013-07-05 22:16:46 -07:00
Evan Phoenix
c48b804d8f Refactor modes, fix control server to always work 2013-07-05 16:08:13 -07:00
Ian Ehlert
070a028f7c output stats results when using pumactl 2013-06-13 11:47:02 -05:00
Evan Phoenix
dbac1ad947 Fix typo 2013-06-01 14:24:33 -07:00
Evan Phoenix
e3f1009074 Handle errors from the server better 2013-06-01 13:55:17 -07:00
Evan Phoenix
9300930295 Add -p option to pumactl 2012-10-15 22:50:30 -07:00
Evan Phoenix
dd494def4e Add start option back to pumactl 2012-10-15 22:37:28 -07:00
Evan Phoenix
aea32a9ca1 Style cleanup 2012-10-15 22:24:22 -07:00
Evgeniy Shurmin
e2c0f0ce15 Add more options to pumactl 2012-10-15 22:14:34 -07:00
Evan Phoenix
559f32905c Add ability to use pumactl to start a server 2012-09-25 09:52:25 -07:00
Luis Lavena
0fee5c8064 Change YAML.load trick to use File.read instead
And move required Ruby version to 1.8.7 or greater.
(sorry folks on 1.8.6, time to upgrade anyway)
2012-01-08 17:46:10 -03:00
Luis Lavena
935a5569ea Psych::load_file leaves file handles open (leak)
Fixed in Ruby trunk and 1_9_3 branch but not yet released.

Avoid that by doing a old-school File.open { |f| f.read }
2012-01-08 17:01:03 -03:00
Evan Phoenix
49d27f888f Fix integration test and cleanup 1.9.3 warnings 2011-12-07 14:48:41 -08:00
Evan Phoenix
e88fc14952 Refactor more of the configuration 2011-12-07 13:43:10 -08:00
Evan Phoenix
47f7671282 Add auth token support to the control server 2011-12-07 10:46:36 -08:00
Evan Phoenix
6103e7f45b Add ability to use a config file (-C, --config) 2011-12-06 14:57:37 -08:00
Evan Phoenix
d8026e87f4 Add ability to restart by reexecing and pumactl to use it
This allows all existing requests to finish, but does not keep the same
socket alive across the exec, so this is not a graceful as it could be.
2011-12-05 15:58:23 -08:00