opbeat 0.4 → 0.5

data/lib/opbeat/client.rb

@@ -8,6 +8,36 @@ require 'opbeat/error'
 
 module Opbeat
 
+  class ClientState
+    def initialize(configuration)
+      @configuration = configuration
+      @retry_number = 0
+      @last_check = Time.now
+    end
+
+    def should_try?
+      return true if @status == :online
+        
+      interval = ([@retry_number, 6].min() ** 2) * @configuration[:backoff_multiplier]
+      puts interval
+      return true if Time.now - @last_check > interval
+
+      false
+    end
+
+    def set_fail
+      @status = :error
+      @retry_number += 1
+      @last_check = Time.now
+    end
+
+    def set_success
+      @status = :online
+      @retry_number = 0
+      @last_check = nil
+    end
+  end
+
   class Client
 
     PROTOCOL_VERSION = '1.0'
@@ -15,9 +45,11 @@ module Opbeat
     AUTH_HEADER_KEY = 'Authorization'
 
     attr_accessor :configuration
+    attr_accessor :state
 
     def initialize(configuration)
       @configuration = configuration
+      @state = ClientState.new configuration
     end
 
     def conn
@@ -29,9 +61,13 @@ module Opbeat
 
       Opbeat.logger.debug "Opbeat client connecting to #{self.configuration[:server]}"
       @url =  self.configuration[:server] + "/api/v1/organizations/" + self.configuration[:organization_id] +  "/apps/" + self.configuration[:app_id] + "/errors/"
-      @conn ||=  Faraday.new(:url => @url) do |builder|
+      @conn ||=  Faraday.new(:url => @url, :ssl => {:verify => self.configuration.ssl_verification}) do |builder|
         builder.adapter  Faraday.default_adapter
       end
+
+      @conn.options[:timeout] = self.configuration[:timeout]
+      @conn.options[:open_timeout] = self.configuration[:open_timeout]
+      @conn
     end
 
     def generate_auth_header(data)
@@ -40,19 +76,30 @@ module Opbeat
 
     def send(event)
       return unless configuration.send_in_current_environment?
+      return unless state.should_try?
 
-      # Set the project ID correctly
+      # Set the organization ID correctly
       event.organization = self.configuration[:organization_id]
       event.app = self.configuration[:app_id]
       Opbeat.logger.debug "Sending event #{event.id} to Opbeat"
       
-      response = self.conn.post @url do |req|
-        req.headers['Content-Type'] = 'application/json'
-        req.body = MultiJson.encode(event.to_hash)
-        req.headers[AUTH_HEADER_KEY] = self.generate_auth_header(req.body)
-        req.headers["User-Agent"] = USER_AGENT
+      begin
+        response = self.conn.post @url do |req|
+          req.headers['Content-Type'] = 'application/json'
+          req.body = MultiJson.encode(event.to_hash)
+          req.headers[AUTH_HEADER_KEY] = self.generate_auth_header(req.body)
+          req.headers["User-Agent"] = USER_AGENT
+        end
+
+        unless response.status == 202
+          raise Error.new("Error from Opbeat server (#{response.status}): #{response.body}")
+        end
+      rescue
+        @state.set_fail
+        raise
       end
-      raise Error.new("Error from Opbeat server (#{response.status}): #{response.body}") unless response.status == 202
+
+      @state.set_success
       response
     end
 

data/lib/opbeat/configuration.rb

@@ -22,15 +22,24 @@ module Opbeat
     # Whitelist of environments that will send notifications to Opbeat
     attr_accessor :environments
 
-    # Include module versions in reports?
-    attr_accessor :send_modules
-
     # Which exceptions should never be sent
     attr_accessor :excluded_exceptions
 
     # Processors to run on data before sending upstream
     attr_accessor :processors
 
+    # Timeout when waiting for the server to return data in seconds
+    attr_accessor :timeout
+
+    # Timout when opening connection to the server
+    attr_accessor :open_timeout
+
+    # Backoff multipler
+    attr_accessor :backoff_multiplier
+
+    # Should the SSL certificate of the server be verified?
+    attr_accessor :ssl_verification
+
     attr_reader :current_environment
 
     def initialize
@@ -41,9 +50,11 @@ module Opbeat
       @context_lines = 3
       self.environments = %w[ production ]
       self.current_environment = ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
-      self.send_modules = true
       self.excluded_exceptions = []
       self.processors = [Opbeat::Processor::SanitizeData]
+      self.timeout = 1
+      self.backoff_multiplier = 2
+      self.ssl_verification = true
     end
 
     # Allows config options to be read like a hash

data/lib/opbeat/event.rb

@@ -40,12 +40,6 @@ module Opbeat
       hostname = Socket.gethostbyname(hostname).first rescue hostname
       @hostname = options[:hostname] || hostname
 
-      # Older versions of Rubygems don't support iterating over all specs
-      if @configuration.send_modules && Gem::Specification.respond_to?(:map)
-        options[:modules] ||= Hash[Gem::Specification.map {|spec| [spec.name, spec.version.to_s]}]
-      end
-      @modules = options[:modules]
-
       block.call(self) if block
 
       # Some type coercion

data/lib/opbeat/version.rb

@@ -1,3 +1,3 @@
 module Opbeat
-  VERSION = "0.4"
+  VERSION = "0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opbeat
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday