hotdog 0.21.2 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd4e58bca7d389bc16afeed6bd05404855b89343
-  data.tar.gz: e401b563a1f9555ad60f3901bbad881831af114f
+  metadata.gz: 10ca4475d60ac71c395df0cc485978f0a033fba5
+  data.tar.gz: f4cff2af354ca05fb772f72c27c7ca6fd5ba7f60
 SHA512:
-  metadata.gz: a8f8ebbfcd3243de29b784d0427af224747d69814ba835be3b1ed3f0a224c4c2e4075258feb88152dd10c9083240da48d9671e061a8a980a3db3e1b986d3f628
-  data.tar.gz: dbfa93b6bd5590d6a9474639fb64967c809b6c91a363c917cd9516364aa4dc6d981ac159c2961ffa20f2eaf785b360d31963a85c79bac87fb6337c61d5df4fd4
+  metadata.gz: 707e11d863479ae21086db299935460c5e78376a2c0a90f60d516a0c521f7ce95a39341f32523b1499833a5265e573e27f49fef7bd3e402728aa5f95c9be26ac
+  data.tar.gz: f604a28cc6aef9ea8a4ae98bc9f3b08d0dd7aa0b86d8f9ea042a28a7dece15ea6557cc0a6feef929d0f8a953b6e82802cb9b0eaa23f3684760b694235d9ebf92

data/lib/hotdog/commands/down.rb

@@ -35,8 +35,9 @@ module Hotdog
           scope.slice("host:".length, scope.length)
         }
         if 0 < hosts.length
-          if open_db
-            with_retry do
+          # Try reloading database after error as a workaround for nested transaction.
+          with_retry(error_handler: ->(error) { reload }) do
+            if open_db
               @db.transaction do
                 hosts.each_slice(SQLITE_LIMIT_COMPOUND_SELECT) do |hosts|
                   execute_db(@db, "DELETE FROM hosts_tags WHERE host_id IN ( SELECT id FROM hosts WHERE name IN (%s) );" % hosts.map { "?" }.join(", "), hosts)

data/lib/hotdog/commands/tag.rb

@@ -27,8 +27,9 @@ module Hotdog
         hosts = args.map { |arg|
           arg.sub(/\Ahost:/, "")
         }
-        if open_db
-          with_retry do
+        # Try reloading database after error as a workaround for nested transaction.
+        with_retry(error_handler: ->(error) { reload }) do
+          if open_db
             @db.transaction do
               create_tags(@db, options[:tags])
               options[:tags].each do |tag|

data/lib/hotdog/commands/untag.rb

@@ -32,8 +32,9 @@ module Hotdog
           # refresh all persistent.db since there is no way to identify user tags
           remove_db(@db)
         else
-          if open_db
-            with_retry do
+          # Try reloading database after error as a workaround for nested transaction.
+          with_retry(error_handler: -> (error) { reload }) do
+            if open_db
               @db.transaction do
                 options[:tags].each do |tag|
                   disassociate_tag_hosts(@db, tag, hosts)

data/lib/hotdog/commands.rb

@@ -12,16 +12,13 @@ require "uri"
 module Hotdog
   module Commands
     class BaseCommand
-      MASK_DATABASE = 0xffff0000
-      MASK_QUERY = 0x0000ffff
-
       def initialize(application)
         @application = application
         @logger = application.logger
         @options = application.options
         @dog = nil # lazy initialization
         @prepared_statements = {}
-        @persistent_db_path = File.join(@options.fetch(:confdir, "."), "persistent.db")
+        @persistent_db_path = File.join(@options.fetch(:confdir, "."), "hotdog.sqlite3")
       end
       attr_reader :application
       attr_reader :logger
@@ -42,11 +39,16 @@ module Hotdog
       end
 
       def reload(options={})
-        if @db
-          close_db(@db)
-          @db = nil
+        options = @options.merge(options)
+        if options[:offline]
+          logger.info("skip reloading on offline mode.")
+        else
+          if @db
+            close_db(@db)
+            @db = nil
+          end
+          update_db(options)
         end
-        update_db(options)
       end
 
       def define_options(optparse, options={})
@@ -67,8 +69,7 @@ module Hotdog
       end
 
       def prepare(db, query)
-        k = (db.hash & MASK_DATABASE) | (query.hash & MASK_QUERY)
-        @prepared_statements[k] ||= db.prepare(query)
+        @prepared_statements[query] ||= db.prepare(query)
       end
 
       def format(result, options={})
@@ -80,6 +81,7 @@ module Hotdog
       end
 
       def get_hosts(host_ids, tags=nil)
+        host_ids = Array(host_ids)
         tags ||= @options[:tags]
         update_db
         if host_ids.empty?
@@ -117,6 +119,7 @@ module Hotdog
       end
 
       def get_fields(host_ids)
+        host_ids = Array(host_ids)
         host_ids.each_slice(SQLITE_LIMIT_COMPOUND_SELECT).flat_map { |host_ids|
           q = "SELECT DISTINCT tags.name FROM hosts_tags " \
                 "INNER JOIN tags ON hosts_tags.tag_id = tags.id " \
@@ -126,6 +129,7 @@ module Hotdog
       end
 
       def get_hosts_fields(host_ids, fields, options={})
+        host_ids = Array(host_ids)
         case fields.length
         when 0
           [[], fields]
@@ -156,6 +160,7 @@ module Hotdog
       end
 
       def get_hosts_field(host_ids, field, options={})
+        host_ids = Array(host_ids)
         if /\Ahost\z/i =~ field
           result = host_ids.each_slice(SQLITE_LIMIT_COMPOUND_SELECT).flat_map { |host_ids|
             execute("SELECT name FROM hosts WHERE id IN (%s) ORDER BY id;" % host_ids.map { "?" }.join(", "), host_ids).map { |row| row.to_a }
@@ -192,11 +197,10 @@ module Hotdog
       end
 
       def close_db(db, options={})
-        @prepared_statements = @prepared_statements.reject { |k, statement|
-          (db.hash & MASK_DATABASE == k & MASK_DATABASE).tap do |delete_p|
-            statement.close() if delete_p
-          end
-        }
+        @prepared_statements.each do |query, statement|
+          statement.close()
+        end
+        @prepared_statements.clear()
         db.close()
       end
 
@@ -257,16 +261,15 @@ module Hotdog
 
       def create_db(db, options={})
         options = @options.merge(options)
-        execute_db(db, "CREATE TABLE IF NOT EXISTS hosts (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(255) NOT NULL COLLATE NOCASE);")
-        execute_db(db, "CREATE UNIQUE INDEX IF NOT EXISTS hosts_name ON hosts (name);")
-        execute_db(db, "CREATE TABLE IF NOT EXISTS tags (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(200) NOT NULL COLLATE NOCASE, value VARCHAR(200) NOT NULL COLLATE NOCASE);")
-        execute_db(db, "CREATE UNIQUE INDEX IF NOT EXISTS tags_name_value ON tags (name, value);")
-        execute_db(db, "CREATE TABLE IF NOT EXISTS hosts_tags (host_id INTEGER NOT NULL, tag_id INTEGER NOT NULL);")
-        execute_db(db, "CREATE UNIQUE INDEX IF NOT EXISTS hosts_tags_host_id_tag_id ON hosts_tags (host_id, tag_id);")
-
         all_tags = get_all_tags()
-
         db.transaction do
+          execute_db(db, "CREATE TABLE IF NOT EXISTS hosts (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(255) NOT NULL COLLATE NOCASE);")
+          execute_db(db, "CREATE UNIQUE INDEX IF NOT EXISTS hosts_name ON hosts (name);")
+          execute_db(db, "CREATE TABLE IF NOT EXISTS tags (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(200) NOT NULL COLLATE NOCASE, value VARCHAR(200) NOT NULL COLLATE NOCASE);")
+          execute_db(db, "CREATE UNIQUE INDEX IF NOT EXISTS tags_name_value ON tags (name, value);")
+          execute_db(db, "CREATE TABLE IF NOT EXISTS hosts_tags (host_id INTEGER NOT NULL, tag_id INTEGER NOT NULL);")
+          execute_db(db, "CREATE UNIQUE INDEX IF NOT EXISTS hosts_tags_host_id_tag_id ON hosts_tags (host_id, tag_id);")
+
           known_tags = all_tags.keys.map { |tag| split_tag(tag) }.uniq
           create_tags(db, known_tags)
 
@@ -418,11 +421,16 @@ module Hotdog
           begin
             return yield
           rescue => error
-            logger.warn("#{error.class}: #{error.message}")
+            if error_handler = options[:error_handler]
+              error_handler.call(error)
+            end
+            logger.info("#{error.class}: #{error.message}")
             error.backtrace.each do |frame|
-              logger.debug("\t#{frame}")
+              logger.info("\t#{frame}")
             end
-            sleep([options[:retry_delay] || (2<<i), options[:retry_max_delay] || 60].min)
+            wait = [options[:retry_delay] || (2<<i), options[:retry_max_delay] || 60].min
+            logger.info("will retry after #{wait} seconds....")
+            sleep(wait)
           end
         end
         raise("retry count exceeded")

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.21.2"
+  VERSION = "0.22.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 0.22.0
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler