[Archipelago-submits] [211] trunk/archipelago/lib/archipelago: made dump use its own jockey to subscribe

[nobody at rubyforge.org]

Revision: 211
Author:   zond
Date:     2007-02-09 13:58:13 -0500 (Fri, 09 Feb 2007)

Log Message:
-----------
made dump use its own jockey to subscribe

Modified Paths:
--------------
    trunk/archipelago/lib/archipelago/dump.rb
    trunk/archipelago/lib/archipelago/sanitation.rb

Modified: trunk/archipelago/lib/archipelago/dump.rb
===================================================================
--- trunk/archipelago/lib/archipelago/dump.rb	2007-02-09 17:53:27 UTC (rev 210)
+++ trunk/archipelago/lib/archipelago/dump.rb	2007-02-09 18:58:13 UTC (rev 211)
@@ -65,17 +65,13 @@
 
       def around_publish(&publish_block)
         yield
-        @officer.subscribe(:found, @officer.site_description, service_id) do |record|
-          found_peer(record)
-        end
-        @officer.subscribe(:lost, @officer.site_description, service_id) do |record|
+        @jockey.subscribe(:lost, @officer.site_description, service_id) do |record|
           lost_peer(record)
         end
       end
 
       def around_stop(&block)
-        @officer.unsubscribe(:found, @officer.site_description, service_id)
-        @officer.unsubscribe(:lost, @officer.site_description, service_id)
+        @jockey.unsubscribe(:lost, @officer.site_description, service_id)
         yield
       end
 

Modified: trunk/archipelago/lib/archipelago/sanitation.rb
===================================================================
--- trunk/archipelago/lib/archipelago/sanitation.rb	2007-02-09 17:53:27 UTC (rev 210)
+++ trunk/archipelago/lib/archipelago/sanitation.rb	2007-02-09 18:58:13 UTC (rev 211)
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 require 'archipelago/client'
-require 'forwardable'
 require 'monitor'
 
 module Archipelago
@@ -80,9 +79,7 @@
     # work.
     #
     class Officer < Archipelago::Client::Base
-      extend Forwardable
       attr_reader :sites, :site_description
-      def_delegators :@jockey, :subscribe, :unsubscribe
       def initialize(options = {})
         super(options)