journeta 0.1.2 → 0.1.3

data/lib/journeta/journeta_engine.rb

@@ -160,6 +160,7 @@ module Journeta
     # the existing record will be updated and given instance #PeerConnection#stop'd.
     # This prevents pending outbound data from being accidentally dropped.
     def register_peer(peer)
+      putsd "Registering peer: #{peer.uuid}"
       peer_registry.register(peer)
     end
     
@@ -172,4 +173,4 @@ module Journeta
     
   end
   
-end
+end

data/lib/journeta/peer_connection.rb

@@ -80,9 +80,9 @@ module Journeta
         #
         # Sorry that this is deceptively complicated. It's a design gotcha! :)
         putsd "Peer #{uuid} has gone away. Deregistering in the background."
-        Thread.new {
-          @engine.unregister_peer(self)
-        }
+        Thread.new(self) do |me|
+          @engine.unregister_peer(me)
+        end
       end
     end
     

data/lib/journeta/presence_listener.rb

@@ -34,29 +34,33 @@ module Journeta
         loop do
           # Why 1024? umm.. because it's Thursday!
           data, meta = socket.recvfrom 1024
-          Thread.new(data) {
+          Thread.new(data, meta) do |data, meta|
             event = YAML.load(data)
             if event.uuid != @engine.uuid
-              m = YAML::load(data)
-              peer = PeerConnection.new @engine
-              # Why is this always [2]? Not sure.. they should have returned a hash instead.
-              peer.ip_address = meta[2]
-              peer.peer_port = m.peer_port
-              peer.uuid = m.uuid
-              peer.version = m.version
-              peer.groups = m.groups
-              peer.created_at = peer.updated_at = Time.now
+              begin
+                m = YAML::load(data)
+                peer = PeerConnection.new @engine
+                # Why is this always [2]? Not sure.. they should have returned a hash instead.
+                peer.ip_address = meta[2]
+                peer.peer_port = m.peer_port
+                peer.uuid = m.uuid
+                peer.version = m.version
+                peer.groups = m.groups
+                peer.created_at = peer.updated_at = Time.now
               
-              # We should not start the #PeerConnection before registering because
-              # the peer might already be registered. In this case, we'd have wasted a thread,
-              # so we'll let the registry handle startup (if it happens at all.)
-              #
-              # peer.start
+                # We should not start the #PeerConnection before registering because
+                # the peer might already be registered. In this case, we'd have wasted a thread,
+                # so we'll let the registry handle startup (if it happens at all.)
+                #
+                # peer.start
               
-              # TODO validate peer entry is sane before registering it
-              @engine.register_peer peer
+                # TODO validate peer entry is sane before registering it
+                @engine.register_peer peer
+              rescue => e
+                putsd "Error during peer registration: #{e.message}"
+              end
             end
-          }
+          end
           # putsd "Event received!"
         end
       ensure

data/lib/journeta/version.rb

@@ -2,7 +2,7 @@ module Journeta #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/journeta.rb

@@ -2,6 +2,7 @@
 require 'yaml'
 require 'set'
 require 'thread'
+#require 'pp'
 
 
 require 'journeta/logger'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: journeta
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Preston Lee
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-08 00:00:00 -07:00
+date: 2008-10-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency