capistrano-chef-eye 0.2.4 → 0.2.5
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 +4 -4
- data/README.md +1 -1
- data/lib/capistrano/chef_eye/version.rb +1 -1
- data/lib/capistrano/tasks/chef_eye.cap +4 -6
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 09399b4b18bc674d3eb2d1e43861e394224524b6
|
|
4
|
+
data.tar.gz: a51f681b65d86d7f1fc8c32a15daabaa1ec9a54a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 96d1234211601477f79bfb9a395d1b934fab5b4f035982c7ab7451eb2d2eeac0176e56e225a50e4114f053df7110cc61bd720068466cfea153800a343383b906
|
|
7
|
+
data.tar.gz: 897df5dedd4c684961218fcd45c4c4feac3957d0c15e61c3e9bafa3be40c905959a79f397fc6e65789e2457ade4e8b02e70f8a8cd27975be663a201341e37a47
|
data/README.md
CHANGED
|
@@ -41,7 +41,7 @@ set :eye_application, -> { fetch(:application) } # eye application name. Used fo
|
|
|
41
41
|
set :eye_roles, :all
|
|
42
42
|
set :eye_servers, -> { release_roles(fetch(:eye_roles)) } # Servers with eye. Fetched by eye_roles
|
|
43
43
|
set :eye_processes, nil # List of eye processes. Library try to detect processes automatically, if nil
|
|
44
|
-
set :
|
|
44
|
+
set :eye_restart_timeout, 15 # Timeout between force restart commands, sec
|
|
45
45
|
set :eye_file, -> { # Path to eye application config
|
|
46
46
|
if fetch(:eye_strategy).to_s == 'local'
|
|
47
47
|
'Eyefile'
|
|
@@ -8,7 +8,7 @@ namespace :eye do
|
|
|
8
8
|
output = SSHKit.config.output
|
|
9
9
|
SSHKit.config.format = :dot
|
|
10
10
|
processes ||= begin
|
|
11
|
-
r = eye_execute('info')
|
|
11
|
+
r = eye_execute('info', '', true)
|
|
12
12
|
r.map! do |info|
|
|
13
13
|
info.split("\n").map! do |i|
|
|
14
14
|
Array(i.match(/^\s\s(\S+)/))[1]
|
|
@@ -88,8 +88,7 @@ namespace :load do
|
|
|
88
88
|
set :eye_roles, :all
|
|
89
89
|
set :eye_servers, -> { release_roles(fetch(:eye_roles)) }
|
|
90
90
|
set :eye_processes, nil
|
|
91
|
-
set :
|
|
92
|
-
set :eye_restart_timeout, 10
|
|
91
|
+
set :eye_restart_timeout, 15
|
|
93
92
|
set :eye_file, -> {
|
|
94
93
|
if fetch(:eye_strategy).to_s == 'local'
|
|
95
94
|
'Eyefile'
|
|
@@ -115,7 +114,7 @@ namespace :load do
|
|
|
115
114
|
end
|
|
116
115
|
end
|
|
117
116
|
|
|
118
|
-
def eye_execute(command, mask='')
|
|
117
|
+
def eye_execute(command, mask='', parallel_force=false)
|
|
119
118
|
res = []
|
|
120
119
|
commands = []
|
|
121
120
|
|
|
@@ -131,8 +130,7 @@ def eye_execute(command, mask='')
|
|
|
131
130
|
timeout = 2
|
|
132
131
|
commands << command
|
|
133
132
|
end
|
|
134
|
-
strategy = EYE_SEQUENCE_COMMANDS.include?(command.to_s) ? :sequence : :parallel
|
|
135
|
-
|
|
133
|
+
strategy = EYE_SEQUENCE_COMMANDS.include?(command.to_s) && !parallel_force ? :sequence : :parallel
|
|
136
134
|
on fetch(:eye_servers), in: strategy, wait: timeout do
|
|
137
135
|
begin
|
|
138
136
|
within fetch(:eye_home) do
|