mongo-oplog-backup 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fd77128ff3c7a9fea813efd8fdb04197c7cb42b
-  data.tar.gz: 644387bdbdf649dca6527d7e1a0636043f1e3aee
+  metadata.gz: 1ee5f2e07aafef152cc9122c0857a8546159fb1e
+  data.tar.gz: 29c70641a560009a829822a0925c827ca9b24854
 SHA512:
-  metadata.gz: 23665952e8feafd8ef03cdb792b59e07d067a516e1234f64c38884bcfa074563b9a53f0a84adac0e072b912d803b1434272fcf732b6628dfb3901f26ed28233b
-  data.tar.gz: 66147160a921815228d5333621e2a082f18653f998014e84a75d2a122b9896cc30c9f9307f1a49fafaed1c517070953617157aae8e949809eee6a336d679a2f5
+  metadata.gz: da1308e0f5e15a7a3b89816cdea169bf60801f2adecb5d4ae8a14fcdb46a858aa1fb3ec455e9af73ba332af1f55932416859b9ba638dba5d51fe8bb3274727d4
+  data.tar.gz: 4728871d1ca7b05fec204ddb66c5a66918fc4a3e4c9cddc89c415764f03d074d4426cd0704a5c94f8abef244894bff5aede96f0c9f2e8d7fee9cd7e624a5c5a1

data/lib/mongo_oplog_backup/command.rb

@@ -71,17 +71,26 @@ module MongoOplogBackup
     def run
       @status = Open3.popen3(*command) do |stdin, stdout, stderr, wait_thr|
         stdin.close_write
-        until all_eof([stdout, stderr])
-          read_available_data(stdout) do |data|
-            @out_blocks.each do |block|
-              block.call(data)
-            end
-          end
-          read_available_data(stderr) do |data|
-            @err_blocks.each do |block|
-              block.call(data)
-            end
+        # until all_eof([stdout, stderr])
+        still_open = [stdout, stderr]
+        until still_open.empty?
+          handles = IO.select(still_open, nil, nil, 0.001)
+
+          unless handles.nil?
+            read_available_data(stdout) do |data|
+              @out_blocks.each do |block|
+                block.call(data)
+              end
+            end if handles[0].include?(stdout)
+
+            read_available_data(stderr) do |data|
+              @err_blocks.each do |block|
+                block.call(data)
+              end
+            end if handles[0].include?(stderr)
           end
+
+          still_open.delete_if { |s| s.closed? }
           sleep 0.001
         end
 
@@ -111,14 +120,10 @@ module MongoOplogBackup
     BLOCK_SIZE = 1024
 
     def read_available_data(io, &block)
-      if io.ready?
-        data = io.read_nonblock(BLOCK_SIZE)
-        block.call data
-      end
-    end
-
-    def all_eof(files)
-      files.find { |f| !f.eof }.nil?
+      data = io.read_nonblock(BLOCK_SIZE)
+      block.call data
+    rescue EOFError
+      io.close
     end
   end
 end

data/lib/mongo_oplog_backup/version.rb

@@ -1,3 +1,3 @@
 module MongoOplogBackup
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/command_spec.rb

@@ -24,7 +24,7 @@ describe MongoOplogBackup::Command do
   it 'should log' do
     io = StringIO.new
     logger = Logger.new io
-    MongoOplogBackup::Command.execute(['ruby', '-e', 'puts "BAR"; $stderr.puts "FOO"'], logger: logger)
+    MongoOplogBackup::Command.execute(['ruby', '-e', 'puts "BAR"; $stdout.flush; $stderr.puts "FOO"'], logger: logger)
     io.rewind
     log = io.read
     log.should =~ /D, \[.+\] DEBUG -- : BAR\nE, \[.+\] ERROR -- : FOO\n/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongo-oplog-backup
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Ralf Kistner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson