kontejner 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbaa3f962384589a3f874a95a9562efcded6cf21
-  data.tar.gz: f2f96e863e696e2b19ad22699c84e1ddb77996fe
+  metadata.gz: e894cba528f5cbf2897cd28ff7dc0f2abfc33a4f
+  data.tar.gz: ca53c7661403f39873a5f449175392559f7a7706
 SHA512:
-  metadata.gz: b748acbb71776e0dda218bd42012e613f484264824209f2d690a80d3a7b7a88d8b18c3d0bbf676d0ce366485afcccc2a99b52d9bb8afdefe1468b6fca1c7168e
-  data.tar.gz: f3a3d05fffb1bcdf9ac3864266b1bb484692104503f2b69d7f82e2a42dc3e0367d3a342a0f470a986afe62fc5542339ebb635e957b0a76e17ec090ec25358c9a
+  metadata.gz: 99c51bc973b50bd23d23863e96e92e9d9d9bb094bf546bc6b202a13aa597bee0d41eadd380f41432f13c92d60f44b0b7101bd379c2b57d9be00ec2d040ea6a85
+  data.tar.gz: 4e0e07ec2eec4458328bfa7cdc7d0d95964217050d6653cbfe3d98a6af71035044b76dde864c04e5e3c271919b04b8d8e1a05b941e50177c1998afc047ec2003

data/Dockerfile

@@ -3,6 +3,11 @@ FROM ubuntu:trusty
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 80F70E11F0F0D5F10CB20E62F5DA5F09C3173AA6 \
  && echo 'deb http://ppa.launchpad.net/brightbox/ruby-ng/ubuntu precise main' > /etc/apt/sources.list.d/ruby-ng.list \
  && apt-get -y -q update \
- && apt-get -y -q install git-core ruby2.1 rubygems ruby-switch \
- && ruby-switch --set ruby2.1 \
- && gem install bundler --no-rdoc --no-ri
+ && apt-get -y -q install git-core ruby2.1 ruby2.1-dev rubygems ruby-switch \
+ && ruby-switch --set ruby2.1
+
+RUN gem install kontejner --no-rdoc --no-ri
+
+EXPOSE 53
+ENTRYPOINT ["kontejner"]
+CMD ["start"]

data/README.md

@@ -1,28 +1,25 @@
 # Kontejner
 
-TODO: Write a gem description
+Like [skydock](https://github.com/crosbymichael/skydock) + [skydns](https://github.com/skynetservices/skydns1), but in Ruby.
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-    gem 'kontejner'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
+Install it yourself as:
 
     $ gem install kontejner
 
+Then run it like:
+```bash
+kontejner start --domain=docker --port=7079 --docker=$DOCKER_HOST
+```
+
 ## Usage
 
-TODO: Write usage instructions here
+* Use EventMachine http client rather than blocking excon in Docker Api
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/kontejner/fork )
+1. Fork it ( https://github.com/mikz/kontejner/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/kontejner/resolver.rb

@@ -1,21 +1,90 @@
 require 'docker'
 require 'active_support/cache'
+require 'monitor'
+require 'logger'
 
 module Kontejner
   class Resolver
+    include MonitorMixin
+
+    CACHE_TTL = 600
+    CACHE_OPTIONS = { ttl: CACHE_TTL, race_condition_ttl: CACHE_TTL/100 }.freeze
+
     def initialize(docker:)
-      @connection = Docker::Connection.new(docker, {})
-      @cache = ActiveSupport::Cache::MemoryStore.new
+      @logger = Logger.new($stdout)
+
+      @connection = ::Docker::Connection.new(docker, {})
+      @id_cache = ::ActiveSupport::Cache::MemoryStore.new
+      @ip_cache = ::ActiveSupport::Cache::MemoryStore.new
+
+      super()
+
+      @updater = Thread.new do
+        loop do
+          listen_event_stream
+        end
+      end
+    end
+
+    def listen_event_stream
+      ::Docker::Event.stream({}, @connection) do |event|
+        handle_event(event)
+      end
+    rescue
+      @logger.error('EvenStream') { $ERROR_INFO }
+    end
+
+    def handle_event(event)
+      @logger.debug("Processing event #{event}")
+
+      case event.status
+        when 'die'.freeze
+          @id_cache.clear
+          @ip_cache.delete(event.id)
+        when 'start'.freeze
+          @id_cache.clear
+          @ip_cache.write(event.id, ip(event.id))
+        when 'create'.freeze
+      end
     end
 
     def resolve(name)
-      @cache.fetch(name, expires_in: 60) { fetch(name) }
+      id = id(name)
+
+      @logger.debug("#{name} has id #{id}")
+      @ip_cache.fetch(id, CACHE_OPTIONS) do
+        ip(id)
+      end
     rescue Docker::Error::NotFoundError
+      @logger.warn("#{name} could not be found")
+      false
     end
 
-    def fetch(name)
-      container = Docker::Container.get(name, {}, @connection)
-      container.json['NetworkSettings']['IPAddress']
+    def id(name)
+      case name.length
+        when 64
+          name
+        else
+          @id_cache.fetch(name, CACHE_OPTIONS) do
+            container = Docker::Container.get(name, {}, @connection)
+            @logger.debug("Resolved #{name} to #{container.id}")
+            container.id
+          end
+      end
     end
+
+    def ip(id)
+      container = Docker::Container.get(id, {}, @connection)
+      json = container.json
+      unless json['State']['Running']
+        @logger.warn("#{id} is not running")
+        raise Docker::Error::NotFoundError
+      end
+      ip = json['NetworkSettings']['IPAddress']
+      @logger.debug("#{id} has ip #{ip}")
+      ip
+    end
+
+    private
   end
 end

data/lib/kontejner/server.rb

@@ -3,33 +3,46 @@ require 'kontejner/resolver'
 
 module Kontejner
   class Server
-    GOOGLE_SERVERS = [ [:udp, '8.8.8.8', 53], [:tcp, '8.8.8.8', 53], [:udp, '8.8.4.4', 53], [:udp, '8.8.4.4', 53] ]
+    GOOGLE_SERVERS = [ [:udp, '8.8.8.8', 53], [:tcp, '8.8.8.8', 53], [:udp, '8.8.4.4', 53], [:tcp, '8.8.4.4', 53] ]
 
     IN = Resolv::DNS::Resource::IN
 
     def initialize(domain:,docker:,ttl:)
+      @dns = RubyDNS::RuleBasedServer.new
+
+      @logger = @dns.logger
+      @logger.level = Logger::DEBUG
+
+      @matcher = /(?<subdomain>[^.]+)\.#{domain}$/
+      @ttl = ttl
+
       @upstream = RubyDNS::Resolver.new(GOOGLE_SERVERS)
       @docker = Kontejner::Resolver.new(docker: docker)
 
-      @dns = RubyDNS::RuleBasedServer.new
-      @dns.logger.level = Logger::INFO
+      @logger.info("Docker Connection #{docker}")
+    end
+
+    def start(**options)
+      @logger.debug("Matching #{@matcher}")
 
-      @dns.match(/(?<subdomain>[^.]+)\.#{domain}$/, IN::A) do |t, match|
+      @dns.match(@matcher, IN::A) do |t, match|
         ip = @docker.resolve(match[:subdomain])
 
         if ip
-          t.respond!(ip, ttl: ttl)
+          t.respond!(ip, ttl: @ttl)
         else
-          t.fail! :NoError
+          t.fail! :NXDomain
         end
       end
 
       @dns.otherwise do |q|
         q.passthrough!(@upstream)
       end
+
+      run(options)
     end
 
-    def start(**options)
+    def run(options)
       EventMachine.run do
         trap("INT") do
           EventMachine.stop

data/lib/kontejner/version.rb

@@ -1,3 +1,3 @@
 module Kontejner
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontejner
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Michal Cichra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler