zack 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,7 @@
+= 0.1.2 / 09-11-2010
+
+  * FIX: Don't read our own messages back (client)
+
 = 0.1.1 / 28-09-2010
 
  * Properly deletes jobs.

data/Rakefile

@@ -17,7 +17,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "zack"
-  s.version           = "0.1.1"
+  s.version           = "0.1.2"
   s.summary           = "Ruby RPC calls via beanstalkd"
   s.authors           = ['Kaspar Schiess', 'Patrick Marchi']
   s.email             = ["kaspar.schiess@absurd.li", 'mail@patrickmarchi.ch']

data/lib/zack/client.rb

@@ -14,7 +14,9 @@ class Zack::Client
       # Ain't it beautiful
       digest = Digest::MD5.new
       digest << @connection.instance_variable_get('@socket').addr.to_s
+
       @answer_queue_name = "answer_"+digest.hexdigest
+      @answer_connection = Beanstalk::Connection.new(server, @answer_queue_name)
     end
   end
   
@@ -31,8 +33,7 @@ class Zack::Client
     @connection.put message.to_yaml
 
     if @with_answer.include? sym
-      @connection.watch @answer_queue_name
-      answer = @connection.reserve
+      answer = @answer_connection.reserve
       begin
         return YAML.load(answer.body)
       ensure

data/lib/zack/server.rb

@@ -27,20 +27,23 @@ class Zack::Server
   #
   def handle_request
     job = @connection.reserve
+    sym, args, answer_tube = nil, nil, nil
     begin
       sym, args, answer_tube = YAML.load(job.body)
-      
-      instance = @factory.produce
-      retval = instance.send(sym, *args)
-      
-      if answer_tube
-        @connection.use answer_tube
-        @connection.put retval.to_yaml
-        @connection.use tube_name
-      end
     ensure
+      # If yaml decoding crashes, the message is probably invalid. Delete it. 
+      # If an exception is raised later on, we treat the request as satisfied.
       job.delete
     end
+    
+    instance = @factory.produce
+    retval = instance.send(sym, *args)
+    
+    if answer_tube
+      on_tube(answer_tube) do
+        @connection.put retval.to_yaml
+      end
+    end
   end
 
   # Runs the server and keeps running until the world ends (or the process, 
@@ -51,4 +54,15 @@ class Zack::Server
       handle_request
     end
   end
+  
+private
+  def on_tube(temporary_tube_name)
+    begin
+      @connection.use temporary_tube_name
+      
+      yield
+    ensure
+      @connection.use @tube_name
+    end
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Kaspar Schiess
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-28 00:00:00 +02:00
+date: 2010-11-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency