jls-lumberjack 0.0.19 → 0.0.20

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 257e7277d9d370246671e1a117e9102674386177
+  data.tar.gz: be48c31b83ccecc610c152a1c928f8040dd3a1dd
+SHA512:
+  metadata.gz: 998a1720267a70608f3061a661624d420875e66bef41eba4193047815319023da6de7365d0b934ee1983f96c4ee8e28e6730af77e687ab5dd5accca2294141f9
+  data.tar.gz: 698db79fc9618f656d4767baa2bbbf058268d768744e9d38d75841acca8af4b6fcad9908221c63fff589289516ea77387822b3438346487428d932df70079874

data/lib/lumberjack/client.rb

@@ -100,7 +100,7 @@ module Lumberjack
     public
     def write_hash(hash)
       frame = to_frame(hash, inc)
-      ack if (@sequence - @last_ack) >= @window_size
+      ack if (@sequence - (@last_ack + 1)) >= @window_size
       write frame
     end
 
@@ -110,7 +110,7 @@ module Lumberjack
       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) >= @window_size
+      ack if (@sequence - (@last_ack + 1)) >= @window_size
     end
 
     private

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jls-lumberjack
 version: !ruby/object:Gem::Version
-  version: 0.0.19
-  prerelease: 
+  version: 0.0.20
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies: []
 description: lumberjack log transport library
 email:
@@ -19,31 +18,29 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/lumberjack/server.rb
-- lib/lumberjack/server2.rb
 - lib/lumberjack/client.rb
 homepage: https://github.com/jordansissel/lumberjack
-licenses: []
+licenses:
+- Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: lumberjack log transport library
 test_files: []
-has_rdoc: 

data/lib/lumberjack/server2.rb

@@ -1,82 +0,0 @@
-require "ffi-rzmq"
-require "zlib"
-require "rbnacl"
-require "json"
-
-module Lumberjack
-  class Server2
-    # Create a new Lumberjack server.
-    #
-    # - options is a hash. Valid options are:
-    #
-    # * :port - the port to listen on
-    # * :address - the host/address to bind to
-    def initialize(options={})
-      @options = {
-        :endpoint => "tcp://0.0.0.0:3333",
-        :my_secret_key => nil,
-        :their_public_key => nil,
-      }.merge(options)
-
-      [:my_secret_key, :their_public_key].each do |k|
-        if @options[k].nil?
-          raise "You must specify #{k} in Lumberjack::Server.new(...)"
-        end
-      end
-
-      @context = ZMQ::Context.new
-      @socket = @context.socket(ZMQ::REP)
-      @socket.bind(@options[:endpoint])
-
-      @cryptobox = Crypto::Box.new(
-        Crypto::PublicKey.new(@options[:their_public_key]),
-        Crypto::PrivateKey.new(@options[:my_secret_key]))
-    end # def initialize
-
-    def run(&block)
-      ciphertext = ""
-      ciphertext.force_encoding("BINARY")
-      nonce = ""
-      nonce.force_encoding("BINARY")
-      count = 0
-      start = Time.now
-      while true
-        @socket.recv_string(nonce)
-        @socket.recv_string(ciphertext)
-
-        # Decrypt
-        plaintext = @cryptobox.open(nonce, ciphertext)
-
-        # decompress
-        inflated = Zlib::Inflate.inflate(plaintext)
-
-        # JSON
-        events = JSON.parse(inflated)
-        events.each do |event|
-          yield event
-        end
-
-        # TODO(sissel): yield each event
-        count += events.count
-        @socket.send_string("")
-        #count += 4096
-
-        if count > 100000
-          puts :rate => (count / (Time.now - start))
-          count = 0
-          start = Time.now
-        end
-      end
-    end # def run
-  end # class Server2
-end # module Lumberjack
-
-if __FILE__ == $0
-  a = Lumberjack::Server2.new(
-    :their_public_key => File.read("../../nacl.public").force_encoding("BINARY"),
-    :my_secret_key => File.read("../../nacl.secret").force_encoding("BINARY"))
-
-  a.run do |e|
-    p :event => e
-  end
-end