codeclimate 0.35.1 → 0.35.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a645991c744635df303a345f6a2e82d0fdbe355
-  data.tar.gz: f9ee567049514596fb20c7e28c2cc7a9e24ff7c1
+  metadata.gz: d89520fad83fbb50d3b157b90ab06e0570e33efe
+  data.tar.gz: c940f78b63be95cb4b83809324c5598673fe4359
 SHA512:
-  metadata.gz: 43ded224e244ecac15204adbb16adfe4811c8601c99e336f52dd0d3c84a3196cf76c03e5384521cb959757206f9f28f0d6c8f6e5401bae117e9b93aef8ff9bac
-  data.tar.gz: 5d7a6c904e5b7e44ccb9b6f24ee0bac6b0b841f10995490aa79cc1b4a2df54b5a9f6a0f03eded487f13421e90b734577188966a71c8023cf5f957b939523de6e
+  metadata.gz: b8b0eab306b1f7a8cbc8070a59347b8275973a4fd9ab21352dd6e9cad99489f87503d4e6d1310a11f92c81bfd824ad16de4b2b4dd18728de4b66850a09be1319
+  data.tar.gz: d706dc63889d0c8538f9efeb453cca2bba267b3542e8ff61f0aa60902c9377caf7b408c95159d4574a0d838ffc531db94585e12ca9b5e29949a3d5afe6de6acc

data/lib/cc/analyzer/container.rb

@@ -56,9 +56,13 @@ module CC
         @t_err = read_stderr(err)
         t_timeout = timeout_thread
 
-        # blocks until the engine stops. there may still be stdout in flight if
-        # it was being produced more quickly than consumed.
-        _, status = Process.waitpid2(pid)
+        # blocks until the engine stops. this is put in a thread so that we can
+        # explicitly abort it as part of #stop. otherwise a run-away container
+        # could still block here forever if the docker-kill/wait is not
+        # successful. there may still be stdout in flight if it was being
+        # produced more quickly than consumed.
+        @t_wait = Thread.new { _, @status = Process.waitpid2(pid) }
+        @t_wait.join
 
         # blocks until all readers are done. they're still governed by the
         # timeout thread at this point. if we hit the timeout while processing
@@ -71,11 +75,11 @@ module CC
           @listener.timed_out(container_data(duration: duration))
         else
           duration = ((Time.now - started) * 1000).round
-          @listener.finished(container_data(duration: duration, status: status))
+          @listener.finished(container_data(duration: duration, status: @status))
         end
 
         Result.new(
-          status.exitstatus,
+          @status && @status.exitstatus,
           @timed_out,
           duration,
           @maximum_output_exceeded,
@@ -90,6 +94,7 @@ module CC
       def stop(message = nil)
         reap_running_container(message)
         kill_reader_threads
+        kill_wait_thread
       end
 
       private
@@ -170,6 +175,10 @@ module CC
         @t_err.kill if @t_err
       end
 
+      def kill_wait_thread
+        @t_wait.kill if @t_wait
+      end
+
       def reap_running_container(message)
         Analyzer.logger.warn("killing container name=#{@name} message=#{message.inspect}")
         POSIX::Spawn::Child.new("docker", "kill", @name, timeout: 2.minutes)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate
 version: !ruby/object:Gem::Version
-  version: 0.35.1
+  version: 0.35.2
 platform: ruby
 authors:
 - Code Climate
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport