mysql_binlog 0.1.7 → 0.1.8

data/bin/mysql_binlog_dump

@@ -9,8 +9,10 @@ reader = BinlogFileReader.new(ARGV.first)
 #reader = DebuggingReader.new(reader, :data => true, :calls => true)
 binlog = Binlog.new(reader)
 
-binlog.ignore_rotate = true
+#reader.tail = true
+#binlog.ignore_rotate = true
 
 binlog.each_event do |event|
   pp event
+  puts
 end

data/lib/mysql_binlog.rb

@@ -1,3 +1,4 @@
+require 'mysql_binlog/mysql_character_set'
 require 'mysql_binlog/binlog'
 require 'mysql_binlog/binlog_field_parser'
 require 'mysql_binlog/binlog_event_parser'

data/lib/mysql_binlog/binlog_event_parser.rb

@@ -169,9 +169,9 @@ module MysqlBinlog
           }
         when :charset
           {
-            :character_set_client => parser.read_uint16,
-            :collation_connection => parser.read_uint16,
-            :collation_server     => parser.read_uint16,
+            :character_set_client => COLLATION[parser.read_uint16],
+            :collation_connection => COLLATION[parser.read_uint16],
+            :collation_server     => COLLATION[parser.read_uint16],
           }
         when :time_zone
           parser.read_lpstring

data/lib/mysql_binlog/reader/binlog_file_reader.rb

@@ -1,16 +1,17 @@
 module MysqlBinlog
   # Read a binary log from a file on disk.
   class BinlogFileReader
+    attr_accessor :tail
+
     def initialize(filename)
-      @filename = filename
-      @binlog = nil
-      
+      @tail = false
       open_file(filename)
     end
 
     def open_file(filename)
-      @filename = filename
-      @binlog = File.open(filename, mode="r")
+      @dirname  = File.dirname(filename)
+      @filename = File.basename(filename)
+      @binlog   = File.open(filename, mode="r")
 
       if (magic = read(4).unpack("V").first) != 1852400382
         raise MalformedBinlogException.new("Magic number #{magic} is incorrect")
@@ -18,8 +19,18 @@ module MysqlBinlog
     end
 
     def rotate(filename, position)
-      open_file(filename)
-      seek(position)
+      retries = 10
+      begin
+        open_file(@dirname + "/" + filename)
+        seek(position)
+      rescue Errno::ENOENT
+        if (retries -= 1) > 0
+          sleep 0.01
+          retry
+        else
+          raise
+        end
+      end
     end
 
     def filename
@@ -39,6 +50,7 @@ module MysqlBinlog
     end
   
     def end?
+      return false if tail
       @binlog.eof?
     end
 
@@ -51,6 +63,12 @@ module MysqlBinlog
     end
 
     def read(length)
+      if tail
+        needed_position = position + length
+        while @binlog.stat.size < needed_position
+          sleep 0.02
+        end
+      end
       return "" if length == 0
       data = @binlog.read(length)
       if !data

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mysql_binlog
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Jeremy Cole
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-29 00:00:00 Z
+date: 2012-07-02 00:00:00 Z
 dependencies: []
 
 description: Library for parsing MySQL binary logs in Ruby
@@ -69,3 +69,4 @@ specification_version: 3
 summary: MySQL Binary Log Parser
 test_files: []
 
+has_rdoc: