switch to add_actor, make things readvertisable

examples/actors/randomz.rb

@@ -1,14 +1,27 @@
 class Randomz < Pelvis::Actor
-  operation "/do/random"
-  def run
-    send_wait(rand(10))
+  def self.resources_for(op)
+    case op
+      when '/never/works'
+        ['bla']
+      end
+  end
+
+  def self.added_to_agent(agent)
+    EM.add_timer(20) {
+      resources_changed
+    }
   end
 
   operation "/never/works"
   def broken
     fail :message => "I am hopelessly broken"
   end
 
+  operation "/do/random"
+  def run
+    send_wait(rand(10))
+  end
+
   def send_wait(number)
     wait = random_time
     send_data :message => "remaining #{number} waiting #{wait}"

lib/pelvis/actor.rb

@@ -59,6 +59,9 @@ def operations_for(job)
       def resources_for(op)
         nil
       end
+
+      def added_to_agent(agent)
+      end
     end
 
     # TODO: Enable config and deployment resources
@@ -148,5 +151,10 @@ def fail(args)
       failed(args)
       raise
     end
+
+    def resources_changed
+      self.class.instance_eval "resources_changed"
+    end
+
   end
 end

lib/pelvis/agent.rb

@@ -58,13 +58,6 @@ def actors
     end
     private :actors
 
-    def add_actor(actor_klass)
-      actors << actor_klass
-      actor_klass.on_resources_changed {
-        Advertiser.new(self, [actor_klass])
-      }
-    end
-
     class ConfiguredActor < SimpleDelegator
       def initialize(klass, block)
         super(klass)
@@ -83,7 +76,19 @@ def operations_for(job)
     end
 
     def add_actor(klass, &block)
-      actors << ConfiguredActor.new(klass, block)
+      if block_given?
+        actors << ConfiguredActor.new(klass, block)
+      else
+        actors << klass
+      end
+      it = actors.last
+      it.added_to_agent(self)
+      it.on_resources_changed {
+        logger.debug "got resources changed for #{it}, readvertising"
+        Advertiser.new(self, [it]).on_completed {
+          logger.debug "readvertisement successful"
+        }
+      }
     end
 
     def advertise
@@ -93,8 +98,9 @@ def advertise
         return
       end
 
-      @advertiser = Advertiser.new(self, actors)
-      @advertiser.on_completed { advertised }
+      # initial advertisement
+      a = Advertiser.new(self, actors)
+      a.on_completed { advertised }
     end
 
     def evoke(identity, job)

run

@@ -12,7 +12,7 @@ require File.dirname(__FILE__) + '/examples/delegates/debugger'
 
 def connect_herault
   Pelvis.connect(:local, :identity => "herault", :advertise => false) do |agent|
-    agent.actors << Herault
+    agent.add_actor Herault
     agent.on_advertised do
       puts "herault is ready"
       connect_foo
@@ -22,7 +22,7 @@ end
 
 def connect_foo
   Pelvis.connect(:local, :identity => "foo") do |agent|
-    agent.actors << Randomz
+    agent.add_actor Randomz
     agent.on_advertised do
       puts "foo is ready"
       connect_bar

run_xmpp

@@ -18,7 +18,7 @@ end
 
 def connect_herault
   Pelvis.connect(:xmpp, :jid => "herault@localhost/agent", :password => "testing", :advertise => false) do |agent|
-    agent.actors << Herault
+    agent.add_actor Herault
     agent.on_advertised do
       puts "herault is ready"
       connect_chained
@@ -28,8 +28,8 @@ end
 
 def connect_chained
   Pelvis.connect(:xmpp, :jid => "dummy@localhost/agent", :password => "testing") do |agent|
-    agent.actors << Randomz
-    agent.actors << Chained
+    agent.add_actor Randomz
+    agent.add_actor Chained
 
     agent.on_advertised do
       puts "chained is ready"
@@ -40,7 +40,7 @@ end
 
 def connect_inner
   Pelvis.connect(:xmpp, :jid => "dummy2@localhost/agent", :password => "testing") do |agent|
-    agent.actors << Inner
+    agent.add_actor Inner
 
     agent.on_advertised do
       puts "inner is ready"