serverengine 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a43da4f1758e3afce58c84f0b4d1afe36af3aba
-  data.tar.gz: 112970facbae6d06a9a5ca76d8b2f3fbfb492eb9
+  metadata.gz: 88edf590d3f97fedd199f51227518ffbd83316fd
+  data.tar.gz: 43dba794102f403da6535e19883a7d19034449a2
 SHA512:
-  metadata.gz: dd452852d50e00fe0c6bcca020ea861c9a758ec42935318425ee97328ed2bde55470109ef179103751455c4fe8c322c076963e04269ce77245a07c5e9954a97a
-  data.tar.gz: ff08f2317fdce20b8b617c0c79c39076b4028575417d558638acb0bd31689f19b8fb9215b03bedc6f874cb3038d98f529cf685c696ff5d68b4996c6d2aa6b039
+  metadata.gz: e71bfefefd9f62d0ec79b6122bb2308b03b8b8da8cc098993e444b3f27ba5daf23b74460ac219424412368db615b383c0fccd97ca48c9045eb6163996e8b4efd
+  data.tar.gz: ff2a3415ecb2d0f6a35f7e940d7bd9e6a1596aaa7a59c0b3954ca85477e0a6f5cc8015fec8366dce85d2212bd7b83df6834af40653c3712bb3fc38d734940f69

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: ruby
 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