capistrano-sidekiq 0.20.0 → 2.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +5 -5
- data/.gitignore +1 -0
- data/.tool-versions +1 -0
- data/CHANGELOG.md +286 -0
- data/Gemfile +4 -0
- data/README.md +46 -49
- data/Rakefile +8 -0
- data/capistrano-sidekiq.gemspec +3 -3
- data/lib/capistrano/sidekiq/helpers.rb +53 -0
- data/lib/capistrano/sidekiq/monit.rb +21 -2
- data/lib/capistrano/sidekiq/systemd.rb +19 -0
- data/lib/capistrano/sidekiq/version.rb +3 -3
- data/lib/capistrano/sidekiq.rb +30 -4
- data/lib/capistrano/tasks/monit.rake +64 -78
- data/lib/capistrano/tasks/sidekiq.rake +2 -250
- data/lib/capistrano/tasks/systemd.rake +296 -0
- data/lib/generators/capistrano/sidekiq/monit/templates/sidekiq_monit.conf.erb +8 -10
- data/lib/generators/capistrano/sidekiq/systemd/templates/sidekiq.service.capistrano.erb +68 -0
- metadata +28 -12
- data/CHANGELOG +0 -28
- data/CONTRIBUTORS.md +0 -11
- data/lib/capistrano/tasks/capistrano2.rb +0 -147
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: f1305b19a72ddd0258d9802bb785bf4b35b8a365341ace29cc7f13a73b48e275
|
4
|
+
data.tar.gz: fb3d6649a6d38017d246b029b724054d19ab1121a5290cfc059435c49d71f1b8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f785e552f7e6d5ae48239cad1190450d153340bcbeb4b00128a5ef26f809561b0cd638e759221f9dfda2916812a60071ca597ab54a58b7973894777df2465baf
|
7
|
+
data.tar.gz: b59f3805ca7517b3b7378f05dd924c9135eb5cca57475b2b538d50ed0c379be383a2ec4cc8bf666e3d72cbb846df5fd5ace2d8f4262aeffc722b7082c2613760
|
data/.gitignore
CHANGED
data/.tool-versions
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
ruby 2.7.6
|
data/CHANGELOG.md
ADDED
@@ -0,0 +1,286 @@
|
|
1
|
+
# Changelog
|
2
|
+
|
3
|
+
## [2.3.0](https://github.com/seuros/capistrano-sidekiq/tree/2.3.0) (2022-05-17)
|
4
|
+
|
5
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v2.2.0...2.3.0)
|
6
|
+
|
7
|
+
**Merged pull requests:**
|
8
|
+
|
9
|
+
- fix sidekiq processes naming when count is 1 [\#300](https://github.com/seuros/capistrano-sidekiq/pull/300) ([seuros](https://github.com/seuros))
|
10
|
+
- Support multiple processes in `sidekiq:install` [\#299](https://github.com/seuros/capistrano-sidekiq/pull/299) ([lloydwatkin](https://github.com/lloydwatkin))
|
11
|
+
- fix: monit config template [\#288](https://github.com/seuros/capistrano-sidekiq/pull/288) ([jpickwell](https://github.com/jpickwell))
|
12
|
+
|
13
|
+
## [v2.2.0](https://github.com/seuros/capistrano-sidekiq/tree/v2.2.0) (2022-05-16)
|
14
|
+
|
15
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v2.1.0...v2.2.0)
|
16
|
+
|
17
|
+
**Merged pull requests:**
|
18
|
+
|
19
|
+
- Allow the definition of service\_unit\_name [\#297](https://github.com/seuros/capistrano-sidekiq/pull/297) ([seuros](https://github.com/seuros))
|
20
|
+
- restore sidekiq unit env vars [\#295](https://github.com/seuros/capistrano-sidekiq/pull/295) ([tayagi-aim](https://github.com/tayagi-aim))
|
21
|
+
- Fix a typo in sidekiq:restart [\#294](https://github.com/seuros/capistrano-sidekiq/pull/294) ([hoppergee](https://github.com/hoppergee))
|
22
|
+
|
23
|
+
## [v2.1.0](https://github.com/seuros/capistrano-sidekiq/tree/v2.1.0) (2022-05-15)
|
24
|
+
|
25
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v2.0.0...v2.1.0)
|
26
|
+
|
27
|
+
**Merged pull requests:**
|
28
|
+
|
29
|
+
- Fix \#253: $HOME is unexpanded in service unit file [\#291](https://github.com/seuros/capistrano-sidekiq/pull/291) ([nikochiko](https://github.com/nikochiko))
|
30
|
+
- Update Readme [\#287](https://github.com/seuros/capistrano-sidekiq/pull/287) ([lesliepoolman](https://github.com/lesliepoolman))
|
31
|
+
- Fixed sidekiq.service autostart in --user mode [\#285](https://github.com/seuros/capistrano-sidekiq/pull/285) ([michaelkhabarov](https://github.com/michaelkhabarov))
|
32
|
+
- README: Add section about older Systemd versions logging [\#284](https://github.com/seuros/capistrano-sidekiq/pull/284) ([64kramsystem](https://github.com/64kramsystem))
|
33
|
+
- Avoid using present? [\#282](https://github.com/seuros/capistrano-sidekiq/pull/282) ([frederikspang](https://github.com/frederikspang))
|
34
|
+
- Various systemd improvements - Multiple Process Support, Per Process Config, Proper Restarts with timeout and more [\#279](https://github.com/seuros/capistrano-sidekiq/pull/279) ([jclusso](https://github.com/jclusso))
|
35
|
+
- Use File.join for systemd file path [\#278](https://github.com/seuros/capistrano-sidekiq/pull/278) ([AndrewSverdrup](https://github.com/AndrewSverdrup))
|
36
|
+
- Fix bug in switch\_user and dry up common methods to a helpers module [\#272](https://github.com/seuros/capistrano-sidekiq/pull/272) ([chriscz](https://github.com/chriscz))
|
37
|
+
- Update monit integration against Sidekiq 6.0 [\#271](https://github.com/seuros/capistrano-sidekiq/pull/271) ([7up4](https://github.com/7up4))
|
38
|
+
- Added sidekiq\_service\_templates\_path to manage custom systemd templates [\#265](https://github.com/seuros/capistrano-sidekiq/pull/265) ([farnsworth](https://github.com/farnsworth))
|
39
|
+
- Add sidekiq\_config, sidekiq\_concurrency, and sidekiq\_queue support to systemd [\#262](https://github.com/seuros/capistrano-sidekiq/pull/262) ([ayn](https://github.com/ayn))
|
40
|
+
|
41
|
+
## [v2.0.0](https://github.com/seuros/capistrano-sidekiq/tree/v2.0.0) (2020-12-19)
|
42
|
+
|
43
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v2.0.0.beta5...v2.0.0)
|
44
|
+
|
45
|
+
**Merged pull requests:**
|
46
|
+
|
47
|
+
- Upstart update [\#261](https://github.com/seuros/capistrano-sidekiq/pull/261) ([duhast](https://github.com/duhast))
|
48
|
+
|
49
|
+
## [v2.0.0.beta5](https://github.com/seuros/capistrano-sidekiq/tree/v2.0.0.beta5) (2020-06-25)
|
50
|
+
|
51
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v2.0.0.beta4...v2.0.0.beta5)
|
52
|
+
|
53
|
+
**Merged pull requests:**
|
54
|
+
|
55
|
+
- Minimal working Upstart plugin [\#255](https://github.com/seuros/capistrano-sidekiq/pull/255) ([duhast](https://github.com/duhast))
|
56
|
+
- Capistrano rbenv uses bundle instead of bundler [\#252](https://github.com/seuros/capistrano-sidekiq/pull/252) ([uxxman](https://github.com/uxxman))
|
57
|
+
|
58
|
+
## [v2.0.0.beta4](https://github.com/seuros/capistrano-sidekiq/tree/v2.0.0.beta4) (2020-06-08)
|
59
|
+
|
60
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v2.0.0.beta3...v2.0.0.beta4)
|
61
|
+
|
62
|
+
**Merged pull requests:**
|
63
|
+
|
64
|
+
- Fix undefined method as error [\#249](https://github.com/seuros/capistrano-sidekiq/pull/249) ([kyoshidajp](https://github.com/kyoshidajp))
|
65
|
+
|
66
|
+
## [v2.0.0.beta3](https://github.com/seuros/capistrano-sidekiq/tree/v2.0.0.beta3) (2020-05-26)
|
67
|
+
|
68
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v2.0.0.beta2...v2.0.0.beta3)
|
69
|
+
|
70
|
+
**Merged pull requests:**
|
71
|
+
|
72
|
+
- Append logs [\#247](https://github.com/seuros/capistrano-sidekiq/pull/247) ([Paprikas](https://github.com/Paprikas))
|
73
|
+
- Add "loginctl enable-linger" command to sidekiq systemd install task [\#246](https://github.com/seuros/capistrano-sidekiq/pull/246) ([Paprikas](https://github.com/Paprikas))
|
74
|
+
- Setup error output for systemd [\#245](https://github.com/seuros/capistrano-sidekiq/pull/245) ([Paprikas](https://github.com/Paprikas))
|
75
|
+
- Use StandardOutput for logging [\#244](https://github.com/seuros/capistrano-sidekiq/pull/244) ([Paprikas](https://github.com/Paprikas))
|
76
|
+
|
77
|
+
## [v2.0.0.beta2](https://github.com/seuros/capistrano-sidekiq/tree/v2.0.0.beta2) (2020-05-25)
|
78
|
+
|
79
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v2.0.0.beta1...v2.0.0.beta2)
|
80
|
+
|
81
|
+
**Merged pull requests:**
|
82
|
+
|
83
|
+
- Add sidekiq\_service\_unit\_env\_vars option to pass Environment variable… [\#243](https://github.com/seuros/capistrano-sidekiq/pull/243) ([Paprikas](https://github.com/Paprikas))
|
84
|
+
|
85
|
+
## [v2.0.0.beta1](https://github.com/seuros/capistrano-sidekiq/tree/v2.0.0.beta1) (2020-05-12)
|
86
|
+
|
87
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v1.0.3...v2.0.0.beta1)
|
88
|
+
|
89
|
+
**Merged pull requests:**
|
90
|
+
|
91
|
+
- Release 2.0.0 [\#236](https://github.com/seuros/capistrano-sidekiq/pull/236) ([seuros](https://github.com/seuros))
|
92
|
+
|
93
|
+
## [v1.0.3](https://github.com/seuros/capistrano-sidekiq/tree/v1.0.3) (2019-09-02)
|
94
|
+
|
95
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v1.0.2...v1.0.3)
|
96
|
+
|
97
|
+
**Merged pull requests:**
|
98
|
+
|
99
|
+
- Point readers towards enable lingering for systemd [\#230](https://github.com/seuros/capistrano-sidekiq/pull/230) ([creativetags](https://github.com/creativetags))
|
100
|
+
- Update README\#Multiple processes example [\#215](https://github.com/seuros/capistrano-sidekiq/pull/215) ([tamaloa](https://github.com/tamaloa))
|
101
|
+
- Add upstart support for start, stop, and quiet [\#208](https://github.com/seuros/capistrano-sidekiq/pull/208) ([tmiller](https://github.com/tmiller))
|
102
|
+
- Fix monit config file name missing application [\#205](https://github.com/seuros/capistrano-sidekiq/pull/205) ([xiewenwei](https://github.com/xiewenwei))
|
103
|
+
|
104
|
+
## [v1.0.2](https://github.com/seuros/capistrano-sidekiq/tree/v1.0.2) (2018-04-12)
|
105
|
+
|
106
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v1.0.1...v1.0.2)
|
107
|
+
|
108
|
+
## [v1.0.1](https://github.com/seuros/capistrano-sidekiq/tree/v1.0.1) (2018-04-04)
|
109
|
+
|
110
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v1.0.0...v1.0.1)
|
111
|
+
|
112
|
+
**Merged pull requests:**
|
113
|
+
|
114
|
+
- Fix accounting of pidfiles per process \(when using multiple processes\) [\#197](https://github.com/seuros/capistrano-sidekiq/pull/197) ([jsantos](https://github.com/jsantos))
|
115
|
+
- fix fail rolling restart task [\#196](https://github.com/seuros/capistrano-sidekiq/pull/196) ([idekeita](https://github.com/idekeita))
|
116
|
+
- README.md - simple edit, highlight known issue with cap 3 [\#192](https://github.com/seuros/capistrano-sidekiq/pull/192) ([westonplatter](https://github.com/westonplatter))
|
117
|
+
- Systemd integration [\#171](https://github.com/seuros/capistrano-sidekiq/pull/171) ([baierjan](https://github.com/baierjan))
|
118
|
+
- update README with instructions for prepending 'bundle exec' [\#143](https://github.com/seuros/capistrano-sidekiq/pull/143) ([mistidoi](https://github.com/mistidoi))
|
119
|
+
- Add deploy failure handling to cap v2 and v3. [\#135](https://github.com/seuros/capistrano-sidekiq/pull/135) ([phillbaker](https://github.com/phillbaker))
|
120
|
+
- Support custom monit filename [\#132](https://github.com/seuros/capistrano-sidekiq/pull/132) ([zocoi](https://github.com/zocoi))
|
121
|
+
|
122
|
+
## [v1.0.0](https://github.com/seuros/capistrano-sidekiq/tree/v1.0.0) (2018-01-24)
|
123
|
+
|
124
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v0.20.0...v1.0.0)
|
125
|
+
|
126
|
+
**Merged pull requests:**
|
127
|
+
|
128
|
+
- Spring Cleanup [\#190](https://github.com/seuros/capistrano-sidekiq/pull/190) ([Tensho](https://github.com/Tensho))
|
129
|
+
- Convert CHANGELOG to Markdown + Add Unreleased Section [\#189](https://github.com/seuros/capistrano-sidekiq/pull/189) ([Tensho](https://github.com/Tensho))
|
130
|
+
- Prepend \_ Before Service Name Index [\#184](https://github.com/seuros/capistrano-sidekiq/pull/184) ([Tensho](https://github.com/Tensho))
|
131
|
+
- Christmas Eve Cleaning 🎅 [\#183](https://github.com/seuros/capistrano-sidekiq/pull/183) ([Tensho](https://github.com/Tensho))
|
132
|
+
|
133
|
+
## [v0.20.0](https://github.com/seuros/capistrano-sidekiq/tree/v0.20.0) (2017-08-01)
|
134
|
+
|
135
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v0.10.0...v0.20.0)
|
136
|
+
|
137
|
+
**Merged pull requests:**
|
138
|
+
|
139
|
+
- Use new capistrano DSL for reenable tasks [\#177](https://github.com/seuros/capistrano-sidekiq/pull/177) ([Tensho](https://github.com/Tensho))
|
140
|
+
|
141
|
+
## [v0.10.0](https://github.com/seuros/capistrano-sidekiq/tree/v0.10.0) (2016-11-25)
|
142
|
+
|
143
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v0.5.4...v0.10.0)
|
144
|
+
|
145
|
+
**Merged pull requests:**
|
146
|
+
|
147
|
+
- add documentation; add note to ensure shared/tmp/pids folder exists i… [\#168](https://github.com/seuros/capistrano-sidekiq/pull/168) ([elliotwesoff](https://github.com/elliotwesoff))
|
148
|
+
- Make sidekiq:stop task perpetually callable [\#164](https://github.com/seuros/capistrano-sidekiq/pull/164) ([williamn](https://github.com/williamn))
|
149
|
+
- Add missing monit default config options to README [\#155](https://github.com/seuros/capistrano-sidekiq/pull/155) ([kirrmann](https://github.com/kirrmann))
|
150
|
+
- Documenting sidekiq\_service\_name config option [\#153](https://github.com/seuros/capistrano-sidekiq/pull/153) ([bendilley](https://github.com/bendilley))
|
151
|
+
- Fixes identation and Increase documentation with info about :sidekiq\_config [\#131](https://github.com/seuros/capistrano-sidekiq/pull/131) ([ricardokdz](https://github.com/ricardokdz))
|
152
|
+
- Respect both local and global puma\_user setting everywhere [\#122](https://github.com/seuros/capistrano-sidekiq/pull/122) ([jhollinger](https://github.com/jhollinger))
|
153
|
+
|
154
|
+
## [v0.5.4](https://github.com/seuros/capistrano-sidekiq/tree/v0.5.4) (2015-10-27)
|
155
|
+
|
156
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v0.5.3...v0.5.4)
|
157
|
+
|
158
|
+
**Merged pull requests:**
|
159
|
+
|
160
|
+
- Change pidfile handling, always add index to pidfile name [\#116](https://github.com/seuros/capistrano-sidekiq/pull/116) ([w1mvy](https://github.com/w1mvy))
|
161
|
+
- Move Contributors to separate file. [\#115](https://github.com/seuros/capistrano-sidekiq/pull/115) ([lpaulmp](https://github.com/lpaulmp))
|
162
|
+
- Monit configuration respects options\_per\_process [\#113](https://github.com/seuros/capistrano-sidekiq/pull/113) ([kazjote](https://github.com/kazjote))
|
163
|
+
- Capistrano 2 fixes [\#109](https://github.com/seuros/capistrano-sidekiq/pull/109) ([wingrunr21](https://github.com/wingrunr21))
|
164
|
+
- Use SSHKit command\_map [\#104](https://github.com/seuros/capistrano-sidekiq/pull/104) ([hbin](https://github.com/hbin))
|
165
|
+
- Add notice that the pty bug only applies to Capistrano 3. [\#101](https://github.com/seuros/capistrano-sidekiq/pull/101) ([nTraum](https://github.com/nTraum))
|
166
|
+
- Add support for different number of processes per host on monit.cap [\#100](https://github.com/seuros/capistrano-sidekiq/pull/100) ([okoriko](https://github.com/okoriko))
|
167
|
+
- intial support for sidekiq\_user [\#97](https://github.com/seuros/capistrano-sidekiq/pull/97) ([mcb](https://github.com/mcb))
|
168
|
+
|
169
|
+
## [v0.5.3](https://github.com/seuros/capistrano-sidekiq/tree/v0.5.3) (2015-06-25)
|
170
|
+
|
171
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v0.5.2...v0.5.3)
|
172
|
+
|
173
|
+
**Merged pull requests:**
|
174
|
+
|
175
|
+
- Refactored template\_sidekiq method [\#90](https://github.com/seuros/capistrano-sidekiq/pull/90) ([rstrobl](https://github.com/rstrobl))
|
176
|
+
- added ability to operate without sudo [\#89](https://github.com/seuros/capistrano-sidekiq/pull/89) ([dreyks](https://github.com/dreyks))
|
177
|
+
- Revert "Add nohup when executing start\_sidekiq command, for a problem… [\#88](https://github.com/seuros/capistrano-sidekiq/pull/88) ([seuros](https://github.com/seuros))
|
178
|
+
- Add nohup when executing start\_sidekiq command, for a problem with pty. [\#76](https://github.com/seuros/capistrano-sidekiq/pull/76) ([maruware](https://github.com/maruware))
|
179
|
+
- implemented ability to split sidekiq\_roles by count of sidekiq-processes [\#45](https://github.com/seuros/capistrano-sidekiq/pull/45) ([alexyakubenko](https://github.com/alexyakubenko))
|
180
|
+
|
181
|
+
## [v0.5.2](https://github.com/seuros/capistrano-sidekiq/tree/v0.5.2) (2015-03-20)
|
182
|
+
|
183
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v0.5.1...v0.5.2)
|
184
|
+
|
185
|
+
**Merged pull requests:**
|
186
|
+
|
187
|
+
- Set sidekiq\_concurrency default value for cap 2 \(improves pr \#72\). [\#74](https://github.com/seuros/capistrano-sidekiq/pull/74) ([derSascha](https://github.com/derSascha))
|
188
|
+
|
189
|
+
## [v0.5.1](https://github.com/seuros/capistrano-sidekiq/tree/v0.5.1) (2015-03-18)
|
190
|
+
|
191
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v0.5.0...v0.5.1)
|
192
|
+
|
193
|
+
**Merged pull requests:**
|
194
|
+
|
195
|
+
- Support sidekiq\_concurrency option for capistrano 2 [\#72](https://github.com/seuros/capistrano-sidekiq/pull/72) ([mrsimo](https://github.com/mrsimo))
|
196
|
+
|
197
|
+
## [v0.5.0](https://github.com/seuros/capistrano-sidekiq/tree/v0.5.0) (2015-03-18)
|
198
|
+
|
199
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v0.4.0...v0.5.0)
|
200
|
+
|
201
|
+
**Merged pull requests:**
|
202
|
+
|
203
|
+
- Options per process [\#70](https://github.com/seuros/capistrano-sidekiq/pull/70) ([mrsimo](https://github.com/mrsimo))
|
204
|
+
- Try execute on the monit.conf mv command [\#69](https://github.com/seuros/capistrano-sidekiq/pull/69) ([bencrouse](https://github.com/bencrouse))
|
205
|
+
- Update sidekiq.cap [\#68](https://github.com/seuros/capistrano-sidekiq/pull/68) ([raulbrito](https://github.com/raulbrito))
|
206
|
+
- bug fix for generator. [\#66](https://github.com/seuros/capistrano-sidekiq/pull/66) ([zshannon](https://github.com/zshannon))
|
207
|
+
- Fix Readme Issues [\#63](https://github.com/seuros/capistrano-sidekiq/pull/63) ([ChuckJHardy](https://github.com/ChuckJHardy))
|
208
|
+
- Set default option for sidekiq queue in capistrano 2 script [\#62](https://github.com/seuros/capistrano-sidekiq/pull/62) ([brain-geek](https://github.com/brain-geek))
|
209
|
+
- Update Cap2 Defaults to include config file [\#61](https://github.com/seuros/capistrano-sidekiq/pull/61) ([davidlesches](https://github.com/davidlesches))
|
210
|
+
- add customizing the monit templates for sidekiq [\#60](https://github.com/seuros/capistrano-sidekiq/pull/60) ([SammyLin](https://github.com/SammyLin))
|
211
|
+
- Add queues setup in capistrano2 task [\#57](https://github.com/seuros/capistrano-sidekiq/pull/57) ([brain-geek](https://github.com/brain-geek))
|
212
|
+
|
213
|
+
## [v0.4.0](https://github.com/seuros/capistrano-sidekiq/tree/v0.4.0) (2014-11-12)
|
214
|
+
|
215
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v0.3.8...v0.4.0)
|
216
|
+
|
217
|
+
**Merged pull requests:**
|
218
|
+
|
219
|
+
- Test is Sidekiq actually running when starting with Capistrano 2 [\#54](https://github.com/seuros/capistrano-sidekiq/pull/54) ([Envek](https://github.com/Envek))
|
220
|
+
- use release\_path instead of current\_path [\#50](https://github.com/seuros/capistrano-sidekiq/pull/50) ([flyerhzm](https://github.com/flyerhzm))
|
221
|
+
- Typo [\#48](https://github.com/seuros/capistrano-sidekiq/pull/48) ([binyamindavid](https://github.com/binyamindavid))
|
222
|
+
- Fix descriptions of monit tasks [\#47](https://github.com/seuros/capistrano-sidekiq/pull/47) ([jgeiger](https://github.com/jgeiger))
|
223
|
+
|
224
|
+
## [v0.3.8](https://github.com/seuros/capistrano-sidekiq/tree/v0.3.8) (2014-09-22)
|
225
|
+
|
226
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v0.3.7...v0.3.8)
|
227
|
+
|
228
|
+
**Merged pull requests:**
|
229
|
+
|
230
|
+
- Improve @bensie pull request + unmonitor monit while deploy [\#46](https://github.com/seuros/capistrano-sidekiq/pull/46) ([Saicheg](https://github.com/Saicheg))
|
231
|
+
|
232
|
+
## [v0.3.7](https://github.com/seuros/capistrano-sidekiq/tree/v0.3.7) (2014-09-01)
|
233
|
+
|
234
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v0.3.6...v0.3.7)
|
235
|
+
|
236
|
+
**Merged pull requests:**
|
237
|
+
|
238
|
+
- Start Sidekiq as daemon from Monit [\#40](https://github.com/seuros/capistrano-sidekiq/pull/40) ([dpaluy](https://github.com/dpaluy))
|
239
|
+
- Sidekiq is properly restarted after a crash when deploying with Capsitrano2 [\#39](https://github.com/seuros/capistrano-sidekiq/pull/39) ([tribble](https://github.com/tribble))
|
240
|
+
|
241
|
+
## [v0.3.6](https://github.com/seuros/capistrano-sidekiq/tree/v0.3.6) (2014-08-08)
|
242
|
+
|
243
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v0.3.5...v0.3.6)
|
244
|
+
|
245
|
+
**Merged pull requests:**
|
246
|
+
|
247
|
+
- If :sidekiq\_config is set, Monit template should use it to start the ser... [\#35](https://github.com/seuros/capistrano-sidekiq/pull/35) ([joshmyers](https://github.com/joshmyers))
|
248
|
+
- replace deploy:restart with deploy:publishing for capistrano 3.1 [\#34](https://github.com/seuros/capistrano-sidekiq/pull/34) ([flyerhzm](https://github.com/flyerhzm))
|
249
|
+
- Fix: test with spaces ignores within [\#33](https://github.com/seuros/capistrano-sidekiq/pull/33) ([rogercampos](https://github.com/rogercampos))
|
250
|
+
- Added \_cset for :sidekiq\_tag [\#32](https://github.com/seuros/capistrano-sidekiq/pull/32) ([OscarBarrett](https://github.com/OscarBarrett))
|
251
|
+
|
252
|
+
## [v0.3.5](https://github.com/seuros/capistrano-sidekiq/tree/v0.3.5) (2014-07-25)
|
253
|
+
|
254
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v0.3.4...v0.3.5)
|
255
|
+
|
256
|
+
**Merged pull requests:**
|
257
|
+
|
258
|
+
- Allow use of sidekiq\_tag for capistrano2 [\#30](https://github.com/seuros/capistrano-sidekiq/pull/30) ([OscarBarrett](https://github.com/OscarBarrett))
|
259
|
+
|
260
|
+
## [v0.3.4](https://github.com/seuros/capistrano-sidekiq/tree/v0.3.4) (2014-07-09)
|
261
|
+
|
262
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/v0.1.0...v0.3.4)
|
263
|
+
|
264
|
+
**Merged pull requests:**
|
265
|
+
|
266
|
+
- Added concurrency option [\#26](https://github.com/seuros/capistrano-sidekiq/pull/26) ([ungsophy](https://github.com/ungsophy))
|
267
|
+
- Fix bug with process index in monit task [\#21](https://github.com/seuros/capistrano-sidekiq/pull/21) ([0x616E676572](https://github.com/0x616E676572))
|
268
|
+
- You can now use signals to quiet/stop sidekiq, much faster. [\#18](https://github.com/seuros/capistrano-sidekiq/pull/18) ([penso](https://github.com/penso))
|
269
|
+
- Check that current\_path exists before stopping [\#16](https://github.com/seuros/capistrano-sidekiq/pull/16) ([alexdunae](https://github.com/alexdunae))
|
270
|
+
- search pid files in correct directory [\#12](https://github.com/seuros/capistrano-sidekiq/pull/12) ([levinalex](https://github.com/levinalex))
|
271
|
+
- Rolling restart [\#7](https://github.com/seuros/capistrano-sidekiq/pull/7) ([jlecour](https://github.com/jlecour))
|
272
|
+
|
273
|
+
## [v0.1.0](https://github.com/seuros/capistrano-sidekiq/tree/v0.1.0) (2014-03-24)
|
274
|
+
|
275
|
+
[Full Changelog](https://github.com/seuros/capistrano-sidekiq/compare/07b9d97f5bcf08af43baec0924bb088a6486f31c...v0.1.0)
|
276
|
+
|
277
|
+
**Merged pull requests:**
|
278
|
+
|
279
|
+
- Cleaner version checking [\#6](https://github.com/seuros/capistrano-sidekiq/pull/6) ([ghost](https://github.com/ghost))
|
280
|
+
- More robust version checking [\#4](https://github.com/seuros/capistrano-sidekiq/pull/4) ([jlecour](https://github.com/jlecour))
|
281
|
+
- More explicit start command [\#3](https://github.com/seuros/capistrano-sidekiq/pull/3) ([jlecour](https://github.com/jlecour))
|
282
|
+
- Improve pid and log files settings [\#1](https://github.com/seuros/capistrano-sidekiq/pull/1) ([jlecour](https://github.com/jlecour))
|
283
|
+
|
284
|
+
|
285
|
+
|
286
|
+
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
|
data/Gemfile
CHANGED
data/README.md
CHANGED
@@ -1,5 +1,4 @@
|
|
1
1
|
[](http://badge.fury.io/rb/capistrano-sidekiq)
|
2
|
-
[](https://gemnasium.com/seuros/capistrano-sidekiq)
|
3
2
|
|
4
3
|
# Capistrano::Sidekiq
|
5
4
|
|
@@ -7,12 +6,6 @@ Sidekiq integration for Capistrano
|
|
7
6
|
|
8
7
|
## Installation
|
9
8
|
|
10
|
-
Add this line to your application's Gemfile:
|
11
|
-
|
12
|
-
gem 'capistrano-sidekiq', github: 'seuros/capistrano-sidekiq'
|
13
|
-
|
14
|
-
or:
|
15
|
-
|
16
9
|
gem 'capistrano-sidekiq', group: :development
|
17
10
|
|
18
11
|
And then execute:
|
@@ -22,69 +15,65 @@ And then execute:
|
|
22
15
|
|
23
16
|
## Usage
|
24
17
|
```ruby
|
25
|
-
# Capfile
|
26
|
-
|
27
|
-
require 'capistrano/sidekiq
|
18
|
+
# Capfile
|
19
|
+
|
20
|
+
require 'capistrano/sidekiq'
|
21
|
+
install_plugin Capistrano::Sidekiq # Default sidekiq tasks
|
22
|
+
# Then select your service manager
|
23
|
+
install_plugin Capistrano::Sidekiq::Systemd
|
24
|
+
# or
|
25
|
+
install_plugin Capistrano::Sidekiq::Monit # tests needed
|
28
26
|
```
|
29
27
|
|
30
28
|
|
31
|
-
Configurable options
|
29
|
+
Configurable options - Please ensure you check your version's branch for the available settings - shown here with defaults:
|
32
30
|
|
33
31
|
```ruby
|
32
|
+
:sidekiq_roles => :app
|
34
33
|
:sidekiq_default_hooks => true
|
35
34
|
:sidekiq_pid => File.join(shared_path, 'tmp', 'pids', 'sidekiq.pid') # ensure this path exists in production before deploying.
|
36
35
|
:sidekiq_env => fetch(:rack_env, fetch(:rails_env, fetch(:stage)))
|
37
36
|
:sidekiq_log => File.join(shared_path, 'log', 'sidekiq.log')
|
38
|
-
|
39
|
-
:
|
40
|
-
|
41
|
-
:sidekiq_config =>
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
:
|
46
|
-
:
|
47
|
-
:
|
37
|
+
# single config
|
38
|
+
:sidekiq_config => 'config/sidekiq.yml'
|
39
|
+
# per process config - process 1, process 2,... etc.
|
40
|
+
:sidekiq_config => [
|
41
|
+
'config/sidekiq_config1.yml',
|
42
|
+
'config/sidekiq_config2.yml'
|
43
|
+
]
|
44
|
+
:sidekiq_concurrency => 25
|
45
|
+
:sidekiq_queue => %w(default high low)
|
46
|
+
:sidekiq_processes => 1 # number of systemd processes you want to start
|
47
|
+
|
48
|
+
# sidekiq systemd options
|
49
|
+
:sidekiq_service_templates_path => 'config/deploy/templates' # to be used if a custom template is needed (filaname should be #{fetch(:sidekiq_service_unit_name)}.service.capistrano.erb or sidekiq.service.capistrano.erb
|
50
|
+
:sidekiq_service_unit_name => 'sidekiq'
|
51
|
+
:sidekiq_service_unit_user => :user # :system
|
52
|
+
:sidekiq_enable_lingering => true
|
53
|
+
:sidekiq_lingering_user => nil
|
54
|
+
|
55
|
+
# sidekiq monit
|
48
56
|
:sidekiq_monit_templates_path => 'config/deploy/templates'
|
49
57
|
:sidekiq_monit_conf_dir => '/etc/monit/conf.d'
|
50
58
|
:sidekiq_monit_use_sudo => true
|
51
59
|
:monit_bin => '/usr/bin/monit'
|
52
60
|
:sidekiq_monit_default_hooks => true
|
53
|
-
:
|
54
|
-
:
|
55
|
-
:sidekiqctl_cmd => "#{fetch(:bundle_cmd, "bundle")} exec sidekiqctl" # Only for capistrano2.5
|
56
|
-
:sidekiq_user => nil #user to run sidekiq as
|
57
|
-
```
|
61
|
+
:sidekiq_monit_group => nil
|
62
|
+
:sidekiq_service_name => "sidekiq_#{fetch(:application)}"
|
58
63
|
|
59
|
-
|
60
|
-
```ruby
|
61
|
-
set :pty, false
|
64
|
+
:sidekiq_user => nil #user to run sidekiq as
|
62
65
|
```
|
66
|
+
See `capistrano/sidekiq/helpers.rb` for other undocumented configuration settings.
|
63
67
|
|
64
|
-
##
|
65
|
-
|
66
|
-
You can configure sidekiq to start with multiple processes. Just set the proper amount in `sidekiq_processes`.
|
67
|
-
|
68
|
-
You can also customize the configuration for every process. If you want to do that, just set
|
69
|
-
`sidekiq_options_per_process` with an array of the configuration options that you want in string format.
|
70
|
-
This example should boot the first process with the queue `high` and the second one with the queues `default`
|
71
|
-
and `low`:
|
68
|
+
## Bundler
|
72
69
|
|
70
|
+
If you'd like to prepend `bundle exec` to your sidekiq and sidekiqctl calls, modify the SSHKit command maps
|
71
|
+
in your deploy.rb file:
|
73
72
|
```ruby
|
74
|
-
|
73
|
+
SSHKit.config.command_map[:sidekiq] = "bundle exec sidekiq"
|
74
|
+
SSHKit.config.command_map[:sidekiqctl] = "bundle exec sidekiqctl"
|
75
75
|
```
|
76
76
|
|
77
|
-
## Different number of processes per host
|
78
|
-
|
79
|
-
You can configure how many processes you want to run on each host next way:
|
80
|
-
|
81
|
-
```ruby
|
82
|
-
set :sidekiq_role, [:sidekiq_small, :sidekiq_big]
|
83
|
-
set :sidekiq_small_processes, 1
|
84
|
-
set :sidekiq_big_processes, 4
|
85
|
-
server 'example-small.com', roles: [:sidekiq_small]
|
86
|
-
server 'example-big.com', roles: [:sidekiq_big]
|
87
|
-
```
|
88
77
|
|
89
78
|
## Customizing the monit sidekiq templates
|
90
79
|
|
@@ -100,6 +89,14 @@ If your deploy user has no need in `sudo` for using monit, you can disable it as
|
|
100
89
|
set :sidekiq_monit_use_sudo, false
|
101
90
|
```
|
102
91
|
|
92
|
+
## Configuring the log files on systems with less recent Systemd versions
|
93
|
+
|
94
|
+
The template used by this project assumes a recent version of Systemd (v240+, e.g. Ubuntu 20.04).
|
95
|
+
|
96
|
+
On systems with a less recent version, the `append:` functionality is not supported, and the Sidekiq log messages are sent to the syslog.
|
97
|
+
|
98
|
+
It's possible to workaround this limitation by configuring the system logger to filter the Sidekiq messages; see [wiki](/../../wiki/Configuring-append-mode-log-files-via-Syslog-NG).
|
99
|
+
|
103
100
|
## Contributing
|
104
101
|
|
105
102
|
1. Fork it
|
data/Rakefile
CHANGED
@@ -1 +1,9 @@
|
|
1
1
|
require "bundler/gem_tasks"
|
2
|
+
require 'github_changelog_generator/task'
|
3
|
+
|
4
|
+
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
|
5
|
+
config.user = 'seuros'
|
6
|
+
config.project = 'capistrano-sidekiq'
|
7
|
+
config.issues = false
|
8
|
+
config.future_release = '2.3.0'
|
9
|
+
end
|
data/capistrano-sidekiq.gemspec
CHANGED
@@ -1,11 +1,10 @@
|
|
1
|
-
# coding: utf-8
|
2
1
|
lib = File.expand_path('../lib', __FILE__)
|
3
2
|
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
4
3
|
require 'capistrano/sidekiq/version'
|
5
4
|
|
6
5
|
Gem::Specification.new do |spec|
|
7
6
|
spec.name = 'capistrano-sidekiq'
|
8
|
-
spec.version = Capistrano::
|
7
|
+
spec.version = Capistrano::SidekiqVERSION
|
9
8
|
spec.authors = ['Abdelkader Boudih']
|
10
9
|
spec.email = ['terminale@gmail.com']
|
11
10
|
spec.summary = %q{Sidekiq integration for Capistrano}
|
@@ -18,5 +17,6 @@ Gem::Specification.new do |spec|
|
|
18
17
|
spec.require_paths = ['lib']
|
19
18
|
|
20
19
|
spec.add_dependency 'capistrano', '>= 3.9.0'
|
21
|
-
spec.add_dependency '
|
20
|
+
spec.add_dependency 'capistrano-bundler'
|
21
|
+
spec.add_dependency 'sidekiq', '>= 6.0'
|
22
22
|
end
|
@@ -0,0 +1,53 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Capistrano
|
4
|
+
module Sidekiq::Helpers
|
5
|
+
|
6
|
+
def sidekiq_require
|
7
|
+
"--require #{fetch(:sidekiq_require)}" if fetch(:sidekiq_require)
|
8
|
+
end
|
9
|
+
|
10
|
+
def sidekiq_config
|
11
|
+
"--config #{fetch(:sidekiq_config)}" if fetch(:sidekiq_config)
|
12
|
+
end
|
13
|
+
|
14
|
+
def sidekiq_concurrency
|
15
|
+
"--concurrency #{fetch(:sidekiq_concurrency)}" if fetch(:sidekiq_concurrency)
|
16
|
+
end
|
17
|
+
|
18
|
+
def sidekiq_queues
|
19
|
+
Array(fetch(:sidekiq_queue)).map do |queue|
|
20
|
+
"--queue #{queue}"
|
21
|
+
end.join(' ')
|
22
|
+
end
|
23
|
+
|
24
|
+
def sidekiq_logfile
|
25
|
+
fetch(:sidekiq_log)
|
26
|
+
end
|
27
|
+
|
28
|
+
def switch_user(role, &block)
|
29
|
+
su_user = sidekiq_user(role)
|
30
|
+
if su_user == role.user
|
31
|
+
yield
|
32
|
+
else
|
33
|
+
as su_user, &block
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
def sidekiq_user(role = nil)
|
38
|
+
if role.nil?
|
39
|
+
fetch(:sidekiq_user)
|
40
|
+
else
|
41
|
+
properties = role.properties
|
42
|
+
properties.fetch(:sidekiq_user) || # local property for sidekiq only
|
43
|
+
fetch(:sidekiq_user) ||
|
44
|
+
properties.fetch(:run_as) || # global property across multiple capistrano gems
|
45
|
+
role.user
|
46
|
+
end
|
47
|
+
end
|
48
|
+
|
49
|
+
def expanded_bundle_path
|
50
|
+
backend.capture(:echo, SSHKit.config.command_map[:bundle]).strip
|
51
|
+
end
|
52
|
+
end
|
53
|
+
end
|
@@ -1,2 +1,21 @@
|
|
1
|
-
#
|
2
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Capistrano
|
4
|
+
class Sidekiq::Monit < Capistrano::Plugin
|
5
|
+
include Sidekiq::Helpers
|
6
|
+
|
7
|
+
def set_defaults
|
8
|
+
set_if_empty :monit_bin, '/usr/bin/monit'
|
9
|
+
set_if_empty :sidekiq_monit_conf_dir, '/etc/monit/conf.d'
|
10
|
+
set_if_empty :sidekiq_monit_conf_file, -> { "#{sidekiq_service_name}.conf" }
|
11
|
+
set_if_empty :sidekiq_monit_use_sudo, true
|
12
|
+
set_if_empty :sidekiq_monit_default_hooks, true
|
13
|
+
set_if_empty :sidekiq_monit_templates_path, 'config/deploy/templates'
|
14
|
+
set_if_empty :sidekiq_monit_group, nil
|
15
|
+
end
|
16
|
+
|
17
|
+
def define_tasks
|
18
|
+
eval_rakefile File.expand_path('../tasks/monit.rake', __dir__)
|
19
|
+
end
|
20
|
+
end
|
21
|
+
end
|
@@ -0,0 +1,19 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Capistrano
|
4
|
+
class Sidekiq::Systemd < Capistrano::Plugin
|
5
|
+
include Sidekiq::Helpers
|
6
|
+
|
7
|
+
def set_defaults
|
8
|
+
set_if_empty :sidekiq_service_unit_name, 'sidekiq' # This will change in version 3.0.0 to {application}_sidekiq_{stage}
|
9
|
+
set_if_empty :sidekiq_service_unit_user, :user # :system
|
10
|
+
set_if_empty :sidekiq_enable_lingering, true
|
11
|
+
set_if_empty :sidekiq_lingering_user, nil
|
12
|
+
set_if_empty :sidekiq_service_templates_path, 'config/deploy/templates'
|
13
|
+
end
|
14
|
+
|
15
|
+
def define_tasks
|
16
|
+
eval_rakefile File.expand_path('../tasks/systemd.rake', __dir__)
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
data/lib/capistrano/sidekiq.rb
CHANGED
@@ -1,5 +1,31 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require 'capistrano/bundler'
|
4
|
+
require 'capistrano/plugin'
|
5
|
+
|
6
|
+
module Capistrano
|
7
|
+
class Sidekiq < Capistrano::Plugin
|
8
|
+
def define_tasks
|
9
|
+
eval_rakefile File.expand_path('tasks/sidekiq.rake', __dir__)
|
10
|
+
end
|
11
|
+
|
12
|
+
def set_defaults
|
13
|
+
set_if_empty :sidekiq_default_hooks, true
|
14
|
+
|
15
|
+
set_if_empty :sidekiq_env, -> { fetch(:rack_env, fetch(:rails_env, fetch(:rake_env, fetch(:stage)))) }
|
16
|
+
set_if_empty :sidekiq_roles, fetch(:sidekiq_role, :app)
|
17
|
+
set_if_empty :sidekiq_log, -> { File.join(shared_path, 'log', 'sidekiq.log') }
|
18
|
+
set_if_empty :sidekiq_error_log, -> { File.join(shared_path, 'log', 'sidekiq.error.log') }
|
19
|
+
# Rbenv, Chruby, and RVM integration
|
20
|
+
append :rbenv_map_bins, 'sidekiq', 'sidekiqctl'
|
21
|
+
append :rvm_map_bins, 'sidekiq', 'sidekiqctl'
|
22
|
+
append :chruby_map_bins, 'sidekiq', 'sidekiqctl'
|
23
|
+
# Bundler integration
|
24
|
+
append :bundle_bins, 'sidekiq', 'sidekiqctl'
|
25
|
+
end
|
26
|
+
end
|
5
27
|
end
|
28
|
+
|
29
|
+
require_relative 'sidekiq/helpers'
|
30
|
+
require_relative 'sidekiq/systemd'
|
31
|
+
require_relative 'sidekiq/monit'
|