brendan-skynet 0.9.317 → 0.9.318

data/lib/skynet.rb

@@ -33,6 +33,11 @@ end
 
 class << Skynet
 
+  def master_tasks
+    ::SkynetMessageQueue.find(:all, :select => "DISTINCT name, COUNT(*) total",:group => "name",:conditions => "payload_type='master'").
+    map{|q|"#{q.name} => #{q.total}"}.sort
+  end
+
   # kinda like system() but gives me back a pid
   def fork_and_exec(command)
     sleep 0.01  # remove contention on manager drb object

data/lib/skynet/active_record_extensions.rb

@@ -31,11 +31,11 @@ module Skynet::ActiveRecordExtensions
       :map_data              => [data],
       :name                  => "send_later #{self.class}##{method}",
       :map_name              => "",
-      :map_timeout           => 60,
-      :reduce_timeout        => 60,
-      :master_timeout        => 60,
-      :master_result_timeout => 1.minute,
-      :map_reduce_class      =>  Skynet::ActiveRecordAsync,
+      :map_timeout           => 2.minutes,
+      :reduce_timeout        => 2.minutes,
+      :master_timeout        => 2.minutes,
+      :master_result_timeout => 2.minutes,
+      :map_reduce_class      => Skynet::ActiveRecordAsync,
       :master_retry          => 0,
       :map_retry             => 0
     }   
@@ -182,9 +182,9 @@ module ActiveRecord
         :map_data              => batches,
         :name                  => "each #{model_class} MASTER",
         :map_name              => "each #{model_class} MAP",
-        :map_timeout           => 60,
+        :map_timeout           => 2.minutes,
         :master_timeout        => 12.hours,
-        :master_result_timeout => 60,        
+        :master_result_timeout => 2.minutes,        
         :master_retry          => 0,
         :map_retry             => 0
       }   

data/lib/skynet/manager.rb

@@ -663,7 +663,7 @@ class Skynet
 
     def self.run_manager(options)
       @manager = Skynet::Manager.new(options)
-      @drb_manager = DRb.start_service("druby://:#{Skynet::CONFIG[:SKYNET_LOCAL_MANAGER_PORT]}", @manager)
+      @drb_manager = DRb.start_service("druby://#{Skynet::CONFIG[:SKYNET_LOCAL_MANAGER_HOST]}:#{Skynet::CONFIG[:SKYNET_LOCAL_MANAGER_PORT]}", @manager)
       @manager.start_workers
       info "MANAGER STARTED ON PORT: #{Skynet::CONFIG[:SKYNET_LOCAL_MANAGER_PORT]}"
       @manager.run

data/lib/skynet/object_extensions.rb

@@ -4,7 +4,7 @@ module Skynet::ObjectExtensions
     
     raise ArgumentError("send_later can not serialize blocks.") if block_given?
 
-    if is_a?(Class)
+    if is_a?(Class) or is_a?(Module)
       data = {
         :class_name => name,
         :method     => method,
@@ -22,12 +22,12 @@ module Skynet::ObjectExtensions
       :single                => true,
       :mappers               => 1,
       :map_data              => [data],
-      :name                  => "send_later #{self.class}##{method}",
+      :name                  => "send_later #{data[:class_name] ? "#{self}.#{method}" : "#{self.class}##{method}"}",
       :map_name              => "",
-      :map_timeout           => 60,
-      :reduce_timeout        => 60,
-      :master_timeout        => 60,
-      :master_result_timeout => 1.minute,
+      :map_timeout           => 2.minutes,
+      :reduce_timeout        => 2.minutes,
+      :master_timeout        => 2.minutes,
+      :master_result_timeout => 2.minutes,
       :map_reduce_class      => Skynet::ObjectAsync,
       :master_retry          => 0,
       :map_retry             => 0

data/skynet.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{skynet}
-  s.version = "0.9.317"
+  s.version = "0.9.318"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Pisoni", "Brendan Baldwin"]
-  s.date = %q{2008-07-09}
+  s.date = %q{2009-01-28}
   s.description = %q{Skynet - A Ruby Map/Reduce Framework}
   s.email = %q{apisoni@geni.com}
   s.executables = ["skynet", "skynet_install", "skynet_tuplespace_server"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brendan-skynet
 version: !ruby/object:Gem::Version 
-  version: 0.9.317
+  version: 0.9.318
 platform: ruby
 authors: 
 - Adam Pisoni
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-09 00:00:00 -07:00
+date: 2009-01-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency