perfectsched 0.8.1 → 0.8.2

data/ChangeLog

@@ -1,4 +1,13 @@
 
+== 2012-07-03 version 0.8.2
+
+* Fixed rdb_compat to raise PreemptedError and
+IdempotentAlreadyFinishedError correctly
+* Fixed Application module
+* Added scheduled_time -> next_time and scheduled_run_time -> next_run_time
+aliases to ScheduleMetadataAccessors
+
+
 == 2012-06-25 version 0.8.1
 
 * Added autoload for PerfectSched::VERSION

data/lib/perfectsched/application/base.rb

@@ -0,0 +1,27 @@
+#
+# PerfectSched
+#
+# Copyright (C) 2012 FURUHASHI Sadayuki
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+module PerfectSched
+  module Application
+
+    class Base < Runner
+    end
+
+  end
+end
+

data/lib/perfectsched/application/dispatch.rb

@@ -0,0 +1,46 @@
+#
+# PerfectSched
+#
+# Copyright (C) 2012 FURUHASHI Sadayuki
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+module PerfectSched
+  module Application
+
+    class Dispatch < Runner
+      # Runner interface
+      def initialize(task)
+        base = self.class.router.route(task.type)
+        unless base
+          task.retry!
+          raise "Unknown task type #{task.type.inspect}"   # TODO error class
+        end
+        @runner = base.new(task)
+        super
+      end
+
+      attr_reader :runner
+
+      def run
+        @runner.run
+      end
+
+      # DSL interface
+      extend RouterDSL
+    end
+
+  end
+end
+

data/lib/perfectsched/application/router.rb

@@ -0,0 +1,30 @@
+#
+# PerfectSched
+#
+# Copyright (C) 2012 FURUHASHI Sadayuki
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+module PerfectSched
+  module Application
+
+    require 'perfectqueue/application/router'
+
+    Router = PerfectQueue::Application::Router
+
+    RouterDSL = PerfectQueue::Application::RouterDSL
+
+  end
+end
+

data/lib/perfectsched/application.rb

@@ -18,8 +18,16 @@
 
 module PerfectSched
 
-  require 'perfectqueue/application'
-  Application = PerfectQueue::Application
+  module Application
+    {
+      :Dispatch => 'application/dispatch',
+      :Router => 'application/router',
+      :RouterDSL => 'application/router',
+      :Base => 'application/base',
+    }.each_pair {|k,v|
+      autoload k, File.expand_path(v, File.dirname(__FILE__))
+    }
+  end
 
 end
 

data/lib/perfectsched/backend/rdb_compat.rb

@@ -54,7 +54,7 @@ module PerfectSched
 
       def init_database(options)
         sql = %[
-          CREATE TABLE IF NOT EXISTS `test_scheds` (
+          CREATE TABLE IF NOT EXISTS `#{@table}` (
             id VARCHAR(256) NOT NULL,
             timeout INT NOT NULL,
             next_time INT NOT NULL,
@@ -174,8 +174,15 @@ module PerfectSched
 
         connect {
           n = @db["UPDATE `#{@table}` SET timeout=? WHERE id=? AND next_time=?;", next_run_time, row_id, scheduled_time].update
-          if n < 0
-            raise AlreadyFinishedError, "task time=#{Time.at(scheduled_time).utc} is already finished"
+          if n <= 0  # TODO fix
+            row = @db.fetch("SELECT id, timeout, next_time FROM `#{@table}` WHERE id=? AND next_time=? LIMIT 1", row_id, scheduled_time).first
+            if row == nil
+              raise PreemptedError, "task key=#{key} does not exist or preempted."
+            elsif row[:timeout] == next_run_time
+              # ok
+            else
+              raise PreemptedError, "task time=#{Time.at(scheduled_time).utc} is preempted"
+            end
           end
         }
       end
@@ -188,7 +195,7 @@ module PerfectSched
 
         connect {
           n = @db["UPDATE `#{@table}` SET timeout=?, next_time=? WHERE id=? AND next_time=?;", next_run_time, next_time, row_id, scheduled_time].update
-          if n < 0
+          if n <= 0
             raise IdempotentAlreadyFinishedError, "task time=#{Time.at(scheduled_time).utc} is already finished"
           end
         }

data/lib/perfectsched/schedule_metadata.rb

@@ -49,6 +49,10 @@ module PerfectSched
       @attributes[:next_run_time]
     end
 
+    alias scheduled_time next_time
+
+    alias scheduled_run_time next_run_time
+
     def message
       @attributes[:message]
     end

data/lib/perfectsched/version.rb

@@ -1,3 +1,3 @@
 module PerfectSched
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/lib/perfectsched/worker.rb

@@ -153,8 +153,6 @@ module PerfectSched
         sig.trap :USR2 do
           logrotated
         end
-
-        trap :CHLD, "SIG_IGN"
       end
     end
   end

data/perfectsched.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "cron-spec", [">= 0.1.2", "<= 0.1.2"]
   gem.add_dependency "sequel", "~> 3.26.0"
   gem.add_dependency "tzinfo", "~> 0.3.29"
-  gem.add_dependency "perfectqueue", "~> 0.8.0"
+  gem.add_dependency "perfectqueue", "~> 0.8.3"
   gem.add_development_dependency "rake", "~> 0.9.2"
   gem.add_development_dependency "rspec", "~> 2.10.0"
   gem.add_development_dependency "simplecov", "~> 0.5.4"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectsched
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000Z
+date: 2012-07-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cron-spec
-  requirement: &70165887081720 !ruby/object:Gem::Requirement
+  requirement: &70202080349100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70165887081720
+  version_requirements: *70202080349100
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &70165887079760 !ruby/object:Gem::Requirement
+  requirement: &70202080348340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: 3.26.0
   type: :runtime
   prerelease: false
-  version_requirements: *70165887079760
+  version_requirements: *70202080348340
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &70165887078760 !ruby/object:Gem::Requirement
+  requirement: &70202080347880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,21 +46,21 @@ dependencies:
         version: 0.3.29
   type: :runtime
   prerelease: false
-  version_requirements: *70165887078760
+  version_requirements: *70202080347880
 - !ruby/object:Gem::Dependency
   name: perfectqueue
-  requirement: &70165887077360 !ruby/object:Gem::Requirement
+  requirement: &70202080347420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *70165887077360
+  version_requirements: *70202080347420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70165887076440 !ruby/object:Gem::Requirement
+  requirement: &70202080346960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70165887076440
+  version_requirements: *70202080346960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70165887075580 !ruby/object:Gem::Requirement
+  requirement: &70202079928960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70165887075580
+  version_requirements: *70202079928960
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70165887074140 !ruby/object:Gem::Requirement
+  requirement: &70202079928500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,10 +90,10 @@ dependencies:
         version: 0.5.4
   type: :development
   prerelease: false
-  version_requirements: *70165887074140
+  version_requirements: *70202079928500
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70165887069320 !ruby/object:Gem::Requirement
+  requirement: &70202079928040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,7 +101,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70165887069320
+  version_requirements: *70202079928040
 description: Highly available distributed cron built on RDBMS
 email: frsyuki@gmail.com
 executables:
@@ -117,6 +117,9 @@ files:
 - bin/perfectsched
 - lib/perfectsched.rb
 - lib/perfectsched/application.rb
+- lib/perfectsched/application/base.rb
+- lib/perfectsched/application/dispatch.rb
+- lib/perfectsched/application/router.rb
 - lib/perfectsched/backend.rb
 - lib/perfectsched/backend/rdb_compat.rb
 - lib/perfectsched/blocking_flag.rb