consul_syncer 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3908993bf71987872f909d0f2ff621b919a4a6d7
-  data.tar.gz: d87538b7997969af59a32e1da624834606050035
+  metadata.gz: 84bf7af4ae453bd70d421f22046be75e50430646
+  data.tar.gz: 88a811c044da4d8593ee992d2539164900fc6c84
 SHA512:
-  metadata.gz: 983c23b1e59daf6c49260ec4b7c97192defb210081dbbc23552dbe1e3d73c5944663d3ad4a39a17d9f1bc1a61db390413a7d4525d3a4336f287acf9d2523b39d
-  data.tar.gz: 7482606c0946bedb53ec7ec20039c9acea171fadf1b67dae2c9307f86ad30509b4171ebdfe7830b1efe72d484c83895c5ffb00753082a150fefd91e7ee27842c
+  metadata.gz: 09009163e3d55da5f45d4ec94f12e77aa0e6bf5203cec8bbe33c6bb029da76c96c2eadc8cf61ec77ce8e4ed012921d7001af7f9cb2c68ee374cad169b1f289a6
+  data.tar.gz: 1de658780985b5e9424b6498e6d1ff2214769606a3c079c68bef241c672f7f636ec6db588772a7127626418666ca12c7f2ac5e3b670caaa3b378f169c4afde8d

data/lib/consul_syncer.rb

@@ -34,16 +34,17 @@ class ConsulSyncer
         address: consul_endpoint.ip,
         service: consul_endpoint.name,
         service_id: consul_endpoint.service_id,
+        service_address: consul_endpoint.service_address,
         tags: consul_endpoint.tags.sort,
         port: consul_endpoint.port
       }
     end
 
-    identifying = [:node, :service]
-    interesting = [*identifying, :address, :tags, :port]
+    identifying = [:node, :service_id]
+    interesting = [*identifying, :service, :service_address, :address, :tags, :port]
 
     expected_definitions.each do |expected|
-      description = "#{expected.fetch(:service)} on #{expected.fetch(:node)} in Consul"
+      description = "#{expected.fetch(:service)} / #{expected.fetch(:service_id)} on #{expected.fetch(:node)} in Consul"
 
       if remove_matching_service!(actual_definitions, expected, interesting)
         @logger.info "Found #{description}"
@@ -60,7 +61,7 @@ class ConsulSyncer
 
     # all definitions that are left did not match any expected definitions and are no longer needed
     actual_definitions.each do |actual|
-      @logger.info "Removing #{actual.fetch(:service)} on #{actual.fetch(:node)} in Consul"
+      @logger.info "Removing #{actual.fetch(:service)} / #{actual.fetch(:service_id)} on #{actual.fetch(:node)} in Consul"
       modified += 1
       deregister actual.fetch(:node), actual.fetch(:service_id)
     end
@@ -93,14 +94,16 @@ class ConsulSyncer
   end
 
   # creates or updates based on node and service
-  def register(node:, service:, address:, tags:, port:)
+  def register(node:, service:, service_id:, service_address:, address:, tags:, port:)
     @consul.request(
       :put,
       '/v1/catalog/register',
       Node: node,
       Address: address,
       Service: {
+        ID: service_id,
         Service: service,
+        Address: service_address,
         Tags: tags,
         Port: port
       }

data/lib/consul_syncer/endpoint.rb

@@ -13,6 +13,10 @@ class ConsulSyncer
       @hash.fetch('Service').fetch('ID')
     end
 
+    def service_address
+      @hash.fetch('Service').fetch('Address')
+    end
+
     def node
       @hash.fetch('Node').fetch('Node')
     end

data/lib/consul_syncer/version.rb

@@ -1,3 +1,3 @@
 class ConsulSyncer
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul_syncer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday