skylight 0.1.6.alpha1 → 0.1.6.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 563ae386de883f09e3a0adf7a14042c38d2c7fd2
-  data.tar.gz: 90420768b5b5dcbc2cfbb89e68b416f6e38baa4b
+  metadata.gz: bd3fcb8b023de4a803c0afc513b516b4cf427d21
+  data.tar.gz: 6df2ed3b9dececb6b58f3a7e8201137418345f61
 SHA512:
-  metadata.gz: ad206b26816c8d5bac219bf4878bf7661de49850bfe785f2e181374bfd787c93fcd3b85898fbf78ef37f70891d6e4219e4e03bc3997314dace6dd1e28b1691b2
-  data.tar.gz: a4e9254b1d9ec3f348453df808c9905a3fe7e0f68956820aca5d8f8edcc8b3fe1aa8c025fa77409e19314edffd0f2f486edceae49fd4c06fb9eeb2f7c0d8479c
+  metadata.gz: f94b8e72f33d0c3c3446d4b7d9ea3448bb5e33ccc7deb16da4837bbcca7e486b8d9a5c38f430de4af4c1b960cea879fadda5da2f3bc5dcd505e8a70882167a6f
+  data.tar.gz: 156b54dfa5b95ebdac49ec7e67642370ed2f9005d9c357894056b3758cd27a2af6eda8e3a0410cb664caf8599ae27b37e7b078df0e12234e89ec7498ec390cae

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## unreleased ##
 
+* [BUG] Fix unix domain socket write function in standalone agent
+* Performance improvements
+* Tolerate invalid trace building
+* Fix Skylight on Rails 4
+
 ## 0.1.5 (May 31, 2013)
 
 * Provide a default CA cert when one is not already present

data/lib/skylight.rb

@@ -69,12 +69,20 @@ module Skylight
   end
 
   def self.trace(*args, &blk)
-    return yield unless inst = Instrumenter.instance
+    unless inst = Instrumenter.instance
+      return yield if block_given?
+      return
+    end
+
     inst.trace(*args, &blk)
   end
 
   def self.instrument(*args, &blk)
-    return yield unless inst = Instrumenter.instance
+    unless inst = Instrumenter.instance
+      return yield if block_given?
+      return
+    end
+
     inst.instrument(*args, &blk)
   end
 

data/lib/skylight/config.rb

@@ -15,6 +15,7 @@ module Skylight
       'SK_AGENT_KEEPALIVE'     => :'agent.keepalive',
       'SK_AGENT_SAMPLE_SIZE'   => :'agent.sample',
       'SK_AGENT_SOCKFILE_PATH' => :'agent.sockfile_path',
+      'SK_AGENT_STRATEGY'      => :'agent.strategy',
       'SK_REPORT_HOST'         => :'report.host',
       'SK_REPORT_PORT'         => :'report.port',
       'SK_REPORT_SSL'          => :'report.ssl',

data/lib/skylight/gc.rb

@@ -2,25 +2,13 @@ require 'thread'
 
 module Skylight
   class GC
-    METHODS = [ :enable, :total_time ]
-    TH_KEY  = :SK_GC_CURR_WINDOW
+    METHODS   = [ :enable, :total_time ]
+    TH_KEY    = :SK_GC_CURR_WINDOW
+    MAX_COUNT = 1000
+    MAX_TIME  = 30_000_000
 
     include Util::Logging
 
-    def self.update
-      if win = Thread.current[TH_KEY]
-        win.update
-      end
-    end
-
-    def self.time
-      if win = Thread.current[TH_KEY]
-        win.time
-      else
-        0
-      end
-    end
-
     attr_reader :config
 
     def initialize(config, profiler)
@@ -41,9 +29,7 @@ module Skylight
       @profiler.enable if @profiler
     end
 
-    def start_track
-      return if Thread.current[TH_KEY]
-
+    def track
       unless @profiler
         win = Window.new(nil)
       else
@@ -52,29 +38,19 @@ module Skylight
         @lock.synchronize do
           __update
           @listeners << win
-        end
-      end
 
-      Thread.current[TH_KEY] = win
-    end
+          # Cleanup any listeners that might have leaked
+          until @listeners[0].time < MAX_TIME
+            @listeners.shift
+          end
 
-    def stop_track
-      if win = Thread.current[TH_KEY]
-        Thread.current[TH_KEY] = nil
-        win.release
+          if @listeners.length > MAX_COUNT
+            @listeners.shift
+          end
+        end
       end
-    end
 
-    def track
-      return unless block_given?
-
-      start_track
-
-      begin
-        yield
-      ensure
-        stop_track
-      end
+      win
     end
 
     def release(win)

data/lib/skylight/instrumenter.rb

@@ -70,65 +70,64 @@ module Skylight
       @worker.shutdown
     end
 
-    def trace(endpoint = 'Unknown')
+    def trace(endpoint, cat, *args)
       # If a trace is already in progress, continue with that one
       if trace = Instrumenter.current_trace
         t { "already tracing" }
-        return yield(trace)
+        return yield(trace) if block_given?
+        return trace
       end
 
-      trace = Messages::Trace::Builder.new(endpoint, Util::Clock.micros, @config)
-
       begin
+        trace = Messages::Trace::Builder.new(self, endpoint, Util::Clock.micros, cat, *args)
+      rescue Exception => e
+        error e.message
+        t { e.backtrace.join("\n") }
+        return
+      end
+
+      Instrumenter.current_trace = trace
+      return trace unless block_given?
 
-        Instrumenter.current_trace = trace
+      begin
         yield trace
 
       ensure
         Instrumenter.current_trace = nil
-
-        begin
-          built = trace.build
-
-          if built && built.valid?
-            process(built)
-          else
-            if built && built.spans.empty?
-              debug "trace invalid -- dropping; spans=0"
-            elsif built
-              debug "trace invalid -- dropping; spans=%d; started_at=%d",
-                built.spans.length, built.spans[-1].started_at
-            else
-              debug "trace invalid -- dropping; trace=nil"
-            end
-          end
-        rescue Exception => e
-          error e
-        end
+        trace.submit
       end
     end
 
     def instrument(cat, *args)
+      unless trace = Instrumenter.current_trace
+        return yield if block_given?
+        return
+      end
+
       cat = cat.to_s
 
       unless cat =~ CATEGORY_REGEX
         warn "invalid skylight instrumentation category; value=%s", cat
-        return yield
+        return yield if block_given?
+        return
       end
 
       cat = "other.#{cat}" unless cat =~ TIER_REGEX
 
-      return yield unless sp = @subscriber.instrument(cat, *args)
+      unless sp = trace.instrument(cat, *args)
+        return yield if block_given?
+        return
+      end
+
+      return sp unless block_given?
 
       begin
         yield sp
       ensure
-        @subscriber.done
+        sp.done
       end
     end
 
-  private
-
     def process(trace)
       t { fmt "processing trace; spans=%d; duration=%d",
             trace.spans.length, trace.spans[-1].duration }

data/lib/skylight/messages/span.rb

@@ -19,6 +19,8 @@ module Skylight
 
       class Builder
 
+        include Util::Logging
+
         attr_reader \
           :time,
           :category,
@@ -40,10 +42,21 @@ module Skylight
           self.description = desc
         end
 
+        def config
+          @trace.config
+        end
+
         def endpoint=(name)
           @trace.endpoint = name
         end
 
+        def done
+          @trace.done(self) unless built?
+        rescue Exception => e
+          error e.message
+          t { e.backtrace.join("\n") }
+        end
+
         def built?
           @built
         end

data/lib/skylight/messages/trace.rb

@@ -8,160 +8,155 @@ module Skylight
       optional :endpoint, :string, 2
       repeated :spans,    Span,    3
 
-      def valid?
-        return false unless spans && spans.length > 0
-        spans[-1].started_at == 0
-      end
-
       class Builder
+        GC_CAT = 'noise.gc'.freeze
+
         include Util::Logging
 
         attr_accessor :endpoint
-        attr_reader   :spans, :config
-
-        def initialize(endpoint = "Unknown", start = Util::Clock.micros, config = nil)
-          @endpoint = endpoint
-          @busted   = false
-          @config   = config
-          @start    = start
-          @spans    = []
-          @stack    = []
-          @parents  = []
-
-          # Track time
-          @last_seen_time = start
-        end
+        attr_reader   :spans, :notifications
 
-        def root(cat, title = nil, desc = nil, annot = {})
-          return unless block_given?
-          return yield unless @stack == []
-          return yield unless config
+        def initialize(instrumenter, endpoint, start, cat, *args)
+          raise ArgumentError, 'instrumenter is required' unless instrumenter
 
-          gc = config.gc
-          start(@start, cat, title, desc, annot)
+          @instrumenter = instrumenter
+          @endpoint     = endpoint
+          @start        = start
+          @spans        = []
+          @stack        = []
+          @submitted    = false
 
-          begin
-            gc.start_track
+          # Tracks the AS::N stack
+          @notifications = []
 
-            begin
-              yield
-            ensure
-              unless @busted
-                now = Util::Clock.micros
-
-                GC.update
-                gc_time = GC.time
+          # Track time
+          @last_seen_time = start
 
-                if gc_time > 0
-                  t { fmt "tracking GC time; duration=%d", gc_time }
-                  start(now - gc_time, 'noise.gc')
-                  stop(now)
-                end
+          annot = args.pop if Hash === args
+          title = args.shift
+          desc  = args.shift
 
-                stop(now)
-              end
-            end
-          ensure
-            gc.stop_track
-          end
+          # Create the root node
+          @root = start(@start, cat, title, desc, annot)
+          @gc   = config.gc.track
         end
 
-        def record(time, cat, title = nil, desc = nil, annot = {})
-          return if @busted
-
-          time = adjust_for_skew(time)
-
-          sp = span(time, cat, title, desc, annot)
+        def config
+          @instrumenter.config
+        end
 
-          return if :skip == sp
+        def record(cat, *args)
+          annot = args.pop if Hash === args
+          title = args.shift
+          desc  = args.shift
+          now   = adjust_for_skew(Util::Clock.micros)
 
+          sp = span(now - gc_time, cat, title, desc, annot)
           inc_children
           @spans << sp.build(0)
 
           nil
         end
 
-        def start(time, cat, title = nil, desc = nil, annot = {})
-          return if @busted
-
-          time = adjust_for_skew(time)
-
-          sp = span(time, cat, title, desc, annot)
-
-          push(sp)
+        def instrument(cat, *args)
+          annot = args.pop if Hash === args
+          title = args.shift
+          desc  = args.shift
+          now   = adjust_for_skew(Util::Clock.micros)
 
-          return if :skip == sp
+          start(now - gc_time, cat, title, desc, annot)
+        end
 
-          sp
+        def done(span)
+          return unless span
+          stop(span, adjust_for_skew(Util::Clock.micros) - gc_time)
         end
 
-        def stop(time)
-          return if @busted
+        def release
+          return unless Instrumenter.current_trace == self
+          Instrumenter.current_trace = nil
+        end
 
-          time = adjust_for_skew(time)
+        def submit
+          return if @submitted
 
-          sp = pop
+          release
+          @submitted = true
 
-          return if :skip == sp
+          now = adjust_for_skew(Util::Clock.micros)
 
-          @spans << sp.build(relativize(time) - sp.started_at)
+          # Pop everything that is left
+          while sp = pop
+            @spans << sp.build(relativize(now) - sp.started_at)
+          end
 
-          nil
-        end
+          time = gc_time
 
-        def build
-          return if @busted
-          unless @stack.empty?
-            remaining = @stack.map do |sp|
-              sp == :skip ? :skip : sp.category
-            end
+          if time > 0
+            t { fmt "tracking GC time; duration=%d", time }
+            noise = start(now - time, GC_CAT, nil, nil, {})
+            stop(noise, now)
+          end
 
-            raise TraceError, "trace unbalanced; remaining=#{remaining.inspect}"
+          if sp = @stack.pop
+            @spans << sp.build(relativize(now) - sp.started_at)
           end
 
-          Trace.new(
+          t = Trace.new(
             uuid:     'TODO',
             endpoint: endpoint,
             spans:    spans)
+
+          @instrumenter.process(t)
+        rescue Exception => e
+          error e
+          t { e.backtrace.join("\n") }
         end
 
       private
 
-        def span(time, cat, title, desc, annot)
-          return cat if :skip == cat
+        def start(time, cat, title, desc, annot)
+          sp = span(time, cat, title, desc, annot)
 
-          Span::Builder.new(
-            self, time, relativize(time),
-            cat, title, desc, annot)
-        end
+          push(sp)
 
-        def push(sp)
-          @stack << sp
+          sp
+        end
 
-          unless :skip == sp
-            inc_children
-            @parents << sp
+        def stop(span, time)
+          until span == (sp = pop)
+            return unless sp
+            @spans << sp.build(relativize(time) - sp.started_at)
           end
+
+          @spans << span.build(relativize(time) - sp.started_at)
+
+          nil
         end
 
-        def pop
-          unless sp = @stack.pop
-            @busted = true
-            raise TraceError, "closing span -- trace unbalanced"
-          end
+        def span(time, cat, title, desc, annot)
+          Span::Builder.new(
+            self, time, relativize(time),
+            cat, title, desc, annot)
+        end
 
-          @parents.pop if :skip != sp
+        def pop
+          return unless @stack.length > 1
+          @stack.pop
+        end
 
-          sp
+        def push(sp)
+          inc_children
+          @stack << sp
         end
 
         def inc_children
-          return unless sp = @parents.last
+          return unless sp = @stack[-1]
           sp.children += 1
         end
 
         def relativize(time)
-          if parent = @parents[-1]
+          if parent = @stack[-1]
             ((time - parent.time) / 100).to_i
           else
             ((time - @start) / 100).to_i
@@ -179,8 +174,13 @@ module Skylight
           time
         end
 
-      end
+        def gc_time
+          return 0 unless @gc
+          @gc.update
+          @gc.time
+        end
 
+      end
     end
   end
 end

data/lib/skylight/middleware.rb

@@ -1,15 +1,59 @@
 module Skylight
   class Middleware
 
+    class BodyProxy
+      def initialize(body, &block)
+        @body, @block, @closed = body, block, false
+      end
+
+      def respond_to?(*args)
+        return false if args.first.to_s =~ /^to_ary$/
+        super or @body.respond_to?(*args)
+      end
+
+      def close
+        return if @closed
+        @closed = true
+        begin
+          @body.close if @body.respond_to? :close
+        ensure
+          @block.call
+        end
+      end
+
+      def closed?
+        @closed
+      end
+
+      # N.B. This method is a special case to address the bug described by #434.
+      # We are applying this special case for #each only. Future bugs of this
+      # class will be handled by requesting users to patch their ruby
+      # implementation, to save adding too many methods in this class.
+      def each(*args, &block)
+        @body.each(*args, &block)
+      end
+
+      def method_missing(*args, &block)
+        super if args.first.to_s =~ /^to_ary$/
+        @body.__send__(*args, &block)
+      end
+    end
+
     def initialize(app)
       @app = app
     end
 
     def call(env)
-      Skylight.trace "Rack" do |trace|
-        trace.root 'app.rack.request' do
-          @app.call(env)
-        end
+      begin
+        trace = Skylight.trace "Rack", 'app.rack.request'
+        resp = @app.call(env)
+        resp[2] = BodyProxy.new(resp[2]) { trace.submit } if trace
+        resp
+      rescue Exception
+        trace.submit if trace
+        raise
+      ensure
+        trace.release if trace
       end
     end
   end

data/lib/skylight/railtie.rb

@@ -17,7 +17,7 @@ module Skylight
           Instrumenter.start!(config)
           app.middleware.insert 0, Middleware
 
-          Rails.logger.info "[SKYLIGHT] Skylight agent enabled"
+          puts "[SKYLIGHT] Skylight agent enabled"
         end
       end
     end
@@ -29,7 +29,7 @@ module Skylight
       path = nil unless File.exist?(path)
 
       unless tmp = app.config.paths['tmp'].first
-        Rails.logger.warn "[SKYLIGHT] tmp directory missing from rails configuration"
+        puts "[SKYLIGHT] tmp directory missing from rails configuration"
         return nil
       end
 
@@ -41,7 +41,7 @@ module Skylight
       config
 
     rescue ConfigError => e
-      Rails.logger.warn "[SKYLIGHT] #{e.message}; disabling Skylight agent"
+      puts "[SKYLIGHT] #{e.message}; disabling Skylight agent"
       nil
     end
 

data/lib/skylight/subscriber.rb

@@ -20,43 +20,49 @@ module Skylight
       @subscriber = nil
     end
 
-    def instrument(category, *args)
-      return unless trace = Instrumenter.current_trace
-
-      annot = args.pop if Hash === args
-      title = args.shift
-      desc  = args.shift
-
-      trace.start(now - gc_time, category, title, desc, annot)
-    end
-
-    def done
-      return unless trace = Instrumenter.current_trace
-      trace.stop(now - gc_time)
-    end
-
     #
     #
     # ===== ActiveSupport::Notifications API
     #
     #
 
+    class Notification
+      attr_reader :name, :span
+
+      def initialize(name, span)
+        @name, @span = name, span
+      end
+    end
+
     def start(name, id, payload)
       return unless trace = Instrumenter.current_trace
 
       cat, title, desc, annot = normalize(trace, name, payload)
-      trace.start(now - gc_time, cat, title, desc, annot)
 
-      trace
+      unless cat == :skip
+        span = trace.instrument(cat, title, desc, annot)
+      end
+
+      trace.notifications << Notification.new(name, span)
+
     rescue Exception => e
       error "Subscriber#start error; msg=%s", e.message
+      nil
     end
 
     def finish(name, id, payload)
       return unless trace = Instrumenter.current_trace
-      trace.stop(now - gc_time)
+
+      while curr = trace.notifications.pop
+        if curr.name == name
+          curr.span.done if curr.span
+          return
+        end
+      end
+
     rescue Exception => e
       error "Subscriber#finish error; msg=%s", e.message
+      nil
     end
 
     def publish(name, *args)
@@ -69,14 +75,5 @@ module Skylight
       @normalizers.normalize(*args)
     end
 
-    def gc_time
-      GC.update
-      GC.time
-    end
-
-    def now
-      Util::Clock.micros
-    end
-
   end
 end

data/lib/skylight/util/queue.rb

@@ -3,7 +3,7 @@ require 'thread'
 module Skylight
   module Util
     # Simple thread-safe queue backed by a ring buffer. Will only block when
-    # poping.
+    # poping. Single consumer only
     class Queue
 
       def initialize(max)
@@ -15,7 +15,7 @@ module Skylight
         @values  = [nil] * max
         @consume = 0
         @produce = 0
-        @waiting = []
+        @waiting = nil
         @mutex   = Mutex.new
       end
 
@@ -39,11 +39,8 @@ module Skylight
           ret = __length
 
           # Wakeup a blocked thread
-          begin
-            t = @waiting.shift
-            t.wakeup if t
-          rescue ThreadError
-            retry
+          if t = @waiting
+            t.run rescue nil
           end
         end
 
@@ -58,11 +55,13 @@ module Skylight
         @mutex.synchronize do
           if __empty?
             if !timeout || timeout > 0
-              t = Thread.current
-              @waiting << t
-              @mutex.sleep(timeout)
-              # Ensure that the thread is not in the waiting list
-              @waiting.delete(t)
+              return if @waiting
+              @waiting = Thread.current
+              begin
+                @mutex.sleep(timeout)
+              ensure
+                @waiting = nil
+              end
             else
               return
             end

data/lib/skylight/vendor/beefcake.rb

@@ -34,6 +34,13 @@ module Skylight
 
 
       module Dsl
+        def self.extended(base)
+          initializer = Module.new
+          base.instance_variable_set(:@__initializer, initializer)
+          base.__write_initializer
+          base.send(:include, initializer)
+        end
+
         def required(name, type, fn, opts={})
           field(:required, name, type, fn, opts)
         end
@@ -48,12 +55,27 @@ module Skylight
 
         def field(rule, name, type, fn, opts)
           fields[fn] = Field.new(rule, name, type, fn, opts)
+          __write_initializer
           attr_accessor name
         end
 
         def fields
           @fields ||= {}
         end
+
+        def __write_initializer
+          lines = []
+
+          lines << "def initialize(attrs=nil)"
+          lines << "return unless attrs"
+          fields.values.each do |fld|
+            lines << "@#{fld.name} = attrs[:#{fld.name}]"
+          end
+
+          lines << "end"
+
+          @__initializer.module_eval(lines.join("\n"), __FILE__, __LINE__+1)
+        end
       end
 
       module Encode
@@ -133,7 +155,8 @@ module Skylight
 
 
       module Decode
-        def decode(buf, o=self.new)
+        # Use allocate instead of new for performance
+        def decode(buf, o=self.allocate)
           if ! buf.is_a?(Buffer)
             buf = Buffer.new(buf)
           end
@@ -191,12 +214,6 @@ module Skylight
         o.send(:include, Encode)
       end
 
-      def initialize(attrs={})
-        fields.values.each do |fld|
-          self[fld.name] = attrs[fld.name]
-        end
-      end
-
       def fields
         self.class.fields
       end

data/lib/skylight/vendor/beefcake/buffer.rb

@@ -34,8 +34,7 @@ module Skylight
 
       def self.encodable?(type)
         return false if ! type.is_a?(Class)
-        pims = type.public_instance_methods
-        pims.include?(:encode) || pims.include?("encode")
+        type < Message
       end
 
       attr_accessor :buf

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '0.1.6.alpha1'
+  VERSION = '0.1.6.alpha3'
 end
 

data/lib/skylight/worker/collector.rb

@@ -18,6 +18,7 @@ module Skylight
         @size     = config[:'agent.sample']
         @batch    = nil
         @interval = config[:'agent.interval']
+        @buf      = ""
 
         t { fmt "starting collector; interval=%d; size=%d", @interval, @size }
       end
@@ -53,8 +54,10 @@ module Skylight
       def flush(batch)
         return if batch.empty?
 
-        trace "flushing batch; size=%d", batch.sample.count
-        @http.post(ENDPOINT, batch.encode, CONTENT_TYPE => SKYLIGHT_V1)
+        debug "flushing batch; size=%d", batch.sample.count
+
+        @buf.clear
+        @http.post(ENDPOINT, batch.encode(@buf), CONTENT_TYPE => SKYLIGHT_V1)
       end
 
       def new_batch(now)
@@ -93,7 +96,7 @@ module Skylight
           @sample << trace
         end
 
-        def encode
+        def encode(buf)
           endpoints = {}
 
           sample.each do |trace|
@@ -115,7 +118,9 @@ module Skylight
           Messages::Batch.new(
             timestamp: from,
             endpoints: endpoints.values).
-            encode.to_s
+            encode(buf)
+
+          buf
         end
       end
 

data/lib/skylight/worker/standalone.rb

@@ -2,6 +2,7 @@ require 'socket'
 require 'thread'
 require 'fileutils'
 
+# TODO: Handle cool-off
 module Skylight
   module Worker
     # Handle to the agent subprocess. Manages creation, communication, and
@@ -146,17 +147,17 @@ module Skylight
         # is still healthy but is simply reloading itself, this should work
         # just fine.
         if sock = connect(@pid)
-          trace "reconnected to worker"
+          t { "reconnected to worker" }
           @sock = sock
           # TODO: Should HELLO be sent again?
           return true
         end
 
-        t { "failed to reconnect -- attempting worker respawn" }
+        debug "failed to reconnect -- attempting worker respawn"
 
         # Attempt to respawn the agent process
         unless __spawn
-          t { "could not respawn -- shutting down" }
+          debug "could not respawn -- shutting down"
 
           @pid  = nil
           @sock = nil
@@ -205,10 +206,13 @@ module Skylight
           @sock = nil
           sock.close rescue nil
 
-          # TODO: Respawn the agent
-          repair
+          unless repair
+            return false
+          end
         end
 
+        debug "could not handle message; msg=%s", msg.class
+
         false
       end
 
@@ -231,23 +235,39 @@ module Skylight
         end
       end
 
-      def write(sock, msg, timeout = 0.01)
+      def write(sock, msg, timeout = 5)
         msg = msg.to_s
-        cnt = 50
-
-        while 0 <= (cnt -= 1)
-          ret = sock.syswrite msg rescue nil
-
-          return true unless ret
-
-          if ret == msg.bytesize
-            return true
-          elsif ret > 0
-            msg = msg.byteslice(ret..-1)
+        cnt = 10
+
+        begin
+          while true
+            res = sock.write_nonblock(msg)
+
+            if res == msg.bytesize
+              return true
+            elsif res > 0
+              msg = msg.byteslice(res..-1)
+              cnt = 10
+            else
+              if 0 <= (cnt -= 1)
+                t { "write failed -- max attempts" }
+                return false
+              end
+            end
+          end
+        rescue Errno::EAGAIN, Errno::EWOULDBLOCK
+          _, socks, = IO.select([], [sock], [], timeout)
+          unless socks == [sock]
+            t { "write timed out" }
+            return false
           end
+          retry
+        rescue Errno::EINTR
+          raise
+        rescue SystemCallError => e
+          t { fmt "write failed; err=%s", e.class }
+          return false
         end
-
-        return false
       end
 
       # Spawn the worker process.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.1.6.alpha1
+  version: 0.1.6.alpha3
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,20 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 description: Currently in pre-alpha.
 email:
 - engineering@tilde.io