coursemology-evaluator 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2361d90ee822c05a9e26b9217eeaa788326d1119
-  data.tar.gz: 3bcad2014eecd4ea44c79ea5a3855fc1d894ef44
+  metadata.gz: fb396ac979a791b3d79224f80b88fa8ffb60b142
+  data.tar.gz: d3fd4e275fea14998d7b66a61c36f935f78f85a9
 SHA512:
-  metadata.gz: 75fa50f0c17da2ed28a29a6384a58c47dffd23158ff924cd65983e243fa2c8f3b9c76721c5b19a3108c094b3bbc795fc25a58b5b5f18a12b50b0a2696273eb60
-  data.tar.gz: 5cc695d5a5eb9fccc4c9217474dde9bae852e6ae8df03d55bc10464b02e4ac7b04626b6fcc374ff62bf78a6f124140bba6ca008f910af921f9bd4d645135fa35
+  metadata.gz: 3d33529e852271ea6c3a81e5e2c0732aea4614623bf550d0dc4ac40740b23d8659b9eaec7a516eedf1c7367af6563353ad9de799f7387687b917c2fce0f0b8a6
+  data.tar.gz: 886203828c1fb1dcc2a42ede52600b23837523ad9ca41594d7322406cec834bdf3b8c8cafac77741bbcfc8e25900b12d06fe41631d5d4942cd30716525588e94

data/lib/coursemology/evaluator.rb

@@ -28,6 +28,9 @@ module Coursemology::Evaluator
   # The logger to use for the client.
   mattr_reader(:logger) { ActiveSupport::Logger.new(STDOUT) }
 
+  # The cache to use for the client.
+  mattr_reader(:cache) { ActiveSupport::Cache.lookup_store }
+
   def self.eager_load!
     super
     Coursemology::Polyglot.eager_load!

data/lib/coursemology/evaluator/client.rb

@@ -15,25 +15,28 @@ class Coursemology::Evaluator::Client
 
   def run
     Signal.trap('SIGTERM', method(:on_sig_term))
+    loop(&method(:client_loop))
+  end
 
-    loop do
-      evaluations = allocate_evaluations
+  private
 
-      if evaluations && !evaluations.empty?
-        on_allocate(evaluations)
-      else
-        # :nocov:
-        # This sleep might not be triggered in the specs, because interruptions to the thread is
-        # nondeterministically run by the OS scheduler.
-        sleep(1.minute)
-        # :nocov:
-      end
+  # Performs one iteration of the client loop.
+  def client_loop
+    evaluations = allocate_evaluations
+    if evaluations && !evaluations.empty?
+      on_allocate(evaluations)
+    else
+      raise StopIteration if @terminate
 
-      break if @terminate
+      # :nocov:
+      # This sleep might not be triggered in the specs, because interruptions to the thread is
+      # nondeterministically run by the OS scheduler.
+      sleep(1.minute)
+      # :nocov:
     end
-  end
 
-  private
+    raise StopIteration if @terminate
+  end
 
   # Requests evaluations from the server.
   #

data/lib/coursemology/evaluator/docker_container.rb

@@ -15,12 +15,31 @@ class Coursemology::Evaluator::DockerContainer < Docker::Container
 
     private
 
+    # Pulls the given image from Docker Hub.
+    #
+    # This caches images for 5 minutes, because the overhead for querying for images is quite high.
+    #
+    # @param [String] image The image to pull.
     def pull_image(image)
       ActiveSupport::Notifications.instrument('pull.docker.evaluator.coursemology',
-                                              image: image) do
-        Docker::Image.create('fromImage' => image)
+                                              image: image) do |payload|
+        cached([:image, image], expires_in: 5.minutes) do
+          Docker::Image.create('fromImage' => image)
+          payload[:cached] = false
+        end
       end
     end
+
+    # Cache the result of the given block using the key given.
+    #
+    # @param [Array, String, Symbol] key The key to use. This will be expanded with
+    #   +ActiveSupport::Cache.expand_cache_key+.
+    # @param [Hash] options The options to use. These are the same as
+    #   +ActiveSupport::Cache::Store#fetch+.
+    def cached(key, options = {}, &proc)
+      key = ActiveSupport::Cache.expand_cache_key(key, name.underscore)
+      Coursemology::Evaluator.cache.fetch(key, options, &proc)
+    end
   end
 
   # Waits for the container to exit the Running state.

data/lib/coursemology/evaluator/logging/docker_log_subscriber.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 class Coursemology::Evaluator::Logging::DockerLogSubscriber < ActiveSupport::LogSubscriber
   def pull(event)
-    info "#{color("Docker Pull (#{event.duration.round(1)}ms)", GREEN)} #{event.payload[:image]}"
+    cached = event.payload[:cached].nil? || event.payload[:cached] ? 'Cached ' : ''
+    header_colour = cached ? GREEN : YELLOW
+    info "#{color("#{cached}Docker Pull (#{event.duration.round(1)}ms)", header_colour)} "\
+      "#{event.payload[:image]}"
   end
 
   def create(event)

data/lib/coursemology/evaluator/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Coursemology; end
 module Coursemology::Evaluator
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coursemology-evaluator
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Joel Low
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler