Changeset 301

Timestamp:

01/01/08 22:49:18 (8 months ago)

Author:

gethema..@gmail.com

Message:

small fix for check on add_timer methods

Files:

• trunk/framework/core.rb (modified) (1 diff)
• trunk/server/meta_worker.rb (modified) (2 diffs)

trunk/framework/core.rb

@@ -238 +238 @@
-          @timer_hash.delete(key) if timer.cancel_flag
-          if timer.run_now?
-
-
-
-
+
-            @timer_hash.delete(key) if !timer.respond_to?(:interval)
-          end

trunk/server/meta_worker.rb

@@ -61 +61 @@
-      @threads << Thread.new do
-        while true
-          begin
-            ActiveRecord::Base.verify_active_connections! if defined?(ActiveRecord)
-          rescue; end
-          
-          task = @work_queue.pop
-          @running_tasks << task
-          block_arity = task.block.arity
+          begin
+            ActiveRecord::Base.verify_active_connections!
+          rescue
+            logger.info($!.to_s)
+            logger.info($!.backtrace.join("\n"))
+          end
+
-          begin
-            block_arity == 0 ? task.block.call : task.block.call(*(task.data))
@@ -314 +318 @@
-        ActiveRecord::Base.verify_active_connections! if defined?(ActiveRecord)
-      rescue; end
-
+
+
+
+
+
+
+
+
-      return if @worker_method_triggers.nil? or @worker_method_triggers.empty?
-      @worker_method_triggers.each do |key,value|