mongoriver 0.2.0 → 0.3.0

data/bin/watch-oplog

@@ -25,7 +25,7 @@ module Mongoriver
 end
 
 def main
-  options = {:host => nil, :port => nil, :type => :direct, :optime => 0, :pause => true, :verbose => 0}
+  options = {:host => nil, :port => nil, :type => :direct, :optime => nil, :pause => true, :verbose => 0}
   optparse = OptionParser.new do |opts|
     opts.banner = "Usage: #{$0} [options]"
 
@@ -77,7 +77,7 @@ def main
     end
   end
 
-  stream.run_forever
+  stream.run_forever(options[:optime])
   return 0
 end
 

data/lib/mongoriver/abstract_persistent_tailer.rb

@@ -15,11 +15,9 @@ module Mongoriver
       @last_read        = nil
     end
 
-    def tail_from(ts, opts={})
-      if ts.nil?
-        ts = read_timestamp
-      end
-      super(ts, opts)
+    def tail(opts={})
+      opts[:from] ||= read_timestamp
+      super(opts)
     end
 
     def stream(limit=nil)

data/lib/mongoriver/stream.rb

@@ -23,9 +23,9 @@ module Mongoriver
 
     def run_forever(starting_timestamp=nil)
       if starting_timestamp
-        @tailer.tail_from(optime_from_ts(starting_timestamp))
+        @tailer.tail(:from => optime_from_ts(starting_timestamp))
       else
-        @tailer.tail_from
+        @tailer.tail
       end
 
       until @stop
@@ -166,4 +166,4 @@ module Mongoriver
       trigger(:create_collection, db_name, collection_name, options)
     end
   end
-end
+end

data/lib/mongoriver/tailer.rb

@@ -67,23 +67,31 @@ module Mongoriver
       @upstream_conn.db('local').collection(oplog)
     end
 
-    def tail_from(ts, opts = {})
+    def tail(opts = {})
       raise "Already tailing the oplog!" if @cursor
 
-      # Maybe if ts is old enough, just start from the beginning?
-      query = (opts[:filter] || {}).merge({ 'ts' => { '$gte' => ts } })
+      query = opts[:filter] || {}
+      if ts = opts[:from]
+        # Maybe if ts is old enough, just start from the beginning?
+        query['ts'] = { '$gte' => ts }
+      end
 
       oplog_collection.find(query, :timeout => false) do |oplog|
         oplog.add_option(Mongo::Constants::OP_QUERY_TAILABLE)
-        oplog.add_option(Mongo::Constants::OP_QUERY_OPLOG_REPLAY)
-
+        oplog.add_option(Mongo::Constants::OP_QUERY_OPLOG_REPLAY) if query['ts']
         oplog.add_option(Mongo::Constants::OP_QUERY_AWAIT_DATA) unless opts[:dont_wait]
 
-        log.info("Starting oplog stream from #{ts}")
+        log.info("Starting oplog stream from #{ts || 'start'}")
         @cursor = oplog
       end
     end
 
+    # Deprecated: use #tail(:from => ts, ...) instead
+    def tail_from(ts, opts={})
+      opts.merge(:from => ts)
+      tail(opts)
+    end
+
     def stream(limit=nil)
       count = 0
       while !@stop && @cursor.has_next?

data/lib/mongoriver/version.rb

@@ -1,3 +1,3 @@
 module Mongoriver
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoriver
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo