onering-client 0.0.86 → 0.0.87

data/lib/onering/api.rb

@@ -123,17 +123,21 @@ module Onering
         Onering::Logger.debug("+#{name}: #{value}", "Onering::API")
       end
 
-      case (method.to_sym rescue method)
-      when :post
-        rv = Onering::API.post(endpoint, options)
-      when :put
-        rv = Onering::API.put(endpoint, options)
-      when :delete
-        rv = Onering::API.delete(endpoint, options)
-      when :head
-        rv = Onering::API.head(endpoint, options)
-      else
-        rv = Onering::API.get(endpoint, options)
+      begin
+        case (method.to_sym rescue method)
+        when :post
+          rv = Onering::API.post(endpoint, options)
+        when :put
+          rv = Onering::API.put(endpoint, options)
+        when :delete
+          rv = Onering::API.delete(endpoint, options)
+        when :head
+          rv = Onering::API.head(endpoint, options)
+        else
+          rv = Onering::API.get(endpoint, options)
+        end
+      rescue SocketError => e
+        Onering::Logger.fatal!("Unable to connect to #{Onering::API.base_uri}", "Onering::API")
       end
 
       if rv.code >= 500
@@ -286,7 +290,7 @@ module Onering
                   raise Actions::Retry.new
                 else
               # all errors are fatal at this stage
-                  Onering::Logger.fatal("Cannot autoregister client: HTTP #{response.code} - #{(response.parsed_response || {}).get('error.message', 'Unknown error')}", "Onering::API")
+                  Onering::Logger.fatal!("Cannot autoregister client: HTTP #{response.code} - #{(response.parsed_response || {}).get('error.message', 'Unknown error')}", "Onering::API")
                 end
               end
 

data/lib/onering/cli/devices.rb

@@ -27,7 +27,7 @@ EOS
 
 # -----------------------------------------------------------------------------
         when :get
-          Onering::Logger.fatal("Expected 1 parameter, got #{args.length}") unless args.length == 1
+          Onering::Logger.fatal!("Expected 1 parameter, got #{args.length}", "Onering::CLI::Devices") unless args.length == 1
 
           if @opts[:query_given]
           # doing this until a bulk field query endpoint is built
@@ -42,7 +42,7 @@ EOS
 
 # -----------------------------------------------------------------------------
         when :set
-          Onering::Logger.fatal("Expected 2 parameters, got #{args.length}") unless args.length == 2
+          Onering::Logger.fatal!("Expected 2 parameters, got #{args.length}", "Onering::CLI::Devices") unless args.length == 2
 
           if @opts[:query]
           # doing this until a bulk field set endpoint is built
@@ -57,14 +57,14 @@ EOS
 
 # -----------------------------------------------------------------------------
         when :list
-          Onering::Logger.fatal("Expected 1 parameter, got #{args.length}") unless args.length >= 1
+          Onering::Logger.fatal!("Expected 1 parameter, got #{args.length}", "Onering::CLI::Devices") unless args.length >= 1
           return @api.list(args[0], {
             :filter => [@opts[:query], args[1]].compact.join('/')
           }.compact)
 
 # -----------------------------------------------------------------------------
         when :find
-          Onering::Logger.fatal("Expected 1 parameter, got #{args.length}") unless args.length == 1
+          Onering::Logger.fatal!("Expected 1 parameter, got #{args.length}", "Onering::CLI::Devices") unless args.length == 1
           return @api.find(args[0])
 
 # -----------------------------------------------------------------------------
@@ -79,13 +79,13 @@ EOS
               File.read(args[1])
 
             else
-              Onering::Logger.fatal("Cannot save data, no input data specified")
+              Onering::Logger.fatal!("Cannot save data, no input data specified", "Onering::CLI::Devices")
             end
           end
 
           rv.parsed_response
         else
-          Onering::Logger.fatal("Unknown subcommand #{sc.inspect}")
+          Onering::Logger.fatal!("Unknown subcommand #{sc.inspect}", "Onering::CLI::Devices")
         end
       end
     end

data/lib/onering/cli/reporter.rb

@@ -70,7 +70,7 @@ EOS
 
           return report
         rescue Timeout::Error
-          Onering::Logger.fatal("Report took too long to generate, exiting...")
+          Onering::Logger.fatal!("Report took too long to generate, exiting...")
         end
       end
     end

data/lib/onering/logger.rb

@@ -68,9 +68,13 @@ module Onering
       return false
     end
 
-    def self.fatal(message, source=nil)
+    def self.fatal(message, source=nil, raise_error=false)
       self.log(:fatal, message, source)
-      raise Onering::Client::FatalError.new(message)
+      raise Onering::Client::FatalError.new(message) if raise_error === true
+    end
+
+    def self.fatal!(message, source=nil)
+      self.fatal(message, source, true)
     end
 
     def self.error(message, source=nil)

data/lib/onering/plugins/reporter.rb

@@ -131,7 +131,7 @@ module Onering
             return @_report.stringify_keys()
           end
         else
-          Onering::Logger.fatal("Cannot generate report without a hardware ID", "Onering::Reporter")
+          Onering::Logger.fatal!("Cannot generate report without a hardware ID", "Onering::Reporter")
         end
 
         {}

data/lib/onering.rb

@@ -2,7 +2,7 @@ $: << File.expand_path(File.dirname(__FILE__))
 
 module Onering
   module Client
-    VERSION = "0.0.86"
+    VERSION = "0.0.87"
 
     class Error < Exception; end
     class FatalError < Error; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onering-client
 version: !ruby/object:Gem::Version
-  version: 0.0.86
+  version: 0.0.87
   prerelease: 
 platform: ruby
 authors: