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

61 commits

Author SHA1 Message Date
Nate Berkopec
5f84f37944
Remove unnecessary calls to abort_on_exception 2019-09-11 12:36:40 +00:00
Kitten King
f89f194dcb Fix Typos () 2019-07-22 10:33:19 -04:00
Adam Schwartz
09895cb29e Fix checking pid existence condition branches 2018-09-18 15:18:57 +02:00
hoshino tsuyoshi
9aea96eaf3 ps -p will check correctly whether $PID exists ()
It is appropriate to use `ps -p` in that place.

Under certain conditions, existing code ``[ "`ps -A -o pid=
| grep -c $PID`" -eq 0 ]`` may behave incorrectly.

For example, if the content of $PID happens to be a short string
(such as `199`), and another process includes the string
(process such as `2199`), then unfortunately `grep -c` will return
positive number even if `199` is not running.
2018-03-28 07:00:30 -06:00
Jean-Philippe Doyle
286cb05029 Add warning about init.d being replaced by systemd ()
And move init.d last in the documentation.

Using init.d script in a systemd environment will work for jobs start/stop, but restart will not be managed as expected with old init.d system. This may cause confusion, pain and a lot of systemd search time.
2018-03-27 16:53:03 -06:00
Adam "Bucky" Townsend
34a3790bc7 Freebsd rc.d jungle for puma () 2018-03-20 11:53:38 -06:00
Manabu Ejima
efc2620c62 Fix the order of redirects ()
Redirect from stderr to stdout should be before redirect to a log file
2018-03-19 15:46:55 -06:00
David Kellum
5814e39b0e Additional docs/systemd refinements ()
* More docs/systemd refinements

 * Section renamed Alternative Forking Configuration with explanation
   given for when to use this.
 * capistrano3-puma in sub-section with consolidated dry-run shell
   commands
 * Section Service Configuration contrasts and references Forking
   section
 * Streamline config samples and highlight using ini format

* More intro to docs/systemd, alt forking section

* Add docs/systemd link to tools/jungle/README, for parity

* Add systemd, alt-forking Always and WantedBy

* Add another link to systemd from README, capistrano section

* minor typo
2017-06-26 17:27:31 -04:00
Vladimir Dementyev
2cb2357d39 Let's use Rubocop! ()
* Add limited rubocop config and TODO config

* Remove trailing whitespaces and blanklines

* Add rubocop rake task; upd travis.yml
2017-06-04 13:21:05 -07:00
Vasiliy
42126a23d4 Support for rvm () 2017-01-30 10:43:22 -07:00
Patrycjusz R. Łogiewa
2252eafdbd stub description files updated 2016-09-21 13:27:47 +02:00
Michael Sauter
cfa301bb7e Fix Puma start
+start+ did not read the environment variables. However, e.g. +phased-restart+
did. Also +start+ was implemented quite differently from other actions.

Now +start+ is implemented like the other actions, it respects environment
variables and there's a lot less code duplication going on.
2016-08-29 14:36:27 +02:00
Evan Phoenix
25741358fd Merge pull request from michaelsauter/task/document-env-vars
Document usage of environment variables
2016-08-18 09:43:38 -07:00
Michael Sauter
86b8da2c28 Document usage of environment variables 2016-08-18 17:09:00 +02:00
Michael Sauter
82ae583245 Add phased-restart to usage of one puma 2016-08-18 16:57:47 +02:00
Szymon Jeż
ac2713c9ca Update reference to the instances management script 2016-07-11 16:14:07 +02:00
Evan Phoenix
7dfd7fa54a Merge pull request from snow/master
NEW: add phased-restart support to init.d script
2016-05-09 18:52:24 -07:00
Snow Helsing
b7161cd9e5 ENH: detection of rbenv path 2016-05-03 15:48:06 +08:00
Snow Helsing
17673bab20 FIX: typo 2016-05-03 15:48:06 +08:00
Snow Helsing
73333b6025 CHG: init rbenv in run-puma 2016-05-03 15:47:56 +08:00
Vipul A M
bf4a846007 Fix typos at couple of places. 2016-04-07 23:54:45 +05:30
Snow Helsing
e855144da8 CHG: provide both hot and phased restart in jungle script 2016-02-07 22:16:34 +08:00
Snow Helsing
c87a733d50 FIX: rbenv init when it's installed to /usr/local/rbenv 2015-10-07 17:38:58 +08:00
Snow Helsing
02204bd27a CHG: apply config_bundler() to all commands 2015-09-29 18:23:46 +08:00
Snow Helsing
e8124d3c25 FIX: also call config_bundler in do_start 2015-08-31 16:20:44 +08:00
Snow Helsing
c7dd2d6b93 CHG: make jungle for init.d support rbenv 2015-08-29 16:32:59 +08:00
Greg Annandale
a0ba9f1c83 Added example sourcing of environment vars 2015-05-27 19:18:58 -04:00
Greg Annandale
e69f1c831b Check for system-wide rbenv 2015-05-27 19:18:29 -04:00
Krzysztof Wilczynski
266540cec3 Add the ability to pass environment variables to the init script (for Jungle).
Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
2014-11-27 15:57:47 +00:00
indi
21095d7d71 fix typo in README.md
in the README path to log file was pointing to /path/to/app/config/log/puma.log instead of /path/to/app/log/puma.log
2014-11-15 12:20:45 +01:00
Trent Ogren
5c8dda2991 Fix Puma daemon service README typo 2014-04-09 14:12:06 -05:00
Ibrahim Awwal
283a5a6bdd Add rbenv shims to PATH in upstart conf file
These days bundle is installed in the shims directory, so we need to have this
in the PATH for the upstart configuration to work.
2014-01-05 17:59:25 -08:00
Daniel Gaytán
083400c698 Change position of cd so that rvm gemset is loaded
I got an error in my production environment because it was not loading the right ruby and gemset.
2013-11-27 13:22:38 -06:00
Lukas Nordin
8e6f175e60 Upstart jungle use config/puma.rb instead
Not really sure why it is loading production.rb since the README and the init.d script says it expects config.rb instead.

Patch attached simply reflects this.
2013-09-16 19:47:12 +02:00
Michael J. Cohen
80eb91f1f5 Autodetect ruby managers and home directory in upstart script
- HOME is now picked up automatically from setuid.
- script will try rbenv, rvm, then chruby automatically.
- quoted heredoc to prevent /bin/sh interpreting variables early

Sponsored-by: CentroNet Marketing
2013-08-06 18:45:43 -04:00
Michael J. Cohen
b58e97b06c Uncomment setuid/setgid by default in upstart 2013-08-06 18:42:52 -04:00
Michael J. Cohen
11110add54 Update upstart comments to reflect new commandline
```service puma start app=PATH_TO_APP`` is the correct syntax.
2013-08-06 18:40:41 -04:00
Cory Kaufman-Schofield
0b5d97253a Fixed some typos in upstart scripts 2013-06-05 13:28:32 -04:00
baruchlubinsky
4ed27737c1 Update puma-manager.conf
Added quotes to /etc/puma.conf
2013-05-27 16:34:05 +02:00
Darío Javier Cravero
609d433bcf Cleaned up README 2013-03-09 18:41:55 -03:00
Darío Javier Cravero
eec5702aef Added a general jungle README and modified the general docs to tell about the two options 2013-03-09 18:20:17 -03:00
Darío Javier Cravero
0fa28f9d1f Moved init.d implementation to its own folder and added basic upstart support 2013-03-09 18:18:03 -03:00
Darío Javier Cravero
6a458da410 Update tools/jungle/README.md 2012-08-11 21:10:04 +02:00
Darío Javier Cravero
f2cb62c749 Implemented an init.d script to manage the Jungle.
The script allows running Puma apps as daemons using start-stop-daemon and adds an easy way to log its activity.
2012-08-11 20:04:55 +01:00
evanweaver
c60ff81f1e minor test cleanups
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@710 19e92222-5c0b-0410-8929-a290d50e31e9
2007-10-21 02:54:53 +00:00
evanweaver
de7b623241 signed mongrel gem
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@607 19e92222-5c0b-0410-8929-a290d50e31e9
2007-09-23 03:09:56 +00:00
zedshaw
9ffb99ce78 Removes the test/coverage from the gem
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@305 19e92222-5c0b-0410-8929-a290d50e31e9
2006-08-05 18:05:47 +00:00
zedshaw
a6d80703cb Refactor reaping dead threads. Slight change to license header to make it clearer.
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@255 19e92222-5c0b-0410-8929-a290d50e31e9
2006-06-23 13:22:47 +00:00
zedshaw
5406120730 A few more fixes trying to improve the win32 build support.
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@242 19e92222-5c0b-0410-8929-a290d50e31e9
2006-06-16 21:01:12 +00:00
zedshaw
375a0b5c5e Some potential fixes for better cross platform builds.
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@237 19e92222-5c0b-0410-8929-a290d50e31e9
2006-06-10 07:02:19 +00:00