skylight 0.1.0.alpha1 → 0.1.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82650226a057fc3b8b8595ac4fc760edaf56c656
-  data.tar.gz: f50d0c8f8e3d22d915664760f7eba80aece2fbae
+  metadata.gz: beabf95b91656caa37b7d50b1e67b7aa9177ff01
+  data.tar.gz: a4b2173c7f2e4e9eab641b84091bc492d807ecad
 SHA512:
-  metadata.gz: 99a7f5225e962df3c946c6440454a1892c1401d19feebee8cb3698a048c4f3a26980d2db77e99092f55023020ec6f85b88146ffd0aa799c03e4b3f1880c969c6
-  data.tar.gz: 0b40b0d1f2c08ee5872f6891f7b889900e96ec70beb6c938fe2016c35e07c8271e901f7b6d1e5c1919418a963698027fddbad7e2fe63d78ef2c13953da7b85d6
+  metadata.gz: 0edc44d2ed75e928ebb93ac2c8c88e0e8916cd7c3e2915e95d229b046666c0f48d627fb016c5f9ab5a41e9b9307fc5bef0c64b0e43dfcfaf0e32fad5941e1ffa
+  data.tar.gz: 8af1715ad4e6e168cdb8310b3b265e147311b09853ada14f7744dc3f8361b31a71d7db3d4d1e80346279f8344923ba8e532e6dc5e069da2c8a953def8d847297

data/lib/skylight.rb

@@ -22,6 +22,7 @@ module Skylight
   autoload :GC,           'skylight/gc'
   autoload :Instrumenter, 'skylight/instrumenter'
   autoload :Messages,     'skylight/messages'
+  autoload :Middleware,   'skylight/middleware'
   autoload :Normalizers,  'skylight/normalizers'
   autoload :Subscriber,   'skylight/subscriber'
   autoload :Worker,       'skylight/worker'

data/lib/skylight/cli.rb

@@ -96,7 +96,8 @@ module Skylight
     end
 
     def config
-      @config ||= Config.new
+      # Calling .load checks ENV variables
+      @config ||= Config.load
     end
 
   end

data/lib/skylight/railtie.rb

@@ -29,8 +29,14 @@ module Skylight
       path = config_path(app)
       path = nil unless File.exist?(path)
 
+      unless tmp = app.config.paths['tmp'].first
+        Rails.logger.warn "[SKYLIGHT] tmp directory missing from rails configuration"
+        return nil
+      end
+
       config = Config.load(path, Rails.env.to_s, ENV)
       config.logger = Rails.logger
+      config['agent.sockfile_path'] = tmp
       config['normalizers.render.view_paths'] = app.config.paths["app/views"].existent
       config.validate!
       config

data/lib/skylight/util/http.rb

@@ -30,7 +30,7 @@ module Skylight
         request = build_request(Net::HTTP::Get, endpoint, hdrs)
         execute(request)
       rescue Exception => e
-        error "http GET failed; msg=%s", e.message
+        error "http GET failed; error=%s; msg=%s", e.class, e.message
         t { e.backtrace.join("\n") }
         nil
       end
@@ -44,7 +44,7 @@ module Skylight
         request = build_request(Net::HTTP::Post, endpoint, hdrs, body.bytesize)
         execute(request, body)
       rescue Exception => e
-        error "http POST failed; msg=%s", e.message
+        error "http POST failed; error=%s; msg=%s", e.class, e.message
         t { e.backtrace.join("\n") }
         nil
       end
@@ -101,8 +101,12 @@ module Skylight
           @status  = status
           @headers = headers
 
-          if headers[CONTENT_TYPE] == APPLICATION_JSON
-            @body = JSON.parse(body)
+          if (headers[CONTENT_TYPE] || "").include?(APPLICATION_JSON)
+            begin
+              @body = JSON.parse(body)
+            rescue JSON::ParserError
+              @body = body # not really JSON I guess
+            end
           else
             @body = body
           end

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.1.0.alpha1'
+  VERSION = '0.1.0.alpha2'
 end
 

data/lib/skylight/worker/server.rb

@@ -215,7 +215,7 @@ module Skylight
             reload(msg)
           end
         when Messages::Trace
-          t { fmt "received trace; t=%p", msg }
+          t { "received trace" }
           @collector.submit(msg)
         when :unknown
           debug "received unknown message"

data/lib/skylight/worker/standalone.rb

@@ -140,6 +140,8 @@ module Skylight
       def repair
         @sock.close rescue nil if @sock
 
+        t { "repairing socket" }
+
         # Attempt to reconnect to the currently known agent PID. If the agent
         # is still healthy but is simply reloading itself, this should work
         # just fine.
@@ -150,8 +152,12 @@ module Skylight
           return true
         end
 
+        t { "failed to reconnect -- attempting worker respawn" }
+
         # Attempt to respawn the agent process
         unless __spawn
+          t { "could not respawn -- shutting down" }
+
           @pid  = nil
           @sock = nil
           return false
@@ -300,6 +306,9 @@ module Skylight
             # Deal w/ the inherited socket
             @sock.close rescue nil if @sock
             @sock = nil
+
+            @writer = build_queue
+            @writer.spawn
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha1
+  version: 0.1.0.alpha2
 platform: ruby
 authors:
 - Tilde, Inc.