murakumo 0.1.4 → 0.1.5

data/bin/murakumo-install-init-script

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-MRKM_DIR = 'murakumo-0.1.4'
 INIT_D_DIR = '/etc/init.d'
 
 begin
@@ -19,5 +18,5 @@ else
   exit 1
 end
 
-`cp -i #{gem_dir}/#{MRKM_DIR}/etc/murakumo.server #{INIT_D_DIR}/murakumo`
+`cp -i #{gem_dir}/murakumo-*/etc/murakumo.server #{INIT_D_DIR}/murakumo`
 `chmod 755 #{INIT_D_DIR}/murakumo`

data/etc/murakumo.server

@@ -91,10 +91,23 @@ host: $ip_addr, $hostname, 60
 #      http_get '/index.html'
 EOF
 
+  chmod 600 $conf
+
   echo "configuration file was created: $conf"
   echo -e "\033[0;31mPlease set 127.0.0.1 to resolv.conf.\033[0;39m" 
   ;;
+hup)
+  PID=`ps -ef | awk '/ruby/ && /murakumo/ && !/awk/{print $2}'`
+
+  if [ -n "$PID" ]; then
+    echo "sent HUP to murakumo($PID)."
+    kill -HUP $PID
+  else
+    echo 'pid is not found.'
+    exit 1
+  fi
+  ;;
 *)
-  echo $"Usage: $0 {start|stop|restart|status|save|configureh}"
+  echo $"Usage: $0 {start|stop|restart|status|save|configure|hup}"
   exit 1
 esac

data/lib/cli/mrkmctl.rb

@@ -17,17 +17,10 @@ begin
   case cmd
   # 一覧表示
   when :list
-    records = if arg.kind_of?(String)
-                # 引数がある場合はフィルタリング
-                there.list_records.select {|r| r[0..1].any?{|i| i.start_with?(arg) } }
-              else
-                there.list_records
-              end
+    # レコードの取得
+    records = there.list_records
 
-    puts <<-EOF
-IP address       TTL     Priority  Activity  Hostname
----------------  ------  ---------  --------  ----------
-    EOF
+    # 値の書き換え
     records.each do |r|
       priority = case r[3]
                  when Murakumo::ORIGIN
@@ -42,6 +35,18 @@ IP address       TTL     Priority  Activity  Hostname
 
       r[3] = priority
       r[4] = (r[4] == Murakumo::ACTIVE ? 'Active' : 'Inactive')
+    end
+
+    if arg.kind_of?(String)
+      # 引数がある場合はフィルタリング（TTLを除く）
+      records = records.select {|r| r.values_at(0, 1, 3, 4).any?{|i| i.to_s =~ /\A#{arg.to_s}/i } }
+    end
+
+    puts <<-EOF
+IP address       TTL     Priority  Activity  Hostname
+---------------  ------  ---------  --------  ----------
+    EOF
+    records.each do |r|
       puts '%-15s  %6d  %-9s  %-8s  %s' % r.values_at(0, 2, 3, 4, 1)
     end
 

data/lib/cli/murakumo_options.rb

@@ -10,7 +10,7 @@ Version = Murakumo::VERSION
 def murakumo_parse_args
   optopus do
     desc 'key for authentication (required)'
-    option :auth_key, '-K', '--auth-key STRING', :required => true
+    option :auth_key, '-K', '--auth-key STRING_OR_PATH', :required => true
 
     desc 'ip address to bind'
     option :dns_address, '-a', '--address IP', :default => '0.0.0.0' do |value|
@@ -114,6 +114,11 @@ def murakumo_parse_args
     option :gossip_receive_timeout, '-O', '--gossip-receive-timeout NUM', :type => Integer, :default => 3
 
     after do |options|
+      # auth_key
+      if File.exist?(options[:auth_key])
+        options[:auth_key] = File.read(options[:auth_key]).strip
+      end
+
       # resolver
       if options[:resolver]
         options[:resolver] = options[:resolver].map {|i| i.strip }
@@ -168,6 +173,13 @@ def murakumo_parse_args
 
       options[:logger] = Logger.new(options[:log_path] || $stderr)
       options[:logger].level = Logger.const_get(options[:log_level].to_s.upcase)
+
+      # check same hostname
+      hostnames = [options[:host][0].downcase] + options[:aliases].map {|i| i[0].downcase }
+
+      if hostnames.length != hostnames.uniq.length
+        raise OptionParser::ParseError, 'same hostname was found'
+      end
     end
 
     error do |e|

data/lib/misc/murakumo_const.rb

@@ -1,5 +1,5 @@
 module Murakumo
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 
   # Priority
   MASTER = 1

data/lib/srv/murakumo_cloud.rb

@@ -13,6 +13,7 @@ module Murakumo
     attr_reader :address
     attr_reader :gossip
     attr_reader :db
+    attr_reader :hostname
 
     def initialize(options)
       # オプションはインスタンス変数に保存
@@ -21,8 +22,10 @@ module Murakumo
       # リソースレコードからホストのアドレスとデータを取り出す
       host_data = options[:host]
       @address = host_data.shift
+      @hostname = host_data.first
       host_data.concat [ORIGIN, ACTIVE]
       alias_datas = options[:aliases].map {|r| r + [ACTIVE] }
+      @logger = options[:logger]
 
       # 名前は小文字に変換
       datas = ([host_data] + alias_datas).map do |i|
@@ -45,7 +48,7 @@ module Murakumo
         :node_lifetime   => options[:gossip_node_lifetime],
         :gossip_interval => options[:gossip_send_interval],
         :receive_timeout => options[:gossip_receive_timeout],
-        :logger          => options[:logger],
+        :logger          => @logger,
       })
 
       # ノードの更新をフック
@@ -70,12 +73,19 @@ module Murakumo
 
         if health_check.kind_of?(Hash)
           health_check.each do |name, conf|
-            checker = HealthChecker.new(name.downcase, self, options[:logger], conf)
-            @health_checkers[name] = checker
-            # ヘルスチェックはまだ起動しない
+            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
-          options[:logger].warn('configuration of a health check is not right')
+          @logger.warn('configuration of a health check is not right')
         end
       end
     end
@@ -308,6 +318,11 @@ module Murakumo
         # 名前は小文字に変換
         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 (?, ?, ?, ?, ?)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murakumo
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - winebarrel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-19 00:00:00 Z
+date: 2011-11-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubydns