codeclimate 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4a00a5adf7f1cc2a98901ee4a953bbd233322a9
-  data.tar.gz: e3bf21594ba21e22cff4853599af010034f814c5
+  metadata.gz: d8770af90b8e05963dd995c4c142087ac71eeada
+  data.tar.gz: 99311aa7a9bc5bdc9ad6ab6461897682de279ea4
 SHA512:
-  metadata.gz: 3d3baaf44cc288437df80e49cf0772271754a9e0aea94998273039ac97ff63ab2910cfbff653bf64e29cc0af2fb2e2654acccc3f8a46ce22439235787158dcc5
-  data.tar.gz: 873bf1aadaf48ab5f104bff2b8bcccbc5e44fd74505dfef9f236909e7a7b7c8418fc924aae61032ed60b1a3399f50c533b18cc314bfea402d73a0f0d65f05431
+  metadata.gz: c984c9afbf2061cdc1a7d8ca1b1f3ef771d9204f85a4402aa3719c8a884dd1bc6306e4e4462ddffa3062eef6759cef19318cf43d72df144a0a88bf5230455486
+  data.tar.gz: a848435feb31a98567fdc6a7f767df578b617a07ee798c4ed847fd1c50fbd6e5f7d9ca71cd8a82e3193b8f68382c5cb2ed09b68eaa40be4a139d11049071aa03

data/lib/cc/analyzer/container.rb

@@ -42,13 +42,13 @@ module CC
         started = Time.now
         @listener.started(container_data)
 
-        @pid, _, out, err = POSIX::Spawn.popen4(*docker_run_command(options))
+        pid, _, out, err = POSIX::Spawn.popen4(*docker_run_command(options))
 
         t_out = read_stdout(out)
         t_err = read_stderr(err)
-        t_timeout = timeout_thread(@pid)
+        t_timeout = timeout_thread
 
-        _, status = Process.waitpid2(@pid)
+        _, status = Process.waitpid2(pid)
         if @timed_out
           @listener.timed_out(container_data(duration: @timeout))
         else
@@ -70,9 +70,7 @@ module CC
         # Prevents the processing of more output after first error
         @on_output = ->(*) { }
 
-        Process.kill("TERM", @pid) if @pid
-      rescue Errno::ESRCH
-        Analyzer.statsd.increment("container.kill_process_rescue")
+        reap_running_container
       end
 
       private
@@ -104,17 +102,22 @@ module CC
         end
       end
 
-      def timeout_thread(pid)
+      def timeout_thread
         Thread.new do
           sleep @timeout
           @timed_out = true
-          Process.kill("KILL", pid)
+          reap_running_container
         end
       end
 
       def container_data(duration: nil, status: nil)
         ContainerData.new(@image, @name, duration, status, @stderr_io.string)
       end
+
+      def reap_running_container
+        Analyzer.logger.warn("killing container name=#{@name}")
+        POSIX::Spawn::Child.new("docker", "kill", @name)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Code Climate
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Code Climate CLI