murakumo 0.2.9 → 0.3.0

data/README

@@ -35,7 +35,7 @@ https://bitbucket.org/winebarrel/murakumo
   shell> mrkmctl -L
   IP address       TTL     Priority  Activity  Hostname
   ---------------  ------  --------  --------  ----------
-  10.11.12.13          60  Origin    Active    dev-01
+  10.11.12.13          60  Origin    Active    my-host
   10.11.12.13         300  Master    Active    foo.bar
 
 === deletion of a record 

data/bin/mrkmctl.orig

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'rubygems'
+require 'cli/mrkmctl'

data/bin/murakumo-install-init-script.orig

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'misc/murakumo_const'
+
+INIT_D_DIR = '/etc/init.d'
+
+begin
+  require 'rbconfig'
+  require 'rubygems'
+rescue LoadError
+end
+
+gem_dir = nil
+
+if defined?(Gem)
+  gem_dir = "#{Gem.dir}/gems"
+elsif defined?(RbConfig)
+  gem_dir = RbConfig::CONFIG["rubylibdir"].sub(/\d+\.\d+\Z/) {|m| "gems/#{m}/gems"}
+else
+  $stderr.puts 'error: gem dir is not found.'
+  exit 1
+end
+
+bin_dir = ((RbConfig::CONFIG['bindir'] rescue nil) || '').strip
+
+`cp -i #{gem_dir}/murakumo-#{Murakumo::VERSION}/etc/murakumo.server #{INIT_D_DIR}/murakumo`
+`chmod 755 #{INIT_D_DIR}/murakumo`
+
+unless bin_dir.empty?
+  `sed -i -r 's|^# processname:.*|# processname: #{bin_dir}/murakumo|' #{INIT_D_DIR}/murakumo`
+  `sed -i -r 's|^prog=.*|prog=#{bin_dir}/murakumo|' #{INIT_D_DIR}/murakumo`
+  `sed -i -r 's|^ctlprog=.*|ctlprog=#{bin_dir}/mrkmctl|' #{INIT_D_DIR}/murakumo`
+end

data/bin/murakumo.orig

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'rubygems'
+require 'cli/murakumo'

data/etc/murakumo-update-config-for-ec2.orig

@@ -0,0 +1,33 @@
+#!/bin/sh
+CURL='curl --retry 3 --retry-delay 0 --silent --fail'
+IP_ADDR=`$CURL http://169.254.169.254/1.0/meta-data/local-ipv4`
+CONF=/etc/murakumo.yml
+
+if [ $? -ne 0 -o -z "$IP_ADDR" ]; then
+  exit 1
+fi
+
+if [ `grep ^host $CONF | egrep "host: $IP_ADDR\b" | wc -l` -eq 1 ]; then
+  exit
+fi
+
+## gets a host name from user data.
+#HOSTNAME=`$CURL http://169.254.169.254/1.0/user-data`
+
+## gets a host name from name tag.
+#export JAVA_HOME=/usr/java/default
+#export EC2_HOME=/opt/ec2-api-tools
+#EC2_PRIVATE_KEY=
+#EC2_CERT=
+#REGION=ap-northeast-1
+#EC2DIN=$EC2_HOME/bin/ec2-describe-instances
+#HOSTNAME=`$EC2DIN -K $EC2_PRIVATE_KEY -C $EC2_CERT --region $REGION -F "private-ip-address=$IP_ADDR" | awk -F'\t' '$1 == "TAG" && $4 == "Name" {print $5}'`
+
+## gets a host name from meta data.
+HOSTNAME=`$CURL http://169.254.169.254/1.0/meta-data/hostname`
+
+if [ $? -ne 0 -o -z "$HOSTNAME" ]; then
+  exit 1
+fi
+
+sed -i.bak -r "s|^host:.*|host: $IP_ADDR, $HOSTNAME|" /etc/murakumo.yml

data/etc/murakumo.server

@@ -70,6 +70,7 @@ max-ip-num: 8
 
 #initial-nodes: 10.11.12.14, 10.11.12.15
 #domain: ap-northeast-1.compute.internal
+#enable-cache: true
 
 host: $ip_addr, $hostname, 60
 

data/etc/murakumo.yml.example

@@ -10,6 +10,7 @@ max-ip-num: 8
 
 #initial-nodes: 10.11.12.14, 10.11.12.15
 #domain: ap-northeast-1.compute.internal
+#enable-cache: true
 
 # Ip address, hostname, ttl
 host: 10.11.12.13, my-host, 60

data/lib/cli/murakumo_options.rb

@@ -88,6 +88,9 @@ def murakumo_parse_args
       invalid_argument if (value || '').strip.empty?
     end
 
+    desc 'enables the cache of a response'
+    option :enable_cache, '-e', '--enable-cache'
+
     desc 'command of daemonize: {start|stop|restart|status}'
     option :daemon, '-d', '--daemon CMD', :type => [:start, :stop, :restart, :status]
 

data/lib/misc/murakumo_const.rb

@@ -1,5 +1,5 @@
 module Murakumo
-  VERSION = '0.2.9'
+  VERSION = '0.3.0'
 
   # Priority
   MASTER = 1

data/lib/srv/murakumo_cloud.rb

@@ -36,6 +36,8 @@ module Murakumo
       # データベースを作成してレコードを更新
       create_database
       update(@address, datas)
+
+      # updateの後にホスト名をセットすること
       @hostname = host_data.first
 
       # ゴシップオブジェクトを生成
@@ -88,6 +90,9 @@ module Murakumo
           @logger.warn('configuration of a health check is not right')
         end
       end
+
+      # キャッシュ
+      @cache = {} if options[:enable_cache]
     end
 
     # Control of service
@@ -116,6 +121,7 @@ module Murakumo
         :socket        => 'socket',
         :max_ip_num    => 'max-ip-num',
         :domain        => 'domain',
+        :enable_cache  => lambda {|v| ['enable-cache', !!v] },
         :log_path      => 'log-path',
         :log_level     => 'log-level',
         :gossip_port   => 'gossip-port',
@@ -362,11 +368,51 @@ module Murakumo
       # ドメインが指定されていたら削除
       name.sub!(/\.#{Regexp.escape(@options[:domain])}\Z/i, '') if @options[:domain]
 
-      # シングルスレッドェ…
-      @address_records = @db.execute(<<-EOS, name, ACTIVE)
-        SELECT ip_address, ttl, priority FROM records
-        WHERE name = ? AND activity = ?
-      EOS
+      if @cache.nil?
+        # キャッシュを設定していないときはいつもの処理
+        @address_records = @db.execute(<<-EOS, name, ACTIVE) # シングルスレッドェ…
+          SELECT ip_address, ttl, priority FROM records
+          WHERE name = ? AND activity = ?
+        EOS
+      else
+        # キャッシュを設定しているとき
+        # キャッシュを検索
+        @address_records, cache_time = @cache[name]
+        now = Time.now
+
+        # キャッシュが見つからなかった・期限が切れていた場合
+        if @address_records.nil? or now > cache_time
+          # 既存のキャッシュは削除
+          @cache.delete(name)
+
+          # 普通に検索
+          @address_records = @db.execute(<<-EOS, name, ACTIVE) # シングルスレッドェ…
+            SELECT ip_address, ttl, priority FROM records
+            WHERE name = ? AND activity = ?
+          EOS
+
+          # レコードがあればキャッシュに入れる（ネガティブキャッシュはしない）
+          unless @address_records.empty?
+            min_ttl = nil
+
+            # レコードはハッシュに変換する
+            cache_records = @address_records.map do |i|
+              ip_address, ttl, priority = i.values_at('ip_address', 'ttl', 'priority')
+
+              if min_ttl.nil? or ttl < min_ttl
+                min_ttl = ttl
+              end
+
+              {'ip_address' => ip_address, 'ttl' => ttl, 'priority' => priority}
+            end
+
+            # 最小値をExpire期限として設定
+            expire_time = now + min_ttl
+
+            @cache[name] = [cache_records, expire_time]
+          end
+        end # キャッシュが見つからなかった場合
+      end # @cache.nil?の判定
 
       @address_records.length.nonzero?
     end

data/lib/srv/murakumo_cloud.rb.orig

@@ -0,0 +1,532 @@
+require 'forwardable'
+require 'rgossip2'
+require 'sqlite3'
+
+require 'srv/murakumo_health_checker'
+require 'misc/murakumo_const'
+
+module Murakumo
+
+  class Cloud
+    extend Forwardable
+
+    attr_reader :address
+    attr_reader :gossip
+    attr_reader :db
+    attr_reader :hostname
+
+    def initialize(options)
+      # オプションはインスタンス変数に保存
+      @options = options
+
+      # リソースレコードからホストのアドレスとデータを取り出す
+      host_data = options[:host]
+      @address = host_data.shift
+      host_data.concat [ORIGIN, ACTIVE]
+      alias_datas = options[:aliases].map {|r| r + [ACTIVE] }
+      @logger = options[:logger]
+
+      # 名前は小文字に変換
+      datas = ([host_data] + alias_datas).map do |i|
+        name, ttl, priority, activity = i
+        name = name.downcase
+        [name, ttl, priority, activity]
+      end
+
+      # データベースを作成してレコードを更新
+      create_database
+      update(@address, datas)
+
+      # updateの後にホスト名をセットすること
+      @hostname = host_data.first
+
+      # ゴシップオブジェクトを生成
+      @gossip = RGossip2.client({
+        :initial_nodes   => options[:initial_nodes],
+        :address         => @address,
+        :data            => datas,
+        :auth_key        => options[:auth_key],
+        :port            => options[:gossip_port],
+        :node_lifetime   => options[:gossip_node_lifetime],
+        :gossip_interval => options[:gossip_send_interval],
+        :receive_timeout => options[:gossip_receive_timeout],
+        :logger          => @logger,
+      })
+
+      # ノードの更新をフック
+      @gossip.context.callback_handler = lambda do |act, addr, ts, dt, old_dt|
+        case act
+        when :add, :comeback
+          # 追加・復帰の時は無条件に更新
+          update(addr, dt)
+        when :update
+          # 更新の時はデータが更新されたときのみ更新
+          update(addr, dt) if dt != old_dt
+        when :delete
+          delete(addr)
+        end
+      end
+
+      # ヘルスチェック
+      @health_checkers = {}
+
+      if options.config_file and options.config_file['health-check']
+        health_check = options.config_file['health-check']
+
+        if health_check.kind_of?(Hash)
+          health_check.each do |name, conf|
+            name = name.downcase
+
+            if datas.any? {|i| i[0] == name }
+              checker = HealthChecker.new(name, self, @logger, conf)
+              @health_checkers[name] = checker
+              # ヘルスチェックはまだ起動しない
+            else
+              # ホスト名になかったら警告
+              @logger.warn("host for a health check is not found: #{name}")
+            end
+          end
+        else
+          @logger.warn('configuration of a health check is not right')
+        end
+      end
+
+      # キャッシュ
+      @cache = {}
+    end
+
+    # Control of service
+    def_delegators :@gossip, :stop, :clear_dead_list
+
+    def start
+      # デーモン化すると子プロセスはすぐ死ぬので
+      # このタイミングでヘルスチェックを起動
+      @health_checkers.each do |name, checker|
+        checker.start
+      end
+
+      @gossip.start
+    end
+
+    def to_hash
+      keys = {
+        :auth_key      => 'auth-key',
+        :dns_address   => 'address',
+        :dns_port      => 'port',
+        :initial_nodes => lambda {|v| ['initial-nodes', v.join(',')] },
+        :resolver      => lambda {|v| [
+          'resolver',
+          v.instance_variable_get(:@config).instance_variable_get(:@config_info)[:nameserver].join(',')
+        ]},
+        :socket        => 'socket',
+        :max_ip_num    => 'max-ip-num',
+        :domain        => 'domain',
+        :log_path      => 'log-path',
+        :log_level     => 'log-level',
+        :gossip_port   => 'gossip-port',
+        :gossip_node_lifetime => lambda {|v| [
+          'gossip-node-lifetime',
+          @gossip.context.node_lifetime
+        ]},
+        :gossip_send_interval => lambda {|v| [
+          'gossip-send-interval',
+          @gossip.context.gossip_interval
+        ]},
+        :gossip_receive_timeout => lambda {|v| [
+          'gossip-receive-timeout',
+          @gossip.context.receive_timeout
+        ]},
+      }
+
+      hash = {}
+
+      keys.each do |k, name|
+        value = @options[k]
+
+        if value and name.respond_to?(:call)
+          name, value = name.call(value)
+        end
+
+        if value and (not value.kind_of?(String) or not value.empty?)
+          hash[name] = value
+        end
+      end
+
+      records = list_records
+
+      hash['host'] = records.find {|r| r[3] == ORIGIN }[0..2].join(',')
+
+      aliases = records.select {|r| r[3] != ORIGIN }.map do |r|
+        [r[1], r[2], (r[3] == MASTER ? 'master' : 'backup')].join(',')
+      end
+
+      hash['alias'] = aliases unless aliases.empty?
+
+      if @options.config_file and @options.config_file['health-check']
+        hash['health-check'] = @options.config_file['health-check']
+      end
+
+      return hash
+    end
+
+    def list_records
+      columns = %w(ip_address name ttl priority activity)
+
+      @db.execute(<<-EOS).map {|i| i.values_at(*columns) }
+        SELECT #{columns.join(', ')} FROM records ORDER BY ip_address, name
+      EOS
+    end
+
+    def add_or_rplace_records(records)
+      errmsg = nil
+
+      # 名前は小文字に変換
+      records = records.map do |i|
+        name, ttl, priority = i
+        name = name.downcase
+        [name, ttl, priority]
+      end
+
+      @gossip.transaction do
+
+        # 既存のホスト名は削除
+        @gossip.data.reject! do |d|
+          if records.any? {|r| r[0] == d[0] }
+            # オリジンのPriorityは変更不可
+            if d[2] == ORIGIN
+              records.each {|r| r[2] = ORIGIN if r[0] == d[0] }
+            end
+
+            true
+          end
+        end
+
+        # データを更新
+        records = records.map {|r| r + [ACTIVE] }
+        @gossip.data.concat(records)
+      end # transaction
+
+      # データベースを更新
+      update(@address, records, true)
+
+      # ヘルスチェックがあれば開始
+      records.map {|i| i.first }.each do |name|
+        checker = @health_checkers[name]
+
+        if checker and not checker.alive?
+          checker.start
+        end
+      end
+
+      return [!errmsg, errmsg]
+    end
+
+    def delete_records(names)
+      errmsg = nil
+
+      # 名前は小文字に変換
+      names = names.map {|i| i.downcase }
+
+      @gossip.transaction do
+        # データを削除
+        @gossip.data.reject! do |d|
+          if names.any? {|n| n == d[0] }
+            if d[2] == ORIGIN
+              # オリジンは削除不可
+              errmsg = 'original host name cannot be deleted'
+              names.reject! {|n| n == d[0] }
+              false
+            else
+              true
+            end
+          end
+        end
+      end # transaction
+
+      # データベースを更新
+      delete_by_names(@address, names)
+
+      # ヘルスチェックがあれば停止
+      names.each do |name|
+        checker = @health_checkers[name]
+        checker.stop if checker
+      end
+
+      return [!errmsg, errmsg]
+    end
+
+    def add_nodes(nodes)
+      errmsg = nil
+
+      nodes.each do |i|
+        @gossip.add_node(i)
+      end
+
+      return [!errmsg, errmsg]
+    end
+
+    def delete_nodes(nodes)
+      errmsg = nil
+
+      nodes.each do |i|
+        @gossip.delete_node(i)
+      end
+
+      return [!errmsg, errmsg]
+    end
+
+    def get_attr(name)
+      return unless ATTRIBUTES.has_key?(name)
+
+      if name == :log_level
+        if @gossip.logger
+          %w(debug info warn error fatal)[@gossip.logger.level]
+        else
+          nil
+        end
+      else
+        attr, conv = ATTRIBUTES[name]
+        @gossip.context.send(attr).to_s
+      end
+    end
+
+    def set_attr(name, value)
+      return unless ATTRIBUTES.has_key?(name)
+
+      errmsg = nil
+
+      if name == :log_level
+        if @gossip.logger
+          @gossip.logger.level = %w(debug info warn error fatal).index(value.to_s)
+        end
+      else
+        attr, conv = ATTRIBUTES[name]
+        @gossip.context.send("#{attr}=", value.send(conv)).to_s
+      end
+
+      return [!errmsg, errmsg]
+    end
+
+    def close
+      # データベースをクローズ
+      @db.close
+    end
+
+    # Operation of storage 
+
+    def update(address, datas, update_only = false)
+      return unless datas
+
+      datas.each do |i|
+        name, ttl, priority, activity = i
+
+        # 名前は小文字に変換
+        name = name.downcase
+
+        # ホスト名と同じなら警告
+        if name == @hostname
+          @logger.warn('same hostname as origin was found')
+        end
+
+        @db.execute(<<-EOS, address, name, ttl, priority, activity)
+          REPLACE INTO records (ip_address, name, ttl, priority, activity)
+          VALUES (?, ?, ?, ?, ?)
+        EOS
+      end
+
+      # データにないレコードは消す
+      unless update_only
+        names = datas.map {|i| "'#{i.first.downcase}'" }.join(',')
+
+        @db.execute(<<-EOS, address)
+          DELETE FROM records
+          WHERE ip_address = ? AND name NOT IN (#{names})
+        EOS
+      end
+    end
+
+    def delete(address)
+      @db.execute('DELETE FROM records WHERE ip_address = ?', address)
+    end
+
+    def delete_by_names(address, names)
+      names = names.map {|i| "'#{i.downcase}'" }.join(',')
+
+      @db.execute(<<-EOS, address)
+        DELETE FROM records
+        WHERE ip_address = ? AND name IN (#{names})
+      EOS
+    end
+
+    # Search of records
+
+    def address_exist?(name)
+      # 名前は小文字に変換
+      name = name.downcase
+
+      # ドメインが指定されていたら削除
+      name.sub!(/\.#{Regexp.escape(@options[:domain])}\Z/i, '') if @options[:domain]
+
+      # キャッシュを検索
+      @address_records, cache_time = @cache[name]
+      now = Time.now
+
+      unless @address_records and now <= cache_time
+        # キャッシュがない場合
+
+        # シングルスレッドェ…
+        @address_records = @db.execute(<<-EOS, name, ACTIVE)
+          SELECT ip_address, ttl, priority FROM records
+          WHERE name = ? AND activity = ?
+        EOS
+
+        # レコードがあればキャッシュに入れる
+        if @address_records.empty?
+          # ネガティブキャッシュはしない
+          @cache.delete(name)
+        else
+          min_ttl = nil
+
+          # レコードはハッシュに変換する
+          cache_records = @address_records.map do |i|
+            ip_address, ttl, priority = i.values_at('ip_address', 'ttl', 'priority')
+
+            if min_ttl.nil? or ttl < min_ttl
+              min_ttl = ttl
+            end
+
+            {'ip_address' => ip_address, 'ttl' => ttl, 'priority' => priority}
+          end
+
+          expire_time = now + min_ttl
+          @cache[name] = [cache_records, expire_time]
+        end
+      end
+
+      @address_records.length.nonzero?
+    end
+
+    def lookup_addresses(name)
+      records = nil
+
+      #if @address_records.length == 1
+      #  # レコードが一件ならそれを返す
+      #  return @address_records.map {|i| i.values_at('ip_address', 'ttl') }
+      #end
+      @address_record
+
+      # 優先度の高いレコードを検索
+      #records = @address_records #.select {|i| i['priority'] == MASTER }
+
+      # 次に優先度の高いレコードを検索
+      #records.concat(shuffle_records(@address_records.select {|i| i['priority'] == SECONDARY }))
+
+      # レコードが見つからなかった場合はバックアップを選択
+      #if records.empty?
+      #  records = shuffle_records(@address_records.select {|i| i['priority'] == BACKUP })
+      #end
+
+      # それでもレコードが見つからなかった場合はオリジンを選択
+      # ※このパスは通らない
+      #records = @address_records if records.empty?
+
+      # IPアドレス、TTLを返す
+      #records.map {|i| i.values_at('ip_address', 'ttl') }
+    ensure
+      # エラー検出のため、一応クリア
+      @address_records = nil
+    end
+
+    def name_exist?(address)
+      address = x_ip_addr(address)
+
+      # シングルスレッドェ…
+      @name_records = @db.execute(<<-EOS, address, ACTIVE)
+        SELECT name, ttl, priority FROM records
+        WHERE ip_address = ? AND activity = ?
+      EOS
+
+      @name_records.length.nonzero?
+    end
+
+    def lookup_name(address)
+      record = nil
+
+      if @name_records.length == 1
+        # レコードが一件ならそれを返す
+        record = @name_records.first
+      else
+        # オリジンを検索
+        record = @name_records.find {|i| i['priority'] == ORIGIN }
+
+        # レコードが見つからなかった場合は優先度の高いレコード選択
+        unless record
+          record = @name_records.find {|i| i['priority'] == ACTIVE }
+        end
+
+        # それでもレコードが見つからなかった場合は優先度の低いレコードを選択
+        record = @name_records.first unless record
+      end
+
+      # ホスト名、TTLを返す
+      return record.values_at('name', 'ttl')
+    ensure
+      # エラー検出のため、一応クリア
+      @name_records = nil
+    end
+
+    private
+
+    # 乱数でレコードをシャッフルする
+    def shuffle_records(records)
+      # レコードが一件の時はそのまま返す
+      return records if records.length == 1
+
+      # 先頭のAレコードを決定
+      max_ip_num = [records.length, @options[:max_ip_num]].min
+      first_index = rand(records.length)
+
+      # Aレコードを返す
+      (records + records).slice(first_index, max_ip_num)
+    end
+
+    # リソースレコードのデータベース作成
+    # もう少し並列処理に強いストレージに変えたいが…
+    def create_database
+      @db = SQLite3::Database.new(':memory:')
+      @db.type_translation = true
+      @db.results_as_hash = true
+
+      # リソースレコード用のテーブル
+      # （Typeは必要？）
+      @db.execute(<<-EOS)
+        CREATE TABLE records (
+          ip_address TEXT NOT NULL,
+          name       TEXT NOT NULL,
+          ttl        INTEGER NOT NULL,
+          priority   INTEGER NOT NULL, /* MASTER:1, BACKUP:0, ORIGIN:-1 */
+          activity   INTEGER NOT NULL, /* Active:1, Inactive:0 */
+          PRIMARY KEY (ip_address, name)
+        )
+      EOS
+
+      # インデックスを作成（必要？）
+      @db.execute(<<-EOS)
+        CREATE INDEX idx_name_act
+        ON records (name, activity)
+      EOS
+
+      @db.execute(<<-EOS)
+        CREATE INDEX idx_ip_act
+        ON records (ip_address, activity)
+      EOS
+    end
+
+    # 逆引き名の変換
+    def x_ip_addr(name)
+      name.sub(/\.in-addr\.arpa\Z/, '').split('.').reverse.join('.')
+    end
+
+  end # Cloud
+
+end # Murakumo

data/lib/srv/murakumo_server.rb

@@ -69,10 +69,24 @@ module Murakumo
           match(@@cloud.method(:address_exist?), :A) do |transaction|
             records = @@cloud.lookup_addresses(transaction.name)
 
+            addrs = []
+            min_ttl = nil # 最小のTTLをセット
+
             records.each do |r|
               address, ttl = r
-              transaction.respond!(address, :ttl => ttl)
+
+              if min_ttl.nil? or ttl < min_ttl
+                min_ttl = ttl
+              end
+
+              addrs << Resolv::DNS::Resource::IN::A.new(address)
             end
+
+            # 直接引数に渡せないので…
+            addrs << {:ttl => min_ttl}
+
+            # スループットをあげるためrespond!は呼ばない
+            transaction.append!(*addrs)
           end # match
 
           # look up PTR record

data/lib/srv/murakumo_server.rb.orig

@@ -0,0 +1,101 @@
+require 'drb/drb'
+require 'fileutils'
+require 'rexec'
+require 'rexec/daemon'
+require 'rubydns'
+require 'socket'
+
+require 'srv/murakumo_cloud'
+
+BasicSocket.do_not_reverse_lookup = true
+
+module Murakumo
+
+  # RExecに依存しているのでこんな設計に…
+  class Server < RExec::Daemon::Base
+
+    # クラスメソッドを定義
+    class << self
+
+      def init(options)
+        # クラスインスタンス変数を使わないこと
+        @@options = options
+        @@cloud = Cloud.new(options)
+      end
+
+      def pid_directory=(path)
+        @@pid_directory = path
+      end
+
+      def run
+        RubyDNS.run_server(:listen => [[:udp, @@options[:dns_address], @@options[:dns_port]]]) do
+          # RubyDNS::Serverのコンテキスト
+          @logger = @@options[:logger] if @@options[:logger]
+
+          on(:start) do
+            if @@options[:socket]
+              # 既存のソケットファイルは削除
+              FileUtils.rm_f(@@options[:socket])
+
+              # ServerクラスをDRuby化
+              DRb.start_service("drbunix:#{@@options[:socket]}", @@cloud)
+              at_exit { FileUtils.rm_f(@@options[:socket]) }
+            end
+
+            # HUPでログをローテート
+            if @@options[:logger]
+              trap(:HUP) do
+                if logger = @@options[:logger]
+                  logdev = logger.instance_variable_get(:@logdev)
+
+                  if (dev = logdev.dev).kind_of?(File)
+                    path = dev.path
+                    mutex = logdev.instance_variable_get(:@mutex)
+
+                    mutex.synchronize do
+                      dev.reopen(path, 'a')
+                      dev.sync = true
+                    end
+                  end
+                end
+              end
+            end
+
+            # ゴシッププロトコルを開始
+            @@cloud.start
+          end
+
+          # look up A record
+          match(@@cloud.method(:address_exist?), :A) do |transaction|
+            transaction.append!(Resolv::DNS::Resource::IN::A.new('10.158.59.165'), Resolv::DNS::Resource::IN::A.new('10.148.150.17'))
+            #records = @@cloud.lookup_addresses(transaction.name)
+
+            #records.each do |r|
+            #  address, ttl = r.values_at('ip_address', 'ttl')
+            #  transaction.respond!(address, :ttl => ttl)
+            #end
+          end # match
+
+          # look up PTR record
+          match(@@cloud.method(:name_exist?), :PTR) do |transaction|
+            name, ttl = @@cloud.lookup_name(transaction.name)
+            transaction.respond!(Resolv::DNS::Name.create("#{name}."), :ttl => ttl)
+          end
+
+          if @@options[:resolver]
+            otherwise do |transaction|
+              transaction.passthrough!(@@options[:resolver])
+            end
+          end
+        end # RubyDNS.run_server
+      end # run
+
+      def shutdown
+        @@cloud.stop
+      end
+
+    end # class << self
+
+  end # Server
+
+end # Murakumo

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murakumo
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 9
-  version: 0.2.9
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - winebarrel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-22 00:00:00 Z
+date: 2011-11-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubydns
@@ -93,23 +93,29 @@ extra_rdoc_files: []
 
 files: 
 - README
+- bin/murakumo.orig
+- bin/murakumo
+- bin/murakumo-install-init-script.orig
 - bin/murakumo-install-init-script
+- bin/mrkmctl.orig
 - bin/mrkmctl
-- bin/murakumo
-- lib/cli/murakumo_options.rb
 - lib/cli/mrkmctl.rb
-- lib/cli/mrkmctl_options.rb
 - lib/cli/murakumo.rb
-- lib/srv/murakumo_health_checker_context.rb
+- lib/cli/murakumo_options.rb
+- lib/cli/mrkmctl_options.rb
+- lib/misc/murakumo_const.rb
 - lib/srv/murakumo_server.rb
+- lib/srv/murakumo_cloud.rb.orig
+- lib/srv/murakumo_health_checker_context.rb
+- lib/srv/murakumo_server.rb.orig
 - lib/srv/murakumo_health_checker.rb
 - lib/srv/murakumo_cloud.rb
-- lib/misc/murakumo_const.rb
-- etc/murakumo-update-config-for-ec2
-- etc/gai.conf.example
+- etc/murakumo.server
+- etc/murakumo-update-config-for-ec2.orig
 - etc/murakumo.yml.example
+- etc/gai.conf.example
+- etc/murakumo-update-config-for-ec2
 - etc/dhclient-script.patch
-- etc/murakumo.server
 homepage: https://bitbucket.org/winebarrel/murakumo
 licenses: []
 
@@ -139,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.1
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Murakumo is the internal DNS server which manages name information using a gossip protocol.