zhong 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58363ac3ea11e4bb20aa41811b6242421c858777
-  data.tar.gz: 953b201c5d195b2994ab3445b8ccfa1459d93d74
+  metadata.gz: 5945fa0ab193d6a729fdf393166c8d380a06558e
+  data.tar.gz: 8956f5b216934a2ebc5b9014c53b655c46ff462a
 SHA512:
-  metadata.gz: 5ff2cca40da90cc77edd36aeb921e11a6afaf41bcdff80225ea4e3b859ab1af5394664b8aa167da20fe350ff1d623bfa1f2ab660c95530f811db6345f723fc5e
-  data.tar.gz: 755a8b2ee5bb970a1d54b43977237f647fc1d1258cc4e7a0980ccacb37d356f5104b16cc99a6742304e7b7d11f92a859c2e3ea3a5e8804a5169c23bdec5b32f3
+  metadata.gz: 62629516856da87db6bdf7a54dc616efe247b7ce29e039d989ee0b69a7fa9015fb2d43a15b651aea30c604942ce2b2fd0aeecd1961fe63bb9d201bfdbfc0e428
+  data.tar.gz: 7afeb0d7ee86d65eed6964c03f161730bd4050ce5d70c1ce86d137d9ae0f22a95e5ff91a0f10a87080d6e192d399afc0664427ac8bfa231bcc4313c3cc437134

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.3
+
+- Fix several memory leaks.
+- Add a proper error handler block.
+
 ## 0.1.2
 
 - Fix bug with setting `at` like "**:35".

data/README.md

@@ -20,11 +20,15 @@ r = Redis.new
 Zhong.schedule(redis: r) do |s|
   s.category "stuff" do
     s.every(5.seconds, "foo") { puts "foo" }
+    s.every(1.minute, "biz", at: ["**:26", "**:27"]) { puts "biz" }
     s.every(1.week, "baz", at: ["mon 22:45", "wed 23:13"]) { puts "baz" }
+    s.every(10.seconds, "boom") { raise "fail" }
   end
 
   s.category "clutter" do
-    s.every(1.second, "compute", if: -> (t) { t.wday == 3 && rand < 0.5 }) { puts "something happened on wednesday" }
+    s.every(1.second, "compute", if: -> (t) { t.wday == 3 && rand < 0.5 }) do
+      puts "something happened on wednesday, maybe"
+    end
   end
 
   # note: callbacks that return nil or false will cause event to not run
@@ -37,8 +41,11 @@ Zhong.schedule(redis: r) do |s|
     puts "dong"
     true
   end
-end
 
+  s.error_handler do |e, job|
+    puts "damn, #{job} messed up: #{e}"
+  end
+end
 ```
 
 ## TODO

data/bin/setup

@@ -3,5 +3,3 @@ set -euo pipefail
 IFS=$'\n\t'
 
 bundle install
-
-# Do any other automated setup that you need to do here

data/bin/zhong

@@ -4,6 +4,7 @@ STDERR.sync = STDOUT.sync = true
 
 require "bundler/setup"
 require "zhong"
+require "memory_profiler"
 
 usage = "zhong <zhong.rb>"
 file = ARGV.shift || abort(usage)
@@ -12,8 +13,4 @@ file = "./#{file}" unless file.match(/^[\/.]/)
 
 require file
 
-require "irb"
-IRB.start
-
-
 Zhong.start

data/lib/zhong/job.rb

@@ -31,7 +31,7 @@ module Zhong
       run_every?(time) && run_at?(time) && run_if?(time)
     end
 
-    def run(time = Time.now)
+    def run(time = Time.now, error_handler = nil)
       return unless run?(time)
 
       if running?
@@ -40,25 +40,41 @@ module Zhong
       end
 
       @thread = nil
+      locked = false
+
+      @lock.lock do
+        locked = true
 
-      ran_set = @lock.lock do
         refresh_last_ran
 
-        break true unless run?(time)
+        # we need to check again, as another process might have acquired
+        # the lock right before us and obviated our need to do anything
+        break unless run?(time)
 
         if disabled?
           @logger.info "disabled: #{self}"
-          break true
+          break
         end
 
         @logger.info "running: #{self}"
 
-        @thread = Thread.new { @block.call } if @block
+        if @block
+          @thread = Thread.new do
+            begin
+              @block.call
+            rescue => boom
+              @logger.error "#{self} failed: #{boom}"
+              error_handler.call(boom, self) if error_handler
+            end
+
+            nil # do not retain thread return value
+          end
+        end
 
         ran!(time)
       end
 
-      @logger.info "unable to acquire exclusive run lock: #{self}" unless ran_set
+      @logger.info "unable to acquire exclusive run lock: #{self}" unless locked
     end
 
     def stop

data/lib/zhong/scheduler.rb

@@ -39,7 +39,7 @@ module Zhong
     end
 
     def on(event, &block)
-      fail "Unsupported callback #{event}" unless [:before_tick, :after_tick, :before_run, :after_run].include?(event.to_sym)
+      fail "unknown callback #{event}" unless [:before_tick, :after_tick, :before_run, :after_run].include?(event.to_sym)
       (@callbacks[event.to_sym] ||= []) << block
     end
 
@@ -56,13 +56,15 @@ module Zhong
 
           jobs.each do |_, job|
             if fire_callbacks(:before_run, job, now)
-              job.run(now)
+              job.run(now, error_handler)
               fire_callbacks(:after_run, job, now)
             end
           end
 
           fire_callbacks(:after_tick)
 
+          GC.start
+
           sleep(interval)
         end
 

data/lib/zhong/version.rb

@@ -1,3 +1,3 @@
 module Zhong
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/zhong.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "redis"
   spec.add_dependency "tzinfo"
   spec.add_dependency "activesupport"
+  spec.add_dependency "memory_profiler"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zhong
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Nick Elser
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: memory_profiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement