skylight 0.3.20 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4753335500fc79c83707c6022d126ff56277629
-  data.tar.gz: 738b3feeb6ab06e25317f6d2978530437cff41d2
+  metadata.gz: 1cf63055157626891e0d09101b21221a4d18406f
+  data.tar.gz: df489cf0c01303baf4ea5636c4fbcf40f30fa690
 SHA512:
-  metadata.gz: 309981c22e1a0db6a1f63d616fde5ba902e5f2f626f028bd100eb155ab4567239a3a3b6ec954f9f12565aa2d7f3b317de42b4de7c7d6fda00f9f00a200ded4c0
-  data.tar.gz: 3fe913784d4cf625a65215b94b13b5d4479cce6c2ff0a3c28b86cbe35343fd9b2c8037c2d86567357de3f09e26c0d88020381e83c10fc2bdd5f1cab222bd894f
+  metadata.gz: 7537c8005076587637aad255183d13755ea45b746ce331635990bb18f6e12a52b73394720b62370f34eb1e8f361284ab29e6dce13ba552c820110fa2e84584e8
+  data.tar.gz: 29e0bfbd08c39ad41c426afafb717dd84483ea1beda96710ee9bcc7abc1694a4f20ab3544d3cf26dfe7f028eca174d4ad8ffa6381ffabe3343477190fa3d6e72

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.21 (October 8, 2014)
+
+* [BUGFIX] Skylight crashing on start won't crash entire app
+
 ## 0.3.20 (September 3, 2014)
 
 * [BUGFIX] Fix app name fetching on Windows for `skylight setup`

data/lib/skylight.rb

@@ -62,7 +62,7 @@ module Skylight
       config.alert_logger.warn \
           "[SKYLIGHT] [#{Skylight::VERSION}] Running Skylight in #{env_name} mode. " \
           "No data will be reported until you deploy your app.\n" \
-          "(To disable this message, set `alert_logger_file` in your config.)"
+          "(To disable this message, set `alert_log_file` in your config.)"
     else
       config.alert_logger.error \
           "[SKYLIGHT] [#{Skylight::VERSION}] The Skylight native extension for your platform wasn't found. " \

data/lib/skylight/instrumenter.rb

@@ -28,13 +28,24 @@ module Skylight
 
     # Do start
     # @param [Config] config The config
-    def self.start!(config = Config.new)
+    def self.start!(config = nil)
       return @instance if @instance
 
+      # Initialize here so we can catch errors
+      config ||= Config.new
+
       LOCK.synchronize do
         return @instance if @instance
         @instance = new(config).start!
       end
+    rescue => e
+      message = sprintf("[SKYLIGHT] [#{Skylight::VERSION}] Unable to start Instrumenter; msg=%s; class=%s", e.message, e.class)
+      if config
+        config.logger.warn message
+      else
+        warn message
+      end
+      false
     end
 
     def self.stop!
@@ -108,7 +119,7 @@ module Skylight
       self
 
     rescue Exception => e
-      log_error "failed to start instrumenter; msg=%s", e.message
+      log_error "failed to start instrumenter; msg=%s; config=%s", e.message, @config.inspect
       nil
     end
 

data/lib/skylight/railtie.rb

@@ -25,16 +25,18 @@ module Skylight
 
       if activate?
         if config
-          if config && Instrumenter.start!(config)
+          if Instrumenter.start!(config)
             app.middleware.insert 0, Middleware, config: config
             Rails.logger.info "[SKYLIGHT] [#{Skylight::VERSION}] Skylight agent enabled"
+          else
+            Rails.logger.info "[SKYLIGHT] [#{Skylight::VERSION}] Unable to start"
           end
         else
           Rails.logger.warn "[SKYLIGHT] [#{Skylight::VERSION}] No configuration found; disabling Skylight agent"
         end
       elsif Rails.env.development?
         log_warning config, "[SKYLIGHT] [#{Skylight::VERSION}] Running Skylight in development mode. No data will be reported until you deploy your app.\n" \
-                              "(To disable this message, set `alert_logger_file` in your config.)"
+                              "(To disable this message, set `alert_log_file` in your config.)"
       elsif !Rails.env.test?
         log_warning config, "[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

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.3.20'
+  VERSION = '0.3.21'
 end
 

data/lib/skylight/worker/collector.rb

@@ -185,7 +185,7 @@ module Skylight
 
         if tok && expires_at
           if expires_at <= now
-            error "token is expired: token=%s; expires_at=%s"
+            error "token is expired: token=%s; expires_at=%s", tok, expires_at
             return
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.3.21
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport