onering-client 0.0.86 → 0.0.87
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.
- data/lib/onering/api.rb +16 -12
- data/lib/onering/cli/devices.rb +6 -6
- data/lib/onering/cli/reporter.rb +1 -1
- data/lib/onering/logger.rb +6 -2
- data/lib/onering/plugins/reporter.rb +1 -1
- data/lib/onering.rb +1 -1
- metadata +1 -1
data/lib/onering/api.rb
CHANGED
@@ -123,17 +123,21 @@ module Onering
|
|
123
123
|
Onering::Logger.debug("+#{name}: #{value}", "Onering::API")
|
124
124
|
end
|
125
125
|
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
126
|
+
begin
|
127
|
+
case (method.to_sym rescue method)
|
128
|
+
when :post
|
129
|
+
rv = Onering::API.post(endpoint, options)
|
130
|
+
when :put
|
131
|
+
rv = Onering::API.put(endpoint, options)
|
132
|
+
when :delete
|
133
|
+
rv = Onering::API.delete(endpoint, options)
|
134
|
+
when :head
|
135
|
+
rv = Onering::API.head(endpoint, options)
|
136
|
+
else
|
137
|
+
rv = Onering::API.get(endpoint, options)
|
138
|
+
end
|
139
|
+
rescue SocketError => e
|
140
|
+
Onering::Logger.fatal!("Unable to connect to #{Onering::API.base_uri}", "Onering::API")
|
137
141
|
end
|
138
142
|
|
139
143
|
if rv.code >= 500
|
@@ -286,7 +290,7 @@ module Onering
|
|
286
290
|
raise Actions::Retry.new
|
287
291
|
else
|
288
292
|
# all errors are fatal at this stage
|
289
|
-
Onering::Logger.fatal("Cannot autoregister client: HTTP #{response.code} - #{(response.parsed_response || {}).get('error.message', 'Unknown error')}", "Onering::API")
|
293
|
+
Onering::Logger.fatal!("Cannot autoregister client: HTTP #{response.code} - #{(response.parsed_response || {}).get('error.message', 'Unknown error')}", "Onering::API")
|
290
294
|
end
|
291
295
|
end
|
292
296
|
|
data/lib/onering/cli/devices.rb
CHANGED
@@ -27,7 +27,7 @@ EOS
|
|
27
27
|
|
28
28
|
# -----------------------------------------------------------------------------
|
29
29
|
when :get
|
30
|
-
Onering::Logger.fatal("Expected 1 parameter, got #{args.length}") unless args.length == 1
|
30
|
+
Onering::Logger.fatal!("Expected 1 parameter, got #{args.length}", "Onering::CLI::Devices") unless args.length == 1
|
31
31
|
|
32
32
|
if @opts[:query_given]
|
33
33
|
# doing this until a bulk field query endpoint is built
|
@@ -42,7 +42,7 @@ EOS
|
|
42
42
|
|
43
43
|
# -----------------------------------------------------------------------------
|
44
44
|
when :set
|
45
|
-
Onering::Logger.fatal("Expected 2 parameters, got #{args.length}") unless args.length == 2
|
45
|
+
Onering::Logger.fatal!("Expected 2 parameters, got #{args.length}", "Onering::CLI::Devices") unless args.length == 2
|
46
46
|
|
47
47
|
if @opts[:query]
|
48
48
|
# doing this until a bulk field set endpoint is built
|
@@ -57,14 +57,14 @@ EOS
|
|
57
57
|
|
58
58
|
# -----------------------------------------------------------------------------
|
59
59
|
when :list
|
60
|
-
Onering::Logger.fatal("Expected 1 parameter, got #{args.length}") unless args.length >= 1
|
60
|
+
Onering::Logger.fatal!("Expected 1 parameter, got #{args.length}", "Onering::CLI::Devices") unless args.length >= 1
|
61
61
|
return @api.list(args[0], {
|
62
62
|
:filter => [@opts[:query], args[1]].compact.join('/')
|
63
63
|
}.compact)
|
64
64
|
|
65
65
|
# -----------------------------------------------------------------------------
|
66
66
|
when :find
|
67
|
-
Onering::Logger.fatal("Expected 1 parameter, got #{args.length}") unless args.length == 1
|
67
|
+
Onering::Logger.fatal!("Expected 1 parameter, got #{args.length}", "Onering::CLI::Devices") unless args.length == 1
|
68
68
|
return @api.find(args[0])
|
69
69
|
|
70
70
|
# -----------------------------------------------------------------------------
|
@@ -79,13 +79,13 @@ EOS
|
|
79
79
|
File.read(args[1])
|
80
80
|
|
81
81
|
else
|
82
|
-
Onering::Logger.fatal("Cannot save data, no input data specified")
|
82
|
+
Onering::Logger.fatal!("Cannot save data, no input data specified", "Onering::CLI::Devices")
|
83
83
|
end
|
84
84
|
end
|
85
85
|
|
86
86
|
rv.parsed_response
|
87
87
|
else
|
88
|
-
Onering::Logger.fatal("Unknown subcommand #{sc.inspect}")
|
88
|
+
Onering::Logger.fatal!("Unknown subcommand #{sc.inspect}", "Onering::CLI::Devices")
|
89
89
|
end
|
90
90
|
end
|
91
91
|
end
|
data/lib/onering/cli/reporter.rb
CHANGED
data/lib/onering/logger.rb
CHANGED
@@ -68,9 +68,13 @@ module Onering
|
|
68
68
|
return false
|
69
69
|
end
|
70
70
|
|
71
|
-
def self.fatal(message, source=nil)
|
71
|
+
def self.fatal(message, source=nil, raise_error=false)
|
72
72
|
self.log(:fatal, message, source)
|
73
|
-
raise Onering::Client::FatalError.new(message)
|
73
|
+
raise Onering::Client::FatalError.new(message) if raise_error === true
|
74
|
+
end
|
75
|
+
|
76
|
+
def self.fatal!(message, source=nil)
|
77
|
+
self.fatal(message, source, true)
|
74
78
|
end
|
75
79
|
|
76
80
|
def self.error(message, source=nil)
|
@@ -131,7 +131,7 @@ module Onering
|
|
131
131
|
return @_report.stringify_keys()
|
132
132
|
end
|
133
133
|
else
|
134
|
-
Onering::Logger.fatal("Cannot generate report without a hardware ID", "Onering::Reporter")
|
134
|
+
Onering::Logger.fatal!("Cannot generate report without a hardware ID", "Onering::Reporter")
|
135
135
|
end
|
136
136
|
|
137
137
|
{}
|
data/lib/onering.rb
CHANGED