flydata 0.6.10 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4433b846f5fae0015e2e74d437d7a5eaedefd2b0
-  data.tar.gz: 2c2200d275fe32d66fa73fa435cf86a6a6b3af1e
+  metadata.gz: aa75cb40b7d49f2aeb912086e3e2e35e837cb2e0
+  data.tar.gz: 5234a32b9c3f7e2a40702d4cbeb305e3dbed548b
 SHA512:
-  metadata.gz: eaa62d4f488ee2ff8ca485002f19766011901025388f2ec2af354d7052942eb45c48d75240a3538f6bf5ec3cf1f03205d1612093907d3b74c50f7e6d711b402e
-  data.tar.gz: 7e189040dd501676029432c0e2f22fb2e68f76dc6e5bfd28fea65e77b951278d013c13ecdfcfce50ddaf127e3883fe6d4b9a58bfd3935c7d5c6cfbb095f2b84c
+  metadata.gz: 5482b2ef22c8b0b0e0c49841190fd02829a74811adb8a95f487e2dc9c2f6447bbb2a5e3d6a108a81c035c8886cc11132903cd57f90ccf4b9c076dba4312e7ea2
+  data.tar.gz: 01ccf0a83e53aac78ca543e2b422c0163d9d5775250b7e61317f24d8fd915f1bd8e8cd4d0dcf2bcad7512b89bb7e5c07a51f66392e41898ecf95ba2b2f72e96e

data/Gemfile

@@ -14,7 +14,7 @@ gem "slop", '~> 3.4', '>= 3.4.6'
 gem "treetop", '~> 1.5', '>= 1.5.3'
 gem "sys-filesystem", '~> 1.1', '>= 1.1.3'
 gem "io-console", '~> 0.4.2', '>= 0.4.2'
-gem "kodama", '~> 0.1', '>= 0.1.9'
+gem "kodama", '~> 0.1', '>= 0.1.10'
 gem "serverengine", '~> 1.5'
 
 group :development do

data/Gemfile.lock

@@ -61,8 +61,8 @@ GEM
       rdoc
     json (1.8.1)
     jwt (1.0.0)
-    kodama (0.1.9)
-      ruby-binlog (~> 1.0, >= 1.0.7)
+    kodama (0.1.10)
+      ruby-binlog (~> 1.0, >= 1.0.8)
     method_source (0.8.2)
     mime-types (2.3)
     minitest (4.7.5)
@@ -108,7 +108,7 @@ GEM
     rspec-mocks (3.0.3)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.3)
-    ruby-binlog (1.0.7)
+    ruby-binlog (1.0.8)
     ruby-prof (0.15.1)
     serverengine (1.5.10)
       sigdump (~> 0.2.2)
@@ -138,7 +138,7 @@ DEPENDENCIES
   io-console (~> 0.4.2, >= 0.4.2)
   jeweler (~> 1.8, >= 1.8.8)
   json (~> 1.8, >= 1.8.0)
-  kodama (~> 0.1, >= 0.1.9)
+  kodama (~> 0.1, >= 0.1.10)
   mysql2 (~> 0.3, >= 0.3.17)
   pg (~> 0.18.4)
   protected_attributes (~> 1.0, >= 1.0.8)

data/VERSION

@@ -1 +1 @@
-0.6.10
+0.6.11

data/lib/flydata/command/sender.rb

@@ -110,8 +110,8 @@ EOF
           log_info_stdout('Restarting sender process.') unless options[:quiet]
           begin
             stop(options)
-          rescue => e
-            log_warn_stderr "Something has gone wrong. Force stopping the FlyData process. error:#{e.to_s}"
+          rescue
+            log_warn_stderr 'Something has gone wrong... force stopping the FlyData process...'
             kill_all(options)
           end
         else
@@ -132,7 +132,7 @@ EOF
         `[ -f #{pid_file} ] && pgrep -P \`cat #{pid_file}\``.to_i > 0
       end
       def kill_all(options = {})
-        if Kernel.system("ps x | grep 'flydata' | grep -v grep | grep fluentd | awk '{print \"kill -9 \" $1}' | sh")
+        if Kernel.system("ps ax | grep 'flydata' | grep -v grep | grep fluentd | awk '{print \"kill  \" $1}' | sh")
           log_info_stdout("Done.") unless options[:quiet]
           return true
         else
@@ -192,14 +192,11 @@ EOF
         raise "Somthing has gone wrong... Please try setup command again."
       end
       def wait_until_client_stop(options = {})
-        retry_count = 120
-        show_message_at_retry = 4
+        retry_count = 10
         1.upto(retry_count) do |i|
           return true unless process_exist?
-          Kernel.sleep 5
-          if i % show_message_at_retry == 0
-            log_info_stdout("Waiting for the client to stop...") unless options[:quiet]
-          end
+          log_info_stdout("Waiting for the client to stop... (#{i}/#{retry_count})") unless options[:quiet]
+          Kernel.sleep 3
         end
         false
       end

data/lib/flydata/fluent-plugins/in_mysql_binlog_flydata.rb

@@ -228,8 +228,8 @@ EOS
       begin
         @kodama_client.stop_request
         if wait_till_safe_to_stop
-          @thread.join
-          $log.info "Kodama has stopped successfully"
+          $log.info "Killing Kodama client"
+          Thread.kill(@thread)
         else
           $log.error "Unable to stop Kodama"
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flydata
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
 platform: ruby
 authors:
 - Koichi Fujikawa
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -262,7 +262,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.1.10
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
@@ -272,7 +272,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.1.10
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'