codeclimate 0.35.0 → 0.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fc6f49738750affec64ab80ccf8307efec1b9d2
-  data.tar.gz: f1f7e789e916727190cc0059761f50640a2b955f
+  metadata.gz: 6a645991c744635df303a345f6a2e82d0fdbe355
+  data.tar.gz: f9ee567049514596fb20c7e28c2cc7a9e24ff7c1
 SHA512:
-  metadata.gz: 56e5a24c670d7ea80026c73e21ebc7afb4518760a3951bb3256b5eeb3265ced74d24f0323421849d26640355bbf8ad7859dca1fc936f6ea2caf7140aba0a96ca
-  data.tar.gz: cce1f4745d9b8a85e556ba66cdefef80c1fca52abcb735c61b194866359de988e77276c63a9cb544fd7fc000e191f97c82597a53836ec6229f9cff37e41241bd
+  metadata.gz: 43ded224e244ecac15204adbb16adfe4811c8601c99e336f52dd0d3c84a3196cf76c03e5384521cb959757206f9f28f0d6c8f6e5401bae117e9b93aef8ff9bac
+  data.tar.gz: 5d7a6c904e5b7e44ccb9b6f24ee0bac6b0b841f10995490aa79cc1b4a2df54b5a9f6a0f03eded487f13421e90b734577188966a71c8023cf5f957b939523de6e

data/lib/cc/analyzer/container.rb

@@ -174,6 +174,10 @@ module CC
         Analyzer.logger.warn("killing container name=#{@name} message=#{message.inspect}")
         POSIX::Spawn::Child.new("docker", "kill", @name, timeout: 2.minutes)
         POSIX::Spawn::Child.new("docker", "wait", @name, timeout: 2.minutes)
+      rescue POSIX::Spawn::TimeoutExceeded
+        Analyzer.logger.error("unable to kill container name=#{@name} message=#{message.inspect}")
+        Analyzer.statsd.increment("container.zombie")
+        Analyzer.statsd.increment("container.zombie.#{metric_name}") if metric_name
       end
 
       def timeout
@@ -183,6 +187,14 @@ module CC
       def maximum_output_bytes
         ENV.fetch("CONTAINER_MAXIMUM_OUTPUT_BYTES", DEFAULT_MAXIMUM_OUTPUT_BYTES).to_i
       end
+
+      def metric_name
+        if /^cc-engines-(?<engine>[^-]+)-(?<channel>[^-]+)-/ =~ @name
+          "engine.#{engine}.#{channel}"
+        elsif /^builder-(?<action>[^-]+)-/ =~ @name
+          "builder.#{action}"
+        end
+      end
     end
   end
 end

metadata

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