vagrant-dnsdock-hostupdater 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c1d494bc348ad4bf14e33a49b68878e9089ad25
-  data.tar.gz: f58089650e77004454d1c56d7beec701dc534b96
+  metadata.gz: bb921b210516dc5a4f384182c9ace1930aeb1d3e
+  data.tar.gz: aed719a5a8fa5ff68e5fba877b0cb72679ec3d57
 SHA512:
-  metadata.gz: 716cdb7352cd498a5636712a6e488e713ee80ef8ba6dacad2a7e23b0c86a8641f1b5da568d73b48260511a80f63821e496a0018e46b59c64f4323b0be8ffc087
-  data.tar.gz: 150e266e511a23b431fced083a0c22d5fcd1659fba4f780146aadfd7aa57abe8ba04110b2f53ae0509322d88325f9599a0a010b1ed34889eee1feb50a190ebfa
+  metadata.gz: ac6932c0a74e13fb6f8fa4ae0ff8a3b6e85d9e48de065bf6903979ff47176c4702d75fed3434954c423131322139a3bbcca1952a7d1508a67c67356f1642e24e
+  data.tar.gz: 5a5b3d0468c520e6c9a90d3bad1d8b82944d5889202fc7363399a7df927a39d4c0ab82d8f53dc979d57195e019c87485ffe775854eec66ba2bbe0745b55d3f11

data/lib/event-watcher.rb

@@ -6,23 +6,38 @@ loop {
     Docker::Event.stream { |event|
       HostManager.log.info 'Connected to docker socket. Listening for events.'
       # respond to all container events
-      if event.type == 'container'
-        container_id = event.actor.id.chomp
 
-        container = Docker::Container.get(container_id)
-        ip = container.info['NetworkSettings']['IPAddress']
-        container_name = container.info['Name'].sub!(/^\//, '')
+      begin
+        if event.type == 'container'
+          # container_id = event.actor.id.chomp
 
-        client = HostManager::Client.create('10.10.10.1', 2991)
-        client.host_suffix '.local.signal.sh'
+          # puts event.action
 
-        if event.action == 'start'
-          client.send_action('create', container_name, ip, container_id)
-        elsif event.action == 'die'
-          client.send_action('delete', container_name, ip, container_id)
-        end
+          # container = Docker::Container.get(container_id)
+          # ip = container.info['NetworkSettings']['IPAddress']
+          # HostManager.log.info container.
+          # puts event.type
+
+          # container_name = container.info['Name'].sub!(/^\//, '')
+
+          client = HostManager::Client.create('10.10.10.1', 2991)
+          client.host_suffix '.local.signal.sh'
 
-        client.close
+          # To handle updating single entries
+          # if event.action == 'start'
+          #   client.send_action('create', container_name, ip, container_id)
+          # elsif event.action == 'die'
+          #   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
+
+          client.close
+        end
+      rescue => e
+        puts e.inspect
       end
 
       break

data/lib/host-manager.rb

@@ -28,7 +28,7 @@ module HostManager
   def self.log
     unless @log
       @log = Log4r::Logger.new('main')
-      # @log.outputters << Log4r::Outputter.stdout
+      @log.outputters << Log4r::Outputter.stdout
       @log.outputters << Log4r::FileOutputter.new('logmain', :filename => 'host-manager.log')
     end
 
@@ -53,7 +53,7 @@ module HostManager
       if container_name.include?('.')
         container_name
       else
-        container_name + host_suffix
+        container_name.sub!(/^\//, '') + host_suffix
       end
     end
 
@@ -81,14 +81,36 @@ module HostManager
         begin
           unless content.to_s.chomp.strip.empty?
             data = JSON.parse(content)
-            required_keys = %w(action hostname ip containerId)
-            required_keys.each do |key|
-              unless data.key?(key)
-                raise "Data for key #{key} not provided."
+
+            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'])
+              
+            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
+
+              # add recieved entries
+              data.each do |entry|
+                execute('create', entry['hostname'], entry['ip'], entry['containerId'])
               end
+
             end
-            execute(data['action'], data['hostname'], data['ip'], data['containerId'])
+            
           end
+          
         rescue => e
           log.error("Caught exception attempting to execute with data #{content}. #{e}")
         end
@@ -105,6 +127,9 @@ module HostManager
     def execute(action, hostname, ip, container_id = nil)
       hosts = get_hosts
 
+
+      # todo: remove all entries and then re-add (sync hosts every time)
+
       if action == 'create'
         hosts.elements.each do |element|
           if valid_entry?(element)
@@ -180,6 +205,26 @@ module HostManager
       send(data)
     end
 
+    def sync_hosts(container_data)
+      data = []
+      container_data.each do |container|
+        container.info['Names'].each do |name|
+          ip = container.info['NetworkSettings']['IPAddress']
+
+          if ip
+            item = {
+                :hostname => host_name(name),
+                :ip => ip,
+                :containerId => container.info['id']
+            }
+
+            data.push(item)
+          end
+        end
+
+      end
+    end
+
     def send(data)
       log.info("Sending data via client: #{data.to_json}")
       @socket.write data.to_json + "\n"

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

@@ -61,7 +61,7 @@ module Vagrant
         end
       end
 
-      def self.init_plugin(config)
+      def self.init_plugin
         server_path = File.expand_path('../../server.rb', __FILE__)
 
         if @started
@@ -84,7 +84,7 @@ module Vagrant
         end
       end
 
-      action_hook(:up, :machine_action_up) { init_plugin(@config) }
+      action_hook(:up, :machine_action_up) { init_plugin }
 
     end
   end

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module DnsdockHostUpdater
-    VERSION = '0.0.10'.freeze
+    VERSION = '0.0.11'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dnsdock-hostupdater
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Brian Coit