From 8e64073e9bc44678d4c520a6863f01fb142a5cd3 Mon Sep 17 00:00:00 2001 From: Jack Dempsey Date: Fri, 7 Oct 2016 19:55:19 -0700 Subject: [PATCH] allow setting of heartbeat_key like logger, redis and tz --- lib/zhong.rb | 8 ++++++-- lib/zhong/scheduler.rb | 3 +-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/zhong.rb b/lib/zhong.rb index 6e35b71..25fa9b8 100644 --- a/lib/zhong.rb +++ b/lib/zhong.rb @@ -18,7 +18,7 @@ module Zhong class << self extend Forwardable - attr_writer :logger, :redis + attr_writer :logger, :redis, :heartbeat_key attr_accessor :tz def_delegators :scheduler, :start, :stop, :clear, :jobs, :redis_time @@ -29,7 +29,7 @@ def self.schedule(&block) end def self.scheduler - @scheduler ||= Scheduler.new(logger: logger, redis: redis, tz: tz) + @scheduler ||= Scheduler.new(logger: logger, redis: redis, tz: tz, heartbeat_key: heartbeat_key) end def self.any_running?(grace = 60.seconds) @@ -68,4 +68,8 @@ def self.logger def self.redis @redis ||= Redis.new(url: ENV["REDIS_URL"]) end + + def self.heartbeat_key + @heartbeat_key ||= "zhong:heartbeat" + end end diff --git a/lib/zhong/scheduler.rb b/lib/zhong/scheduler.rb index 8dd60c3..5d2fe7c 100644 --- a/lib/zhong/scheduler.rb +++ b/lib/zhong/scheduler.rb @@ -6,8 +6,7 @@ class Scheduler timeout: 0.5, grace: 15.minutes, long_running_timeout: 5.minutes, - tz: nil, - heartbeat_key: "zhong:heartbeat", + tz: nil }.freeze def initialize(config = {})