caddy 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 557e6259f9f172bdaf516e829bb169d8a89663f9
-  data.tar.gz: 0f36ca38a97ff49e466d97206823e1ad78c1e34b
+  metadata.gz: 37c9cbaa3ab3273b12d27046c3723417437e1e6d
+  data.tar.gz: 4111cd80d00e965f691e0eb312d397c7c80bb28a
 SHA512:
-  metadata.gz: b54cbcab570b82c83f97d7e78823ee6affa185cfb8ec1f6edf9d81c6fd8ec01454266cdc496cbea6c656f8acf545c5b2e05ac1122eff5fcedd0805c5ef1468e6
-  data.tar.gz: 0a6b074bb61328edbd8ee7bfc05e94ab2fcca3d75f64b2e1a1cb5f44a981780e16f7b77fee5df06a707d3b38f92e7151c2c150f0de8d5ec5aaeb43c04dc00e94
+  metadata.gz: bbbcaed1cee1a6d39f4eec77632679360386de76933e3dabf4160e04948891cc2ef71afa13d8f0afda68509d038034df8d3537b75453c3b66c6f5d057f3c19f7
+  data.tar.gz: 8227f5b289ccb13b667ca407a05ad71aa30d36a195677de1063dc0f3bad7b7144dc95795fcfc35d057ead60b08906580b0a3bc0b2d6a76fb8fcb09c58ebbdeea

data/README.md

@@ -22,6 +22,20 @@ def index
 end
 ```
 
+## Using Caddy with Spring (in development)
+
+For testing Caddy in development with Spring, you need to have Caddy start after fork:
+
+```ruby
+# in your caddy.rb initializer, perhaps
+
+if Rails.env.development?
+  Spring.after_fork do
+    Caddy.start
+  end
+end
+```
+
 ## Give it to me!
 
 Add this line to your application's Gemfile:

data/lib/caddy.rb

@@ -1,19 +1,19 @@
+# frozen_string_literal: true
 require "caddy/version"
 require "concurrent/timer_task"
 
 module Caddy
   class << self
-    attr_accessor :refresher
+    attr_accessor :refresher, :refresher_error_handler
     attr_writer :refresh_interval
   end
 
   DEFAULT_REFRESH_INTERVAL = 60
-  REFRESH_INTERVAL_JITTER_PCT = 0.1
-  DEFAULT_INITIAL_VALUE_WAIT = 0.1
+  REFRESH_INTERVAL_JITTER_PCT = 0.15
 
   def self.[](k)
     raise "Please run `Caddy.start` before attempting to access values" unless @task
-    raise "Caddy variable access before initial load; allow some more time for your system to warm up" unless @task.value
+    raise "Caddy variable access before initial load; allow some more time for your app to start up" unless @task.value
     @task.value[k]
   end
 
@@ -22,44 +22,59 @@ module Caddy
       raise "Please set your cache refresher via `Caddy.refresher = -> { <code that returns a value> }`"
     end
 
-    if @task
-      puts "Caddy already running; shutting it down and starting over. Please ensure you run `Caddy.start`"\
-           " only after fork/worker start in your web processes."
-      @task.shutdown
-    end
-
-    jitter_amount = refresh_interval * REFRESH_INTERVAL_JITTER_PCT
+    jitter_amount = [1, refresh_interval * REFRESH_INTERVAL_JITTER_PCT].max
     interval = refresh_interval + rand(-jitter_amount...jitter_amount)
 
-    @task = Concurrent::TimerTask.new(
+    task = Concurrent::TimerTask.new(
       run_now: true,
-      freeze_on_deref: true,
       execution_interval: interval,
       timeout_interval: interval - 1) { refresher.call }
 
-    @task.add_observer(CaddyTaskObserver.new)
-    @task.execute
+    task.add_observer(InternalCaddyTaskObserver.new)
+    task.execute
+
+    _stop_internal # stop any existing task from running
+
+    @task = task # and transfer over the new task
   end
 
   def self.stop
     raise "Please run `Caddy.start` before running `Caddy.stop`" unless @task
 
-    @task.shutdown
-    @task = nil
+    _stop_internal
   end
 
   def self.refresh_interval
     @refresh_interval || DEFAULT_REFRESH_INTERVAL
   end
 
-  class CaddyTaskObserver
+  private_class_method def self._stop_internal
+    @task.shutdown if @task && @task.running?
+  end
+
+  class InternalCaddyTaskObserver
     def update(time, _, boom)
       return unless boom
 
-      if boom.is_a?(Concurrent::TimeoutError)
-        puts "(#{time}) Caddy refresher timed out"
+      if Caddy.refresher_error_handler
+        if Caddy.refresher_error_handler.respond_to?(:call)
+          begin
+            Caddy.refresher_error_handler.call(boom)
+          rescue => incepted_boom
+            STDERR.puts "(#{time}) Caddy error handler itself errored: #{incepted_boom}"
+          end
+        else
+          # rubocop:disable Style/StringLiterals
+          STDERR.puts 'Caddy error handler not callable. Please set the error handler like:'\
+                      ' `Caddy.refresher_error_handler = -> (e) { puts "#{e}" }`'
+          # rubocop:enable Style/StringLiterals
+
+          STDERR.puts "(#{time}) Caddy refresher failed with error #{boom}"
+        end
+      elsif boom.is_a?(Concurrent::TimeoutError)
+        STDERR.puts "(#{time}) Caddy refresher timed out"
       else
-        puts "(#{time}) Caddy refresher failed with error #{boom}"
+        STDERR.puts "(#{time}) Caddy refresher failed with error #{boom}"
       end
     end
   end

data/lib/caddy/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Caddy
-  VERSION = "0.0.1"
+  VERSION = "0.0.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caddy
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Nick Elser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby