ruby_skynet 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 088702cd6c216e6b48ec0124fb0ea95438be5a17
-  data.tar.gz: 6500952161438b2dcd00f2862164260ddc1788ca
+  metadata.gz: 3fd7fd4822334e7d782d4dea66adfebee81ed5e6
+  data.tar.gz: df2655971d950f5672beadbbe324e866b24ef754
 SHA512:
-  metadata.gz: 44c050a725b5fdf2ebda68a12be4a08117bb067f9df0bd19d4a28223e3f62bbdce5d5fe0dc715088a6857f462682dee61afc7b1e9c8843d52f3a8ee336f4165c
-  data.tar.gz: 8cf35886b4c988835b705d39777ac3d74e87ae26fe55b9038d713f6d9f87a06c143a6d5a05ccbfa46b8da0e5c0972148c92c4328406eaf60092b17262dc1353e
+  metadata.gz: c40532f7c7ba9710f1aa48ee5f25fa1a6c1e0a4a1e2fb42d265309abb959e02a0dc1d40c5eada990cb0907898a04806540a1a39d3cd02e1bb2e2065ef12a4325
+  data.tar.gz: 1d877ccc14a6a71bd708161722e45aefbd5b529f9fc62ad6a20f4f7d393d231e4d9f808a849033b8cbfe7a79ecafe0065a65315921c34023c458beaf601a727c

data/lib/ruby_skynet/common.rb

@@ -27,7 +27,7 @@ module RubySkynet
 
     # Returns the local ip address being used by this machine to talk to the
     # internet. By default connects to Google and determines what IP Address is used locally
-    def self.local_ip_address(remote_ip = '64.233.187.99')
+    def self.local_ip_address(remote_ip = 'google.com')
       @@local_ip_address ||= ::UDPSocket.open {|s| s.connect(remote_ip, 1); s.addr.last }
     end
 

data/lib/ruby_skynet/version.rb

@@ -1,3 +1,3 @@
 module RubySkynet #:nodoc
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/ruby_skynet/zookeeper/service_registry.rb

@@ -117,26 +117,23 @@ module RubySkynet
         end
       end
 
-      # Service information changed, so update internal registry
+      # Service information created
       def service_info_created(path, value=nil)
         logger.info("service_info_created: #{path}", value)
         # path: "uuid/key"
         uuid, key = path.split('/')
 
-        # Big Assumption: 'registered' event will be received last as true
-        if (key == 'registered') && (value == true)
-          server = @notifications_cache[uuid]
-          if server && server['addr'] && server['name'] && server['version'] && server['region']
-            hostname, port = server['addr'].split(':')
-            add_server(File.join(server['name'], server['version'].to_s, server['region']), hostname, port)
-          else
-            logger.warn "Registered notification received for #{uuid} but is missing critical information. Received:", server
-          end
-        else
-          (@notifications_cache[uuid] ||= ThreadSafe::Hash.new)[key] = value
+        server = (@notifications_cache[uuid] ||= ThreadSafe::Hash.new)
+        server[key] = value
+
+        # Check if service is 'registered' and has all required attributes
+        if (server['registered'] == true) && server['addr'] && server['name'] && server['version'] && server['region']
+          hostname, port = server['addr'].split(':')
+          add_server(File.join(server['name'], server['version'].to_s, server['region']), hostname, port)
         end
       end
 
+      # Service information changed
       def service_info_updated(path, value=nil)
         logger.info("service_info_updated: #{path}", value)
         # path: "uuid/key"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_skynet
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic_logger