vagrant-dnsdock-hostupdater 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 561ef395898f15a897a2974c48cd79c0002d2a88
-  data.tar.gz: 14093a1e73d508d0bf1312d793525e6738aa3ec5
+  metadata.gz: f887012730bfc1dfc79c363084aeab22d6eaeba2
+  data.tar.gz: 561ef4b9e484d2904c7018fec31218f089c645d1
 SHA512:
-  metadata.gz: 5513b50e495cd7e59ea272730ac2badd1cdbc80a236b2d1c432e9cf9af1920b2e7842bd1c4fd219bd4f4c5d858ffa1ea998eaeea761e880aac724d741edf1f0b
-  data.tar.gz: 037db703b3c5e8fa570a95899a9a6c77303c399feaaa93664a0912a178cfaeb432aade2bf0cd09b6e3042abe0c252a08d0111ec6c8bcb75615ba07ceed2b4351
+  metadata.gz: 43e3e245116edbf2e96310f45692f7c256cd8b20113b3ef51690ef87f3b62111c89f556311cdfe45a1b2aed005a337f6a41a301007d331c9dae7a6fdf1a7c9e8
+  data.tar.gz: 23269abc8eeeb028ad774e27aa2631ed9d0ba526b49848a47a4ad2fda6c44a46847bb9a86213958f43b2a2c0a0241fc7ce05917bef87f36094050f6a4061b599

data/lib/event-watcher.rb

@@ -1,6 +1,17 @@
 require_relative 'host-manager'
 require 'yaml'
 
+def update
+  client = HostManager::Client.create('10.10.10.1', 2991)
+  client.host_suffix '.local.signal.sh'
+  client.sync_hosts Docker::Container.all({:all => true})
+  client.close
+end
+
+sleep(2)
+
+update
+
 loop {
   begin
     Docker::Event.stream { |event|
@@ -20,8 +31,6 @@ loop {
 
           # container_name = container.info['Name'].sub!(/^\//, '')
 
-          client = HostManager::Client.create('10.10.10.1', 2991)
-          client.host_suffix '.local.signal.sh'
 
           # To handle updating single entries
           # if event.action == 'start'
@@ -30,11 +39,10 @@ loop {
           #   client.send_action('delete', container_name, ip, container_id)
           # end
 
-          # if event.action == 'start' || event.action == 'die'
-          client.sync_hosts Docker::Container.all({:all => true})
-          # end
+          if event.action == 'start' || event.action == 'die'
+            update
+          end
 
-          client.close
         end
       rescue => e
         puts e.inspect
@@ -44,7 +52,7 @@ loop {
     }
 
   rescue Docker::Error::TimeoutError
-    HostManager.log.warn 'Docker socket connection timed out whilst listening for events. Reconnecting...'
+    HostManager.log.info 'Docker socket connection timed out whilst listening for events. Reconnecting...'
   end
 }
 

data/lib/host-manager.rb

@@ -53,7 +53,7 @@ module HostManager
       if container_name.include?('.')
         container_name
       else
-        container_name.sub!(/^\//, '') + host_suffix
+        container_name.sub(/^\//, '').gsub(/_/, '-') + host_suffix
       end
     end
 
@@ -64,69 +64,98 @@ module HostManager
         @domain_suffix
       end
     end
-  end
 
-  class Server < Base
-    def run(ip, port)
-      HostManager.log.info "Running on host manager service on #{ip}:#{port}"
-      @tcp_server = TCPServer.new ip, port
+    # Determine if entry is managed by this utility or not
+    def valid_entry?(element)
+      # check it's a managed host first
+      if element.respond_to?(:comment) && element.comment.to_s.start_with?(HostManager.comment_prefix)
+        # check we have hostname and ip
+        if element.respond_to?(:name) && element.respond_to?(:address)
+          return true
+        end
+      end
+    end
 
-      loop {
+    def get_hosts
+      unless @host_manager
+        @host_manager = Hosts::File.read(HostManager.host_file_path)
+      end
 
-        client = @tcp_server.accept
-        content = client.gets
+      @host_manager
+    end
 
-        log.debug("Recieved data: #{content.to_s.strip}")
+    def build_hosts_data(container_data)
+      data = []
 
-        begin
-          unless content.to_s.chomp.strip.empty?
-            data = JSON.parse(content)
+      if container_data && container_data.is_a?(Array)
+        container_data.each do |container_info|
+          container = Docker::Container.get(container_info.info['id'])
 
-            if data.is_a?(Hash)
-              required_keys = %w(action hostname ip containerId)
-              required_keys.each do |key|
-                unless data.key?(key)
-                  raise "Data for key #{key} not provided."
-                end
-              end
-              execute(data['action'], data['hostname'], data['ip'], data['containerId'])
+          if container.info['State']['Running']
+            name = container.info['Name']
 
-            elsif data.is_a?(Array)
-              hosts = get_hosts
+            if name
+              ip = container.info['NetworkSettings']['IPAddress']
+
+              if ip
+                item = {
+                    :hostname => host_name(name),
+                    :ip => ip,
+                    :containerId => container.info['id']
+                }
 
-              # initially remove all entries
-              hosts.elements.delete_if do |element|
-                if valid_entry?(element)
-                  log.info 'Removing entry for ' + element.name
-                  true
-                end
+                data.push(item)
+              else
+                log.warn("Ignored request to create hosts entry due to no IP being returned from container: #{name}")
               end
+            end
+          end
 
-              # add recieved entries
-              data.each do |entry|
-                comment = HostManager.comment_prefix + (entry['containerId'] ? " Container ID: #{entry['containerId']}" : '')
+        end
+      end
 
-                hosts.elements << Hosts::Entry.new(entry['ip'], entry['hostname'], :comment => comment)
-                hosts.write
-              end
+      data
+    end
 
-              hosts.write
+    def update_hosts_file(data)
+      if data.is_a?(Hash)
+        required_keys = %w(action hostname ip containerId)
+        required_keys.each do |key|
+          unless data.key?(key)
+            raise "Data for key #{key} not provided."
+          end
+        end
+        execute(data['action'], data['hostname'], data['ip'], data['containerId'])
 
-            end
+      elsif data.is_a?(Array)
+        hosts = get_hosts
 
+        # initially remove all entries
+        hosts.elements.delete_if do |element|
+          if valid_entry?(element)
+            log.info 'Removing entry for ' + element.name
+            true
           end
+        end
 
-        rescue => e
-          log.error("Caught exception attempting to execute with data #{content}. #{e}")
+        # add recieved entries
+        data.each do |entry|
+          add_entry(entry, hosts);
         end
 
-        client.close
-      }
+        hosts.write
 
+      end
     end
 
-    def get_hosts
-      Hosts::File.read(HostManager.host_file_path)
+    def add_entry(entry, hosts)
+      if entry[:ip] && entry[:containerId] && entry[:hostname]
+        comment = HostManager.comment_prefix + (entry[:containerId] ? " Container ID: #{entry[:containerId]}" : '')
+        hosts.elements << Hosts::Entry.new(entry[:ip], entry[:hostname], :comment => comment)
+
+      else
+        log.warn 'Unable to write entry due to missing values [ip,containerId,hostname]: ' + entry.to_json
+      end
     end
 
     def execute(action, hostname, ip, container_id = nil)
@@ -137,10 +166,8 @@ module HostManager
 
       if action == 'create'
         hosts.elements.each do |element|
-          if valid_entry?(element)
-            if hostname == element.name && ip == element.address
-              raise "Entry already exists! (#{ip} #{hostname})"
-            end
+          if valid_entry?(element) && hostname == element.name
+            raise "Entry already exists! (#{ip} #{hostname})"
           end
         end
 
@@ -165,24 +192,39 @@ module HostManager
       end
     end
 
-    def self.create(ip, port)
-      server = self.new
-      server.run(ip, port)
-    end
+  end
 
-    private
+  class Server < Base
+    def run(ip, port)
+      HostManager.log.info "Running on host manager service on #{ip}:#{port}"
+      @tcp_server = TCPServer.new ip, port
 
-    # Determine if entry is managed by this utility or not
-    def valid_entry?(element)
-      # check it's a managed host first
-      if element.respond_to?(:comment) && element.comment.to_s.start_with?(HostManager.comment_prefix)
-        # check we have hostname and ip
-        if element.respond_to?(:name) && element.respond_to?(:address)
-          return true
+      loop {
+
+        client = @tcp_server.accept
+        content = client.gets
+
+        log.debug("Recieved data: #{content.to_s.strip}")
+
+        begin
+          unless content.to_s.chomp.strip.empty?
+            data = JSON.parse(content)
+            update_hosts_file(data)
+          end
+
+        rescue => e
+          log.error("Caught exception attempting to execute with data #{content}. #{e}")
         end
-      end
+
+        client.close
+      }
+
     end
 
+    def self.create(ip, port)
+      server = self.new
+      server.run(ip, port)
+    end
   end
 
   class Client < Base
@@ -211,33 +253,18 @@ module HostManager
     end
 
     def sync_hosts(container_data)
-      data = []
-
-      if container_data && container_data.is_a?(Array)
-        container_data.each do |container_info|
-          container = Docker::Container.get(container_info.info['id'])
-
-          if container.info['State']['Running']
-            name = container.info['Name']
-            if name
-              ip = container.info['NetworkSettings']['IPAddress']
-
-              if ip
-                item = {
-                    :hostname => host_name(name),
-                    :ip => ip,
-                    :containerId => container.info['id']
-                }
+      data = build_hosts_data(container_data)
 
-                data.push(item)
-              end
-            end
-          end
+      begin
+        update_hosts_file(data)
 
-        end
+        `service dnsmasq restart`
 
-        send(data)
+      rescue => e
+        log.error("Caught exception attempting to write to hosts file with data #{data.to_json}. #{e}")
       end
+
+      send(data)
     end
 
     def send(data)

data/lib/vagrant-dnsdock-hostupdater/plugin.rb

@@ -79,6 +79,7 @@ module Vagrant
             pid_file << pid
             pid_file.close
             log "Wrote server PID (#{pid}) to #{pid_path}"
+            Process.detach(pid)
             @started = true
           end
         end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module DnsdockHostUpdater
-    VERSION = '0.0.14'.freeze
+    VERSION = '0.0.15'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dnsdock-hostupdater
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Brian Coit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api