murakumo 0.2.1 → 0.2.2

data/lib/cli/mrkmctl.rb

@@ -28,8 +28,6 @@ begin
                    'Origin'
                  when Murakumo::MASTER
                    'Master'
-                 when Murakumo::SECONDARY
-                   'Secondary'
                  else
                    'Backup'
                  end

data/lib/cli/mrkmctl_options.rb

@@ -9,7 +9,7 @@ def mrkmctl_parse_args
     desc 'displays a list of a record'
     option :list, '-L', '--list [SEARCH_PHRASE]'
 
-    desc 'adds or updates a record: <hostname>[,<TTL>[,{master|secondary|backup}]]'
+    desc 'adds or updates a record: <hostname>[,<TTL>[,{master|backup}]]'
     option :add, '-A', '--add RECORD', :type => Array, :multiple => true do |value|
       (1 <= value.length and value.length <= 3) or invalid_argument
 
@@ -25,7 +25,7 @@ def mrkmctl_parse_args
       end
 
       # Priority
-      priority.nil? or /\A(master|secondary|backup)\Z/i =~ priority or invalid_argument
+      priority.nil? or /\A(master|backup)\Z/i =~ priority or invalid_argument
     end
 
     desc 'deletes a record'
@@ -85,8 +85,6 @@ def mrkmctl_parse_args
           priority = case r[2].to_s
                      when /master/i
                        Murakumo::MASTER
-                     when /secondary/i
-                       Murakumo::SECONDARY
                      else
                        Murakumo::BACKUP
                      end

data/lib/cli/murakumo_options.rb

@@ -47,7 +47,7 @@ def murakumo_parse_args
       end
     end # :host
 
-    desc 'resource record of an alias: <hostname>[,<TTL>[,{master|secondary|backup}]]'
+    desc 'resource record of an alias: <hostname>[,<TTL>[,{master|backup}]]'
     option :aliases, '-A', '--alias RECORD', :type => Array, :multiple => true do |value|
       (1 <= value.length and value.length <= 3) or invalid_argument
 
@@ -63,7 +63,7 @@ def murakumo_parse_args
       end
 
       # Priority
-      priority.nil? or /\A(master|secondary|backup)\Z/i =~ priority or invalid_argument
+      priority.nil? or /\A(master|backup)\Z/i =~ priority or invalid_argument
     end # :aliases
 
     desc 'ip address of a default resolver'
@@ -155,8 +155,6 @@ def murakumo_parse_args
         priority = case r[2].to_s
                    when /master/i
                      Murakumo::MASTER
-                   when /secondary/i
-                     Murakumo::SECONDARY
                    else
                      Murakumo::BACKUP
                    end

data/lib/misc/murakumo_const.rb

@@ -1,9 +1,8 @@
 module Murakumo
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 
   # Priority
   MASTER = 1
-  SECONDARY = 0
   BACKUP = -1
   ORIGIN = -65536
 

data/lib/srv/murakumo_cloud.rb

@@ -382,9 +382,6 @@ module Murakumo
       # 優先度の高いレコードを検索
       records = shuffle_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 })

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murakumo
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - winebarrel