jls-lumberjack 0.0.3 → 0.0.4

data/lib/lumberjack/client.rb

@@ -0,0 +1,158 @@
+require "socket"
+require "thread"
+require "openssl"
+require "zlib"
+
+module Lumberjack
+  
+  SEQUENCE_MAX = (2**(0.size * 8 -2) -1)
+
+  class Client
+    def initialize(opts={})
+      @opts = {
+        :port => 0,
+        :addresses => [],
+        :ssl_certificate => nil,
+        :window_size => 5000
+      }.merge(opts)
+
+      @opts[:addresses] = [@opts[:addresses]] if @opts[:addresses].class == String
+      raise "Must set a port." if @opts[:port] == 0
+      raise "Must set atleast one address" if @opts[:addresses].empty? == 0
+      raise "Must set a ssl certificate or path" if @opts[:ssl_certificate].nil?
+
+      @socket = connect
+
+    end
+
+    private
+    def connect
+      addrs = @opts[:addresses].shuffle
+      begin
+        raise "Could not connect to any hosts" if addrs.empty?
+        opts = @opts
+        opts[:address] = addrs.pop
+        Lumberjack::Socket.new(opts)
+      rescue *[Errno::ECONNREFUSED,SocketError]
+        retry
+      end
+    end
+
+    public
+    def write(hash)
+      @socket.write_hash(hash)
+    end
+
+    public
+    def host
+      @socket.host
+    end
+  end
+
+  class Socket
+
+    # Create a new Lumberjack Socket.
+    #
+    # - options is a hash. Valid options are:
+    #
+    # * :port - the port to listen on
+    # * :address - the host/address to bind to
+    # * :ssl_certificate - the path to the ssl cert to use
+    attr_reader :sequence
+    attr_reader :window_size
+    attr_reader :host
+    def initialize(opts={})
+      @sequence = 0
+      @last_ack = 0
+      @opts = {
+        :port => 0,
+        :address => "127.0.0.1",
+        :ssl_certificate => nil,
+        :window_size => 5000
+      }.merge(opts)
+      @host = @opts[:address]
+      @window_size = @opts[:window_size]
+
+      tcp_socket = TCPSocket.new(@opts[:address], @opts[:port])
+      openssl_cert = OpenSSL::X509::Certificate.new(File.read(@opts[:ssl_certificate]))
+      @socket = OpenSSL::SSL::SSLSocket.new(tcp_socket)
+      @socket.connect
+
+      #if @socket.peer_cert.to_s != openssl_cert.to_s
+      #  raise "Client and server certificates do not match."
+      #end
+
+      @socket.syswrite(["1", "W", @window_size].pack("AAN"))
+    end
+
+    private 
+    def inc
+      @sequence = 0 if @sequence+1 > Lumberjack::SEQUENCE_MAX
+      @sequence += 1
+    end
+
+    private
+    def write(msg)
+      compress = Zlib::Deflate.deflate(msg)
+      @socket.syswrite(["1","C",compress.length,compress].pack("AANA#{compress.length}"))
+    end
+
+    public
+    def write_hash(hash)
+      frame = to_frame(hash, inc)
+      ack if (@sequence - @last_ack) >= @window_size
+      write frame
+    end
+
+    private
+    def ack
+      version = @socket.read(1)
+      type = @socket.read(1)
+      raise "Whoa we shouldn't get this frame: #{type}" if type != "A"
+      @last_ack = @socket.read(4).unpack("N").first
+      ack if (@sequence - @last_ack) >= Lumberjack::WINDOW_SIZE
+    end
+
+    private
+    def to_frame(hash, sequence)
+      frame = ["1", "D", sequence]
+      pack = "AAN"
+      keys = deep_keys(hash)
+      frame << keys.length
+      pack << "N"
+      keys.each do |k|
+        val = deep_get(hash,k)
+        key_length = k.length
+        val_length = val.length
+        frame << key_length
+        pack << "N"
+        frame << k
+        pack << "A#{key_length}"
+        frame << val_length
+        pack << "N"
+        frame << val
+        pack << "A#{val_length}"
+      end
+      frame.pack(pack)
+    end
+
+    private
+    def deep_get(hash, key="")
+      return hash if key.nil?
+      deep_get(
+        hash[key.split('.').first],
+        key[key.split('.').first.length+1..key.length]
+      )
+    end
+
+    private
+    def deep_keys(hash, prefix="")
+      keys = []
+      hash.each do |k,v|
+        keys << "#{prefix}#{k}" if v.class == String
+        keys << deep_keys(hash[k], "#{k}.") if v.class == Hash
+      end
+      keys.flatten
+    end
+  end
+end

data/lib/lumberjack/server.rb

@@ -127,8 +127,7 @@ module Lumberjack
         return @io.read(bytes)
       elsif @buffer.length > bytes
         #puts "reading buffered"
-        data = @buffer[0...bytes]
-        @buffer[0...bytes] = ""
+        data = @buffer.slice!(0...bytes)
         return data
       else
         data = @buffer.clone

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jls-lumberjack
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies: []
 description: lumberjack log transport library
 email:
@@ -19,6 +19,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/lumberjack/server.rb
+- lib/lumberjack/client.rb
 homepage: https://github.com/jordansissel/lumberjack
 licenses: []
 post_install_message: