murakumo 0.3.8 → 0.3.9

data/bin/murakumo-show-ip-address

@@ -0,0 +1,2 @@
+#!/usr/bin/env ruby
+puts `/sbin/ifconfig eth0 | awk -F'[: ]+' '/^eth0/,/^$/{if(/inet addr/) print $4}'`.strip

data/etc/murakumo.server

@@ -72,6 +72,13 @@ max-ip-num: 8
 #domain: ap-northeast-1.compute.internal
 #enable-cache: true
 
+# specify the script which initializes a setup
+#init-script: |
+#  @options['initial-nodes'] = '10.11.12.20, 10.11.12.21'
+
+# (another way)
+#init-script: /foo/bar/zoo/murakumo-init.rb
+
 #name-includes: ^app-\d+$, ^db-\d+$
 #name-excludes: 
 #addr-includes: ^10\..*
@@ -83,11 +90,11 @@ max-ip-num: 8
 #    max-ip-num: 1
 #  ^db-.*:                   # destination  alias regex
 #    algorithm:  fix_by_src  # balancing algorithm
-#    sources:    foo, bar    # source alias name
+#    sources:    foo, bar    # source alias name (fix_by_src only)
 #    max-ip-num: 8
 #  ^cache-.*:                # destination  alias regex
 #    algorithm:  fix_by_src2 # balancing algorithm
-#    sources:    zoo         # source alias name
+#    sources:    zoo         # source alias name (fix_by_src only)
 
 #notification:
 #  host: my.smtp.server

data/etc/murakumo.yml.example

@@ -12,6 +12,13 @@ max-ip-num: 8
 #domain: ap-northeast-1.compute.internal
 #enable-cache: true
 
+# specify the script which initializes a setup
+#init-script: |
+#  @options['initial-nodes'] = '10.11.12.20, 10.11.12.21'
+
+# (another way)
+#init-script: /foo/bar/zoo/murakumo-init.rb
+
 #name-includes: ^app-\d+$, ^db-\d+$
 #name-excludes: 
 #addr-includes: ^10\..*
@@ -23,11 +30,11 @@ max-ip-num: 8
 #    max-ip-num: 1
 #  ^db-.*:                   # destination  alias regex
 #    algorithm:  fix_by_src  # balancing algorithm
-#    sources:    foo, bar    # source alias name
+#    sources:    foo, bar    # source alias name (fix_by_src only)
 #    max-ip-num: 8
 #  ^cache-.*:                # destination  alias regex
 #    algorithm:  fix_by_src2 # balancing algorithm
-#    sources:    zoo         # source alias name
+#    sources:    zoo         # source alias name (fix_by_src only)
 
 #notification:
 #  host: my.smtp.server

data/lib/cli/murakumo_initializer_context.rb

@@ -0,0 +1,14 @@
+require 'misc/murakumo_const'
+
+module Murakumo
+
+  # 設定初期化スクリプトのコンテキスト
+  class InitializerContext
+
+    def initialize(options)
+      @options = options
+    end
+
+  end # InitializerContext
+
+end # Murakumo

data/lib/cli/murakumo_options.rb

@@ -3,6 +3,7 @@ require 'optopus'
 require 'resolv'
 require 'socket'
 
+require 'cli/murakumo_initializer_context'
 require 'misc/murakumo_const'
 
 unless defined?(Version)
@@ -11,6 +12,13 @@ end
 
 def murakumo_parse_args
   optopus do
+    before do |options|
+      if (script = options['init-script'])
+        script = File.read(script) if File.exists?(script)
+        Murakumo::InitializerContext.new(options).instance_eval(script)
+      end
+    end
+
     desc 'key for authentication (required)'
     option :auth_key, '-K', '--auth-key STRING_OR_PATH', :required => true
 
@@ -146,36 +154,37 @@ def murakumo_parse_args
       options[:host][2] = (options[:host][2] || 60).to_i # TTL
 
       # aliases
-      config_file_aliases = options.config_file ? options.config_file['alias'] : nil
+      if options[:aliases]
+        unless options[:aliases].kind_of?(Array)
+          parse_error('configuration of a aliases is not right')
+        end
 
-      if config_file_aliases
-       if config_file_aliases.kind_of?(Array)
-          options[:aliases] = config_file_aliases.map {|i| i.split(',') }
-        else
-          options[:aliases] = [options[:aliases]]
+        # 設定ファイルからの設定の場合は「配列の配列」に変換
+        if options[:aliases][0].kind_of?(String)
+          options[:aliases] = options[:aliases].map {|i| i.split(',') }
         end
-      end
 
-      options[:aliases] = (options[:aliases] || []).map do |r|
-        r = r.map {|i| i.to_s.strip }
-        [nil, 60, 'master', 100].each_with_index {|v, i| r[i] ||= v }
-
-        priority = case r[2].to_s
-                   when /master/i
-                     Murakumo::MASTER
-                   when /secondary/i
-                     Murakumo::SECONDARY
-                   else
-                     Murakumo::BACKUP
-                   end
-
-        [
-          r[0],      # name
-          r[1].to_i, # TTL
-          priority,
-          r[3].to_i, # weight
-        ]
-      end
+        options[:aliases] = (options[:aliases] || []).map do |r|
+          r = r.map {|i| i.to_s.strip }
+          [nil, 60, 'master', 100].each_with_index {|v, i| r[i] ||= v }
+
+          priority = case r[2].to_s
+                     when /master/i
+                       Murakumo::MASTER
+                     when /secondary/i
+                       Murakumo::SECONDARY
+                     else
+                       Murakumo::BACKUP
+                     end
+
+          [
+            r[0],      # name
+            r[1].to_i, # TTL
+            priority,
+            r[3].to_i, # weight
+          ]
+        end
+      end # aliases
 
       # logger
       if not options[:log_path] and options[:daemon]
@@ -193,7 +202,7 @@ def murakumo_parse_args
       end
 
       # health check
-      if options.config_file and (health_check = options.config_file['health-check'])
+      if (health_check = options[:health_check])
         health_check.kind_of?(Hash) or parse_error('configuration of a health check is not right')
 
         health_check.each do |name, conf|
@@ -213,7 +222,7 @@ def murakumo_parse_args
       end # health check
 
       # notification
-      if options.config_file and (ntfc = options.config_file['notification'])
+      if (ntfc = options[:notification])
         ntfc.kind_of?(Hash) or parse_error('configuration of a notification is not right')
 
         if (ntfc['host'] || '').empty?
@@ -250,17 +259,17 @@ def murakumo_parse_args
       end # notification
 
       # {name,addr}-{includes,excludes}
-      if options.config_file
-        %w(name-includes name-excludes addr-includes addr-excludes).each do |key|
-          unless (reg_vals = (options.config_file[key] || '').strip).empty?
-            reg_vals = reg_vals.split(/\s*,\s*/).select {|i| not i.empty? }.map {|i| Regexp.new(i.strip, Regexp::IGNORECASE) }
-            options[key.gsub('-', '_').to_sym] = reg_vals
-          end
+      [:name_includes, :name_excludes, :addr_includes, :addr_excludes].each do |key|
+        unless (reg_vals = (options[key] || '').strip).empty?
+          reg_vals = reg_vals.split(/\s*,\s*/).select {|i| not i.empty? }.map {|i| Regexp.new(i.strip, Regexp::IGNORECASE) }
+          options[key] = reg_vals
+        else
+          options.delete(key)
         end
       end # {name,addr}-{includes,excludes}
 
       # balancing
-      if options.config_file and (balancing = options.config_file['balancing'])
+      if (balancing = options[:balancing])
         balancing.kind_of?(Hash) or parse_error('configuration of a balancing is not right')
         balancing_h = options[:balancing] = {}
 
@@ -307,7 +316,6 @@ def murakumo_parse_args
           balancing_h[reg_dest] = attrs_h
         end
       end # balancing
-
     end # after
 
     error do |e|

data/lib/misc/murakumo_const.rb

@@ -1,5 +1,5 @@
 module Murakumo
-  VERSION = '0.3.8'
+  VERSION = '0.3.9'
 
   # Priority
   MASTER = 1

data/lib/srv/murakumo_balancer.rb

@@ -81,7 +81,7 @@ module Murakumo
       fix_by_src0(records, max_ip_num, src_aliases) do |new_records|
         # 先頭 + ランダムを返す
         first = new_records.shift
-        [first] + new_records.slice(0, max_ip_num - 1).sort_by { rand }
+        [first] + new_records.sort_by { rand }.slice(0, max_ip_num - 1)
       end
     end
 
@@ -122,9 +122,8 @@ module Murakumo
       # 先頭を決めてローテート
       first_index = sources.zip(dests).index {|s, d| s == @address }
 
-      unless first_index.zero?
-        dests = (dests_orig + dests_orig).slice(first_index, dests.length)
-      end
+      # 元の配列に戻す
+      dests = (dests_orig + dests_orig).slice(first_index, dests_orig.length)
 
       # 先頭インデックスからレコードを並べ直す
       yield(records.values_at(*dests.map {|addr, i| i }))

data/lib/srv/murakumo_cloud.rb

@@ -71,8 +71,8 @@ module Murakumo
       # ヘルスチェック
       @health_checkers = {}
 
-      if options.config_file and options.config_file['health-check']
-        health_check = options.config_file['health-check']
+      if options[:health_check]
+        health_check = options[:health_check]
 
         if health_check.kind_of?(Hash)
           health_check.each do |name, conf|

data/lib/srv/murakumo_health_checker.rb

@@ -34,7 +34,7 @@ module Murakumo
       # スクリプトの読み込み
       @script = options['script']
       raise "health check script of #{@name} is not found" unless @script
-      @script = File.read(script) if File.exists?(@script)
+      @script = File.read(@script) if File.exists?(@script)
 
       # 通知オブジェクトの設定
       if options[:notification]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murakumo
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 3
-  - 8
-  version: 0.3.8
+  - 9
+  version: 0.3.9
 platform: ruby
 authors: 
 - winebarrel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-10 00:00:00 Z
+date: 2011-12-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubydns
@@ -57,12 +57,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 19
         segments: 
         - 0
         - 2
-        - 1
-        version: 0.2.1
+        - 2
+        version: 0.2.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -87,6 +87,7 @@ executables:
 - murakumo
 - mrkmctl
 - murakumo-install-init-script
+- murakumo-show-ip-address
 extensions: []
 
 extra_rdoc_files: []
@@ -94,12 +95,14 @@ extra_rdoc_files: []
 files: 
 - README
 - bin/murakumo-install-init-script
+- bin/murakumo-show-ip-address
 - bin/mrkmctl
 - bin/murakumo
 - lib/cli/murakumo_options.rb
 - lib/cli/mrkmctl.rb
 - lib/cli/mrkmctl_options.rb
 - lib/cli/murakumo.rb
+- lib/cli/murakumo_initializer_context.rb
 - lib/srv/murakumo_health_check_notifier.rb
 - lib/srv/murakumo_balancer.rb
 - lib/srv/murakumo_server.rb