opswalrus 1.0.90 → 1.0.92
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/lib/opswalrus/app.rb +1 -5
- data/lib/opswalrus/errors.rb +3 -0
- data/lib/opswalrus/invocation.rb +5 -1
- data/lib/opswalrus/operation_runner.rb +3 -3
- data/lib/opswalrus/ops_file_script_dsl.rb +13 -4
- data/lib/opswalrus/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 12092a91a60682fa8bf763b91fcc872428f770204623883e5e4ede606facaec9
|
4
|
+
data.tar.gz: 0c6eab4a21a4dcaa665cae384e45ad5dbdf49be909bcd026838ea67017c006d5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b96e1b0f743884e7e57830716d36e207d00cc9864391a5df41c8cde0eaf22dc53e9f43a7733401c1cf60f2405aac527e0569e1da8355e1b6b30e81659bd8a0e8
|
7
|
+
data.tar.gz: 8b219159bdf7cffb9b8fe7e3f75ad5d07c727647370b4a0d16285505eb376373636b8de09ad3e86da651d77ae4b2ac17a70c91affd75352c6356bb0aec085194
|
data/Gemfile.lock
CHANGED
data/lib/opswalrus/app.rb
CHANGED
@@ -320,11 +320,7 @@ module OpsWalrus
|
|
320
320
|
when Invocation::Success
|
321
321
|
result.value
|
322
322
|
when Invocation::Error
|
323
|
-
|
324
|
-
error_type: result.value.class,
|
325
|
-
error: result.value,
|
326
|
-
backtrace: result.value.backtrace.take(10).join("\n")
|
327
|
-
}
|
323
|
+
result.serialize_error
|
328
324
|
end
|
329
325
|
io.puts JSON.pretty_generate(obj)
|
330
326
|
io.string
|
data/lib/opswalrus/errors.rb
CHANGED
data/lib/opswalrus/invocation.rb
CHANGED
@@ -215,7 +215,11 @@ module OpsWalrus
|
|
215
215
|
retval = JSON.parse(json_string)
|
216
216
|
case retval
|
217
217
|
when Hash
|
218
|
-
retval
|
218
|
+
if retval["type"] == 'Invocation::Error'
|
219
|
+
raise InvocationError.new("#{retval["error_type"]}: #{retval["error"]}#{retval["backtrace"] && "\n Backtrace: #{retval['backtrace']}"}")
|
220
|
+
else
|
221
|
+
retval.with_indifferent_access.easynav
|
222
|
+
end
|
219
223
|
when Array
|
220
224
|
retval.easynav
|
221
225
|
else
|
@@ -86,17 +86,17 @@ module OpsWalrus
|
|
86
86
|
Invocation::Success.new(ruby_script_return)
|
87
87
|
end
|
88
88
|
rescue SSHKit::Command::Failed => e
|
89
|
-
App.instance.error "
|
89
|
+
App.instance.error "Runtime error, command failed: #{e.message}"
|
90
90
|
Invocation::Error.new(e)
|
91
91
|
rescue Error => e
|
92
92
|
# puts "OperationRunner#run - #{Time.now.strftime('%s%L')}"
|
93
|
-
App.instance.error "
|
93
|
+
App.instance.error "Runtime error: Ops script crashed."
|
94
94
|
App.instance.error e.message
|
95
95
|
App.instance.error e.backtrace.take(10).join("\n")
|
96
96
|
Invocation::Error.new(e)
|
97
97
|
rescue => e
|
98
98
|
# puts "OperationRunner#run - #{Time.now.strftime('%s%L')}"
|
99
|
-
App.instance.error "Unhandled
|
99
|
+
App.instance.error "Unhandled runtime error: Ops script crashed."
|
100
100
|
App.instance.error e.class
|
101
101
|
App.instance.error e.message
|
102
102
|
App.instance.error e.backtrace.take(10).join("\n")
|
@@ -40,6 +40,14 @@ module OpsWalrus
|
|
40
40
|
def initialize(value, exit_status = 1)
|
41
41
|
super(value, exit_status == 0 ? 1 : exit_status)
|
42
42
|
end
|
43
|
+
def serialize_error
|
44
|
+
{
|
45
|
+
type: "Invocation::Error",
|
46
|
+
error_type: value.class.name,
|
47
|
+
error: value,
|
48
|
+
backtrace: value.is_a?(Exception) ? value.backtrace.take(10).join("\n") : nil,
|
49
|
+
}
|
50
|
+
end
|
43
51
|
def failure?
|
44
52
|
true
|
45
53
|
end
|
@@ -170,10 +178,11 @@ module OpsWalrus
|
|
170
178
|
App.instance.error "[!] The host '#{host}' doesn't accept password authentication method."
|
171
179
|
rescue Errno::EHOSTUNREACH => e
|
172
180
|
App.instance.error "[!] The host '#{host}' is unreachable"
|
173
|
-
rescue => e
|
174
|
-
|
175
|
-
|
176
|
-
|
181
|
+
# rescue => e
|
182
|
+
# App.instance.error "[!] Command failed:"
|
183
|
+
# App.instance.error e.class
|
184
|
+
# App.instance.error e.message
|
185
|
+
# App.instance.error e.backtrace.join("\n")
|
177
186
|
ensure
|
178
187
|
host.clear_ssh_session
|
179
188
|
end
|
data/lib/opswalrus/version.rb
CHANGED