lib/caddy.rb in caddy-1.0.1 vs lib/caddy.rb in caddy-1.5.0

@@ -1,75 +1,42 @@
 # frozen_string_literal: true
+require "concurrent/timer_task"
+
 require "caddy/version"
 require "caddy/task_observer"
-require "concurrent/timer_task"
+require "caddy/cache"
 
 module Caddy
   class << self
-    attr_accessor :refresher, :error_handler, :refresh_interval
+    attr_accessor :error_handler
   end
 
-  DEFAULT_REFRESH_INTERVAL = 60
-  REFRESH_INTERVAL_JITTER_PCT = 0.15
+  @started_pid = nil
+  @caches = Hash.new { |h, k| h[k] = Caddy::Cache.new(k) }
 
-  @task = nil
-  @refresh_interval = DEFAULT_REFRESH_INTERVAL
-  @_started_pid = nil
-  @_cache = nil
-
   def self.[](k)
-    cache[k]
+    @caches[k]
   end
 
-  def self.cache
-    raise "Please run `Caddy.start` before attempting to access the cache" unless @task
-    raise "Caddy cache access before initial load; allow some more time for your app to start up" unless @_cache
-
-    @_cache
+  def self.caches
+    @caches
   end
 
   def self.start
-    unless refresher && refresher.respond_to?(:call)
-      raise "Please set your cache refresher via `Caddy.refresher = -> { <code that returns a value> }`"
-    end
-
-    raise "`Caddy.refresh_interval` must be > 0" unless refresh_interval > 0
-
-    if @_started_pid && $$ != @_started_pid
+    if !@started_pid
+      @started_pid = $$
+    elsif @started_pid && $$ != @started_pid
       raise "Please run `Caddy.start` *after* forking, as the refresh thread will get killed after fork"
     end
 
-    jitter_amount = [0.5, refresh_interval * REFRESH_INTERVAL_JITTER_PCT].max
-    interval = refresh_interval + rand(-jitter_amount...jitter_amount)
-    timeout_interval = [interval - 1, 0.1].max
-
-    stop # stop any existing task from running
-
-    @task = Concurrent::TimerTask.new(
-      run_now: true,
-      execution_interval: interval,
-      timeout_interval: timeout_interval
-    ) do
-      begin
-        @_cache = refresher.call
-        @_cache.freeze if @_cache.respond_to?(:freeze)
-      rescue
-        raise
-      end
-    end
-
-    @task.add_observer(Caddy::TaskObserver.new)
-    @task.execute
-
-    @_started_pid = $$
-
-    @task.running?
+    @caches.values.each(&:start).all?
   end
 
   def self.stop
-    @task.shutdown if @task && @task.running?
+    @caches.values.each(&:stop).all?
   end
 
   def self.restart
-    stop || start
+    stop
+    start
   end
 end