diff --git a/lib/mongo/cursor.rb b/lib/mongo/cursor.rb index dd6b590..427824b 100644 --- a/lib/mongo/cursor.rb +++ b/lib/mongo/cursor.rb @@ -18,9 +18,6 @@ require 'mongo/message' require 'mongo/util/byte_buffer' require 'mongo/util/bson' -require 'logger' -LOG = Logger.new('recv_file.log', 'daily') - module XGen module Mongo module Driver @@ -168,10 +165,7 @@ module XGen def read_response_header header_buf = ByteBuffer.new - read = @db.receive_full(RESPONSE_HEADER_SIZE) - header_buf.put_array(read.unpack("C*")) - LOG.debug "resp head: #{read.inspect}\n" - raise "BAD SIZE" unless read.length == RESPONSE_HEADER_SIZE + header_buf.put_array(@db.receive_full(RESPONSE_HEADER_SIZE).unpack("C*")) raise "Short read for DB response header; expected #{RESPONSE_HEADER_SIZE} bytes, saw #{header_buf.length}" unless header_buf.length == RESPONSE_HEADER_SIZE header_buf.rewind @result_flags = header_buf.get_int @@ -206,16 +200,10 @@ module XGen def object_from_stream buf = ByteBuffer.new - read1 = @db.receive_full(4) - buf.put_array(read1.unpack("C*")) - LOG.debug "size: #{read1.inspect}\n" - raise "BAD SIZE" unless read1.length == 4 + buf.put_array(@db.receive_full(4).unpack("C*")) buf.rewind size = buf.get_int - read2 = @db.receive_full(size - 4) - buf.put_array(read2.unpack("C*"), 4) - LOG.debug "body: #{read2.inspect}\n" - raise "BAD SIZE" unless read2.length == size - 4 + buf.put_array(@db.receive_full(size - 4).unpack("C*"), 4) @n_remaining -= 1 buf.rewind BSON.new.deserialize(buf) diff --git a/lib/mongo/message/message_header.rb b/lib/mongo/message/message_header.rb index 0e56d94..cf1ffc0 100644 --- a/lib/mongo/message/message_header.rb +++ b/lib/mongo/message/message_header.rb @@ -16,9 +16,6 @@ require 'mongo/util/byte_buffer' -require 'logger' -LOG = Logger.new('recv_file.log', 'daily') - module XGen module Mongo module Driver @@ -33,10 +30,7 @@ module XGen def read_header(db) @buf.rewind - read = db.receive_full(HEADER_SIZE) - @buf.put_array(read.unpack("C*")) - LOG.debug "header: #{read.inspect}\n" - raise "BAD SIZE" unless read.length == HEADER_SIZE + @buf.put_array(db.receive_full(HEADER_SIZE).unpack("C*")) raise "Short read for DB response header: expected #{HEADER_SIZE} bytes, saw #{@buf.size}" unless @buf.size == HEADER_SIZE @buf.rewind @size = @buf.get_int