hotdog 0.18.2 → 0.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41826771eee978718b934da22818cc2da5d0e3c6
-  data.tar.gz: abc210a02a3a1b571ec5013bbb4b62791221cecd
+  metadata.gz: e1028a5f20aa3186fb10d14ea6442de32afd7f23
+  data.tar.gz: 5737e3411463b9be5d49646995b269d6f0c68d94
 SHA512:
-  metadata.gz: a150d41cbbe3090ef6c8fc53fb03a183e9ddfdcf25ddc2056096adf3718b8830b8e4be3b25faeae658cdcfbd6d324f9b00c964c1ecf96d7dd02dfa19a734c9bf
-  data.tar.gz: b555bb6321256c117b764c2f65bcbc635dce11f6510554484e1ad3316098bdaa0d3089a345b29d31989332956570e41ed8967bd416c437b5d51399233e78f44d
+  metadata.gz: a8ff94f92bfd4bfb3816a24715ece125ba0d61a162ae35e436ed9ad793e8bd52387daa45d2fed3dd7fd1dabd420c10f8671d841aafbbea279dc7ad7d9d3faf3f
+  data.tar.gz: e09c12120df40d689603e7b087e5c38686080347da012ae91d406eaf9b9be8d060101925794ebeaea04db65aaeef1dba279a0045a67cb5fb305b07fd226b1d98

data/lib/hotdog/commands.rb

@@ -219,6 +219,9 @@ module Hotdog
               persistent_db = SQLite3::Database.new(persistent)
               persistent_db.execute("SELECT hosts_tags.host_id FROM hosts_tags INNER JOIN hosts ON hosts_tags.host_id = hosts.id INNER JOIN tags ON hosts_tags.tag_id = tags.id LIMIT 1;")
               @db = persistent_db
+            rescue SQLite3::BusyException
+              sleep(rand) # FIXME: configurable retry interval
+              retry
             rescue SQLite3::SQLException
               if options[:offline]
                 raise(RuntimeError.new("no database available on offline mode"))
@@ -391,7 +394,7 @@ module Hotdog
       end
 
       def with_retry(options={}, &block)
-        (options[:retry] || 1).times do |i|
+        (options[:retry] || 3).times do |i|
           begin
             return yield
           rescue => error

data/lib/hotdog/commands/down.rb

@@ -31,11 +31,6 @@ module Hotdog
             arg
           end
         }
-        scopes.each do |scope|
-          with_retry(options) do
-            schedule_downtime(scope, options)
-          end
-        end
         hosts = scopes.select { |scope| scope.start_with?("host:") }.map { |scope|
           scope.slice("host:".length, scope.length)
         }
@@ -51,6 +46,11 @@ module Hotdog
             end
           end
         end
+        scopes.each do |scope|
+          with_retry(options) do
+            schedule_downtime(scope, options)
+          end
+        end
       end
 
       private

data/lib/hotdog/commands/tag.rb

@@ -27,16 +27,6 @@ module Hotdog
         hosts = args.map { |arg|
           arg.sub(/\Ahost:/, "")
         }
-        hosts.each do |host|
-          if options[:tags].empty?
-            # nop
-          else
-            # add all as user tags
-            with_retry(options) do
-              add_tags(host, options[:tags], source=options[:tag_source])
-            end
-          end
-        end
         if open_db
           with_retry do
             @db.transaction do
@@ -47,6 +37,16 @@ module Hotdog
             end
           end
         end
+        hosts.each do |host|
+          if options[:tags].empty?
+            # nop
+          else
+            # add all as user tags
+            with_retry(options) do
+              add_tags(host, options[:tags], source=options[:tag_source])
+            end
+          end
+        end
       end
 
       private

data/lib/hotdog/commands/untag.rb

@@ -28,6 +28,21 @@ module Hotdog
           arg.sub(/\Ahost:/, "")
         }
 
+        if options[:tags].empty?
+          # refresh all persistent.db since there is no way to identify user tags
+          remove_db
+        else
+          if open_db
+            with_retry do
+              @db.transaction do
+                options[:tags].each do |tag|
+                  disassociate_tag_hosts(@db, tag, hosts)
+                end
+              end
+            end
+          end
+        end
+
         hosts.each do |host|
           if options[:tags].empty?
             # delete all user tags
@@ -47,21 +62,6 @@ module Hotdog
             end
           end
         end
-
-        if options[:tags].empty?
-          # refresh all persistent.db since there is no way to identify user tags
-          remove_db
-        else
-          if open_db
-            with_retry do
-              @db.transaction do
-                options[:tags].each do |tag|
-                  disassociate_tag_hosts(@db, tag, hosts)
-                end
-              end
-            end
-          end
-        end
       end
 
       private

data/lib/hotdog/commands/up.rb

@@ -37,6 +37,7 @@ module Hotdog
             cancel_downtime(downtime["id"], options)
           end
         end
+
         hosts = scopes.select { |scope| scope.start_with?("host:") }.map { |scope|
           scope.slice("host:".length, scope.length)
         }

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.18.2"
+  VERSION = "0.18.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.18.3
 platform: ruby
 authors:
 - Yamashita Yuu