skylight 0.3.0.rc.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f6a3addbdf4a8213bc76ea6430030ab9ff2925f
-  data.tar.gz: 6e7ed7c562fce41983579e0fbb3d619ef742dac7
+  metadata.gz: 8b4298b0fe8f4bccf1697e4ef0e46812b551cab8
+  data.tar.gz: 1f6b6bdf4a985fb43df3a3a39a4e134e047cdc00
 SHA512:
-  metadata.gz: c596d66b61b7c9a36dfd60d3e95fb549daaa8a7d5db6307e79892dd0b62d3b8692f0bb511872265afd7ad8e65f172d3f1140561fa98fae0dc07478e4f2e9c502
-  data.tar.gz: 150660085cfd209fc249ebadde9b46cc9707aed19651ae72e0c712b51fc70552f15871dd880a7eafb4ea4c1c5ce2444acbc0c6f062e6aad56f59c0ca1fe0ce87
+  metadata.gz: 333807718ef1d39e532506dbae88dd1e5b3a46ec44e87c767ba1673d73547e8a200480fac36267188b49d80f53e5951293eb0f7ee908b496cbc83b6bdc629c97
+  data.tar.gz: c8dfc5041e90345954f94c57afff9314230f7b230bc59e6197ea0aea6b7a7a76f29a3d53c6b001581bac4fbb26362a8ed72193f46ffddbea951b8a27ef6d91b0

data/lib/skylight/railtie.rb

@@ -24,6 +24,8 @@ module Skylight
 
           puts "[SKYLIGHT] [#{Skylight::VERSION}] Skylight agent enabled"
         end
+      elsif !Rails.env.test? && Rails.env.development?
+        puts "[SKYLIGHT] [#{Skylight::VERSION}] You are running in the #{Rails.env} environment but haven't added it to config.skylight.environments, so no data will be sent to skylight.io."
       end
     end
 

data/lib/skylight/util/http.rb

@@ -48,10 +48,6 @@ module Skylight
       def get(endpoint, hdrs = {})
         request = build_request(Net::HTTP::Get, endpoint, hdrs)
         execute(request)
-      rescue Exception => e
-        error "http GET failed; error=%s; msg=%s", e.class, e.message
-        t { e.backtrace.join("\n") }
-        nil
       end
 
       def post(endpoint, body, hdrs = {})
@@ -62,10 +58,6 @@ module Skylight
 
         request = build_request(Net::HTTP::Post, endpoint, hdrs, body.bytesize)
         execute(request, body)
-      rescue Exception => e
-        error "http POST failed; error=%s; msg=%s", e.class, e.message
-        t { e.backtrace.join("\n") }
-        nil
       end
 
     private
@@ -113,10 +105,14 @@ module Skylight
 
           Response.new(res.code.to_i, res, res.body)
         end
+      rescue Exception => e
+        error "http %s failed; error=%s; msg=%s", req.method, e.class, e.message
+        t { e.backtrace.join("\n") }
+        ErrorResponse.new(req.method, e)
       end
 
       class Response
-        attr_reader :status, :headers, :body
+        attr_reader :status, :headers, :body, :exception
 
         def initialize(status, headers, body)
           @status  = status
@@ -164,6 +160,16 @@ module Skylight
         end
       end
 
+      class ErrorResponse < Struct.new(:request_method, :exception)
+        def status
+          nil
+        end
+
+        def success?
+          false
+        end
+      end
+
     end
   end
 end

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.3.0.rc.6'
+  VERSION = '0.3.0'
 end
 

data/lib/skylight/worker/collector.rb

@@ -66,22 +66,25 @@ module Skylight
       end
 
       def send_exception(exception)
-        post_data(:exception, exception)
+        data = {class_name: exception.class.name}
+        if Exception === exception
+          data.merge!(message: exception.message, backtrace: exception.backtrace)
+        end
+        post_data(:exception, data, false)
       end
 
     private
 
-      def post_data(type, data)
+      def post_data(type, data, notify = true)
         t { "posting data (#{type}): #{data.inspect}" }
 
         res = @http_auth.post("/agent/#{type}?hostname=#{escape(config[:'hostname'])}", data)
 
-        # error already handled in Util::HTTP
-        return unless res
-
         unless res.success?
           warn "#{type} wasn't sent successfully; status=%s", res.status
         end
+
+        send_exception(res.exception) if notify && res.exception
       rescue Exception => e
         error "exception; msg=%s; class=%s", e.message, e.class
         t { e.backtrace.join("\n") }
@@ -113,14 +116,18 @@ module Skylight
 
         debug "flushing batch; size=%d", batch.sample.count
 
-        @http_report.post(ENDPOINT, batch.encode, CONTENT_TYPE => SKYLIGHT_V2)
+        res = @http_report.post(ENDPOINT, batch.encode, CONTENT_TYPE => SKYLIGHT_V2)
+        send_exception(res.exception) if res.exception
+        nil
       end
 
       def refresh_report_token(now)
         res = @http_auth.get("/agent/authenticate?hostname=#{escape(config[:'hostname'])}")
 
-        # error already handled in Util::HTTP
-        return unless res
+        if res.exception
+          send_exception(res.exception)
+          return
+        end
 
         unless res.success?
           if (400..499).include? res.status

data/lib/skylight/worker/server.rb

@@ -204,11 +204,11 @@ module Skylight
           @run = false
         rescue Exception => e
           error "Loop exception: %s (%s)\n%s", e.message, e.class, e.backtrace.join("\n")
-          @collector.send_exception(class_name: e.class.name, message: e.message, backtrace: e.backtrace)
+          @collector.send_exception(e)
           return false
         rescue Object => o
           error "Unknown object thrown: `%s`", o.to_s
-          @collector.send_exception(class_name: o.class.name)
+          @collector.send_exception(o)
           return false
         end while @run
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.3.0.rc.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -154,9 +154,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.0