serverengine 2.0.1-x64-mingw32 → 2.0.2-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf4b124ad3521434ed25e86c8954a5a5b5381397
-  data.tar.gz: f32d19141aadf8a533d77eeccf2ae4001aed78e2
+  metadata.gz: ecb81bf960bfaf3ef9f3b9ef8cd6ca77835bb473
+  data.tar.gz: 84c3d6e12eb76f81a1768daafb5e78c9b355857d
 SHA512:
-  metadata.gz: a57e06848c5eac9e410e7f6e78bc6bf2bd61ce7a95df1e825a0185360b3e64523ef8a76655e9e787fe0a19eec7f50a01d68240591d6009a0731116364bc07da8
-  data.tar.gz: 1a01938dac11d1e9edf66e31c29f7ff11d1b88bf8bfa198dc29ada81c745371023d3efeaddd44e674b5e0d9eb738fd518f6a36cb60c73e0c7fbc039a9192634b
+  metadata.gz: 5a9dde3a277416f1665b8559300ea7248ff6a8fc3b611505fc7febae2462df00a240eb4c124290cd7fe7c0c962431f566c4022590634615ffd5f11aac424fd44
+  data.tar.gz: 2479f98f06b7298cafc88b66f7c03829f07469f5bf8c02b5816c98aee9ec3be1df7950c3dfe8341bb08c10bc21be96a53fc671ec22861bec1faccc0dcd8222b0

data/Changelog

@@ -1,3 +1,8 @@
+2016-11-17 version 2.0.2:
+
+* Fix bug to make busy loop on Windows
+* Fix bug to execute unexpected "find" command on Windows
+
 2016-10-18 version 2.0.1:
 
 * Fix to set GID before UID, to make it sure to set GID with superuser privilege

data/lib/serverengine/process_manager.rb

@@ -239,34 +239,33 @@ module ServerEngine
         raise AlreadyClosedError.new
       end
 
-      time ||= Time.now
+      if @rpipes.empty?
+        sleep blocking_timeout if blocking_timeout > 0
+        return nil
+      end
 
-      unless ServerEngine.windows?
-        # heartbeat is not supported on Windows platform.
+      if ServerEngine.windows?
+        raise "heartbeat is not supported on Windows platform. @rpipes must be empty."
+      end
 
-        if @rpipes.empty?
-          sleep blocking_timeout if blocking_timeout > 0
-          return nil
-        end
+      time = Time.now
+      ready_pipes, _, _ = IO.select(@rpipes.keys, nil, nil, blocking_timeout)
 
-        ready_pipes, _, _ = IO.select(@rpipes.keys, nil, nil, blocking_timeout)
-
-        if ready_pipes
-          ready_pipes.each do |r|
-            begin
-              r.read_nonblock(1024, @read_buffer)
-            rescue Errno::EAGAIN, Errno::EINTR
-              next
-            rescue #EOFError
-              m = @rpipes.delete(r)
-              m.start_immediate_stop!
-              r.close rescue nil
-              next
-            end
+      if ready_pipes
+        ready_pipes.each do |r|
+          begin
+            r.read_nonblock(1024, @read_buffer)
+          rescue Errno::EAGAIN, Errno::EINTR
+            next
+          rescue #EOFError
+            m = @rpipes.delete(r)
+            m.start_immediate_stop!
+            r.close rescue nil
+            next
+          end
 
-            if m = @rpipes[r]
-              m.last_heartbeat_time = time
-            end
+          if m = @rpipes[r]
+            m.last_heartbeat_time = time
           end
         end
       end

data/lib/serverengine/socket_manager.rb

@@ -61,7 +61,7 @@ module ServerEngine
       def self.generate_path
         if ServerEngine.windows?
           for port in 10000..65535
-            if `netstat -na | find "#{port}"`.length == 0
+            if `netstat -na | findstr "#{port}"`.length == 0
               return port
             end
           end

data/lib/serverengine/version.rb

@@ -1,3 +1,3 @@
 module ServerEngine
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverengine
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: x64-mingw32
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sigdump