codeclimate 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9029e091203ad945532a72efa3a6a9bcbc5fe260
-  data.tar.gz: da59a443dc7937124d04412d4ecb78d45084da6c
+  metadata.gz: 7c27de0831fa129000098f12d91528b6d7a61f5e
+  data.tar.gz: 14e1310aeb2dd8cc50dad5016e02cde02f0dcae9
 SHA512:
-  metadata.gz: a63ac1cf03401bf46d057063cfa8a7fe46ee576caca883245b89fa032759ff35fc6a3e2afd97cc73213987423779fcfd5338c3eec9a19bfe6a84bc3815a3663e
-  data.tar.gz: f22da43fcabd392da35889b6527f2a18c9384594806b5f783f9346f1c09c09646fa9e43d0a156983a38ff7c1d1f28a048961ca2e04d4eafc49b3e636dcacd7f9
+  metadata.gz: 3f56f4e6b86b97679bda4548368c0cdab0fc50a64ef4ec3f6d4aced78d50c904d42a5b06afd77427bc741742e7c178da90b629be4630ae1f84dbaeaab5f8dc67
+  data.tar.gz: 5853393a51ff7096529f683224df9788a81d110aaa27019fbb7e2917eca620f2e9c53af99f38fbd2114fd8ad9c7878c81ad84bff0e6687071e7ee945f7b90449

data/lib/cc/analyzer/engine.rb

@@ -17,8 +17,8 @@ module CC
       end
 
       def run(stdout_io, stderr_io = StringIO.new)
+        timed_out = false
         pid, _, out, err = POSIX::Spawn.popen4(*docker_run_command)
-        engine_running = true
         Analyzer.statsd.increment("cli.engines.started")
 
         t_out = Thread.new do
@@ -35,35 +35,34 @@ module CC
           end
         end
 
-        Thread.new do
+        t_timeout = Thread.new do
           sleep TIMEOUT
-
-          if engine_running
-            Thread.current.abort_on_exception = true
-            run_command("docker kill #{container_name}")
-
-            Analyzer.statsd.increment("cli.engines.result.error")
-            Analyzer.statsd.increment("cli.engines.result.error.timeout")
-            Analyzer.statsd.increment("cli.engines.names.#{name}.result.error")
-            Analyzer.statsd.increment("cli.engines.names.#{name}.result.error.timeout")
-            raise EngineTimeout, "engine #{name} ran past #{TIMEOUT} seconds and was killed"
-          end
+          run_command("docker kill #{container_name} || true")
+          timed_out = true
         end
 
         pid, status = Process.waitpid2(pid)
-        engine_running = false
+        t_timeout.kill
+
         Analyzer.statsd.increment("cli.engines.finished")
 
-        if status.success?
+        if timed_out
+          Analyzer.statsd.increment("cli.engines.result.error")
+          Analyzer.statsd.increment("cli.engines.result.error.timeout")
+          Analyzer.statsd.increment("cli.engines.names.#{name}.result.error")
+          Analyzer.statsd.increment("cli.engines.names.#{name}.result.error.timeout")
+          raise EngineTimeout, "engine #{name} ran past #{TIMEOUT} seconds and was killed"
+        elsif status.success?
           Analyzer.statsd.increment("cli.engines.names.#{name}.result.success")
           Analyzer.statsd.increment("cli.engines.result.success")
         else
           Analyzer.statsd.increment("cli.engines.names.#{name}.result.error")
           Analyzer.statsd.increment("cli.engines.result.error")
-
           raise EngineFailure, "engine #{name} failed with status #{status.exitstatus} and stderr #{stderr_io.string.inspect}"
         end
       ensure
+        t_timeout.kill if t_timeout
+
         t_out.join if t_out
         t_err.join if t_err
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codeclimate
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Code Climate