rask 0.0.5 → 0.0.6

data/History.txt

@@ -1,3 +1,6 @@
+=== 0.0.5 2010-03-04
+* Task::on_exception will be called when some exception raised in Task Processing.
+
 === 0.0.5 2010-03-04
 * If exception raised, Rask delete the task and keep the task file to "BASE_DIR/suspended" directory.
 * Rails generator is fixed.

data/README.rdoc

@@ -145,6 +145,16 @@ kill -TERM されたプロセスは、そのタスクのステートマシンの
  ruby1.8.7で作ってる
 
 == Changelog
+* v0.0.6
+  * read が落ちるバグの修正
+  * タスク内で発生した例外コールバックの追加
+  * Task::on_exception will be called when some exception raised in Task Processing.
+* v0.0.5
+  * rails にて複数タスク実行可能に修正
+  * 例外をキャッチするようにした
+    * 落ちた場合はデフォルトで BASE_DIR/suspended/ フォルダにタスクファイルを移動するのでコード修正後戻せば復帰可能
+  * If exception raised, Rask delete the task and keep the task file to "BASE_DIR/suspended" directory.
+  * Rails generator is fixed.
 * v0.0.4
   * Integration for Ruby On Rails
     * rails のジェネレータ化、プラグイン化コードの統合

data/lib/rask.rb

@@ -126,6 +126,10 @@ module Rask
       @state == nil
     end
     
+    def on_exception
+      Rask.suspend(@task_id) # default to suspend
+    end
+    
   end
   
   
@@ -208,7 +212,7 @@ module Rask
       print $@.join("\n") + "\n--------------------------------------------\n"
       f.flock(File::LOCK_UN)
       f.close
-      FileUtils.mv(task_path(task_id), @@base_dir+"/suspended/")
+      task.on_exception
     end
   end
   
@@ -227,10 +231,18 @@ module Rask
     task = Marshal.restore(f)
     f.flock(File::LOCK_UN)
     f.close
-    task.read_only = true
+    task.read_only
     task
   end
   
+  #
+  # === 
+  # if you met unrecovery error. you can suspend the task.
+  #
+  def self.suspend(task_id)
+    FileUtils.mv(task_path(task_id), @@base_dir+"/suspended/")
+  end
+  
   #
   # === Get task_id list.
   # [options]
@@ -286,7 +298,7 @@ module Rask
     # create worker threads
     threads = []
     for i in 1..@@thread_max_count do 
-      threads << Thread::new(i) { |thread_id| thread_proc(thread_id, options[:worker_sleep]) }
+      threads << Thread::new(i) { |thread_id| thread_proc(thread_id, options) }
     end
     
     Signal.trap(:TERM) {safe_exit(options[:process_name])}
@@ -318,7 +330,7 @@ private
   end
   
   #
-  def self.thread_proc(thread_id, worker_sleep = 0.1)
+  def self.thread_proc(thread_id, options = {})
     @@thread_count += 1
     print "[Rask] Thread Start ID:#{thread_id}\n"
     while !@@terminated
@@ -332,10 +344,11 @@ private
         @@locker.synchronize do
           @@processing.delete(d)
         end
+        sleep(options[:worker_sleep])
       else
-      # print "no data in queue\n"
+        # print "no data in queue\n"
+        sleep(options[:sleep])
       end
-      sleep(worker_sleep)
     end
     print "[Rask] Thread Exit ID:#{thread_id}\n"
     @@thread_count -= 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rask
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - mewlist / Hidenori Doi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-04 00:00:00 +09:00
+date: 2010-03-11 00:00:00 +09:00
 default_executable: 
 dependencies: []