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

10 commits

Author SHA1 Message Date
Nate Berkopec
5f84f37944
Remove unnecessary calls to abort_on_exception 2019-09-11 12:36:40 +00:00
Laurent Arnoud
cbf1bd1e92 Check puma config environment file on control_cli (#1885)
Fix https://github.com/puma/puma/issues/1445
2019-08-10 11:34:35 -07:00
Laurent Arnoud
5a2291ef1b Add status to pumactl with pidfile (#1824)
ref https://github.com/puma/puma/pull/1767
2019-06-23 19:36:06 -05:00
Jesús Burgos Maciá
d39fe92a2d Fixes the bug that wouldn't allow no_token be set to true (#1803)
* Fix crash when no_token is set

* Use a more meaningful name instead of an empty string

* Adds a test to ensure `{ no_token: true }` works

* Adds an explanation for the usage of a String

Just to justify the use of a String instead of a Symbol.

* Removes thread that would start the server

This removes the part of the test that would start the server. The
reason why the thread was being created originally in the PR was to
ensure that the server was booting even with `{ no_token: true }`.

I believe we don't need to test the full server boot but just ensure
that we won't pass a Symbol to OptionParser. In particular the test
ensures that the token will be set to `'none'` when `no_token: true`.

There're already other tests testing that the server boots.
2019-05-28 09:37:34 -04:00
MSP-Greg
712618adde test_pumactl.rb - remove skip on test_control_url 2018-07-14 20:11:00 -05:00
John Andrews
6d0efee913 Add support for --control-url (#1487)
- deprecate `--control`
- add new option `--control-url`
- https://github.com/puma/puma/pull/1416 introduced a bug in pumactl the puma
  cli does not respond to `control-cli` option. On puma it is called `control`
- this commit
  a8f54f74cd
  was correct, but it looked like a typo since the names of the options are not
  consistent across versions
- the best option for fixing this seems to be to support both options
- we don't want to stop supporting `control` in the cli for
  backwards-compatibility so it is deprecated
2018-05-09 12:38:12 -06:00
Michael Grosser
9d93a0f62f make test_helper no longer be loaded as a test (#1283)
running `rake` loads all files starting with `test_` which is not supposed to also load the helper,
since the helper should be loaded by each test and is not a test itself.
2017-05-12 12:16:55 -07:00
Michael Grosser
d25ef26465 warn when bundler fails and avoid having to use -I to run tests (#1270) 2017-04-11 14:48:11 -07:00
schneems
77edb0398c [close #1238] Don't call non-existent method
`Puma::Configuration._from_file` was removed in 89f37432de. It was still being used by the `Puma::ControlCLI` class which was previously not being tested while being called with a `--config-file` option.

This PR reintroduces the previous behavior of loading a config file when specified via `pumactl` command.
2017-03-10 10:30:27 -06:00
schneems
d5bab85927 Add failing test for #1238 2017-03-10 10:03:53 -06:00