hotdog 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7300d7cfb838327013fb49f3012e15a606cb7af4
-  data.tar.gz: 38666c025172a7873a7746027d64d6a388cd38b5
+  metadata.gz: d1a630c98690e6d1df7a32b7baf48e24776da49a
+  data.tar.gz: ab4daa9a831412d598eb235e3e4ed8a4516b2dcf
 SHA512:
-  metadata.gz: c3e9cd9dff9174e95ba9343f4af840437b721b2ad3e0c46e4bf03ab3433f54d66ea2676c0600f5f30b5278315aa48d3943480a7f40b0e5b43737be7fbb70acb3
-  data.tar.gz: 86870002dea94e2cefc19ac9c3f028f394d001bab658bb875ee2bbb86a68e5feb2e47bb7cbd59e5465f5416da1f88f0336ce14799a122d9e3f600a1ccf6c6f20
+  metadata.gz: cb2c5b244339014184b56d4c1ab68bce58bc8fa2f71e84eef15319a8157be1532304647760fcd0b41d200cd8e1fdb895e6ca6a8309c7cd79d3ce9f6e67379c6f
+  data.tar.gz: 00ea3e8ddc439588571c788a0ec4f2546fb084d81ef18749b92cb83ab239ce2ea6df3f7c1ad21f17ca9f487794c805a1c5eb1fd007857d81dc58b3f9be9e3746

data/lib/hotdog/application.rb

@@ -17,14 +17,14 @@ module Hotdog
         debug: false,
         environment: "default",
         minimum_expiry: 3600, # 1 hour
-        random_expiry: 604800, # 7 days
+        random_expiry: 5940, # 99 hours
         fixed_string: false,
         force: false,
         format: "plain",
         headers: false,
         listing: false,
         logger: Logger.new(STDERR),
-        max_time: 10,
+        max_time: 5,
         api_key: ENV["DATADOG_API_KEY"],
         application_key: ENV["DATADOG_APPLICATION_KEY"],
         print0: false,

data/lib/hotdog/commands/hosts.rb

@@ -5,17 +5,27 @@ module Hotdog
     class Hosts < BaseCommand
       def run(args=[])
         application.run_command("init")
-        update_hosts(@options.dup)
 
         if args.empty?
+          update_hosts(@options.dup)
           @hosts_q1 ||= @db.prepare(<<-EOS)
             SELECT DISTINCT host_id FROM hosts_tags;
           EOS
           logger.debug("hosts_q1()")
           result = @hosts_q1.execute().to_a.reduce(:+)
         else
+          if args.map { |host_name| glob?(host_name) }.any?
+            update_hosts(@options.dup)
+          else
+            args.each do |host_name|
+              @hosts_q4 ||= @db.prepare("INSERT OR IGNORE INTO hosts (name) VALUES (?);")
+              logger.debug("hosts_q4(%s)" % [host_name.inspect])
+              @hosts_q4.execute(host_name)
+              update_host_tags(host_name, @options.dup)
+            end
+          end
           result = args.map { |host_name|
-            if host_name.index("*")
+            if glob?(host_name)
               @hosts_q2 ||= @db.prepare(<<-EOS)
                 SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
                   INNER JOIN hosts ON hosts_tags.host_id = hosts.id

data/lib/hotdog/commands.rb

@@ -65,13 +65,13 @@ module Hotdog
                 @get_hosts_q6 ||= @db.prepare(<<-EOS)
                   SELECT expires_at FROM hosts_tags WHERE host_id = ? LIMIT 1;
                 EOS
-                logger.debug("get_hosts_q6()")
+                logger.debug("get_hosts_q6(%s)" % [host_id.inspect])
                 @get_hosts_q6.execute(host_id).map { |row| Time.at(row.first).strftime("%Y-%m-%dT%H:%M:%S") }.first
               when "host"
                 @get_hosts_q1 ||= @db.prepare(<<-EOS)
                   SELECT name FROM hosts WHERE id = ? LIMIT 1;
                 EOS
-                logger.debug("get_hosts_q1()")
+                logger.debug("get_hosts_q1(%s)" % [host_id.inspect])
                 @get_hosts_q1.execute(host_id).map { |row| row.first }.first
               else
                 if not glob?(tag_name)
@@ -80,7 +80,7 @@ module Hotdog
                       INNER JOIN tags ON hosts_tags.tag_id = tags.id
                         WHERE hosts_tags.host_id = ? AND tags.name = ?;
                   EOS
-                  logger.debug("get_hosts_q2()")
+                  logger.debug("get_hosts_q2(%s, %s)" % [host_id.inspect, tag_name.inspect])
                   @get_hosts_q2.execute(host_id, tag_name).map { |row| row.first }.join(",")
                 else
                   @get_hosts_q5 ||= @db.prepare(<<-EOS)
@@ -88,7 +88,7 @@ module Hotdog
                       INNER JOIN tags ON hosts_tags.tag_id = tags.id
                         WHERE hosts_tags.host_id = ? AND tags.name GLOB ?;
                   EOS
-                  logger.debug("get_hosts_q5()")
+                  logger.debug("get_hosts_q5(%s, %s)", host_id.inspect, tag_name.inspect)
                   @get_hosts_q5.execute(host_id, tag_name).map { |row| row.first }.join(",")
                 end
               end
@@ -109,7 +109,7 @@ module Hotdog
                   INNER JOIN tags ON hosts_tags.tag_id = tags.id
                     WHERE hosts_tags.host_id = ?;
               EOS
-              logger.debug("get_hosts_q3()")
+              logger.debug("get_hosts_q3(%s)" % [host_id.inspect])
               tag_names = @get_hosts_q3.execute(host_id).map { |row| row.first }
               tag_names.each do |tag_name|
                 fields << tag_name unless fields.index(tag_name)
@@ -138,8 +138,7 @@ module Hotdog
       def update_hosts(options={})
         if suspended?
           return
-        end
-        @db.transaction do
+        else
           if not options[:force]
             # Update host list on every expirations to update frequently.
             @update_hosts_q1 ||= @db.prepare("SELECT MIN(expires_at) FROM hosts_tags;")
@@ -188,8 +187,7 @@ module Hotdog
       def update_tags(options={})
         if suspended?
           return
-        end
-        @db.transaction do
+        else
           resume_host_tags
 
           if options[:force]
@@ -203,8 +201,8 @@ module Hotdog
               SELECT DISTINCT hosts_tags.host_id FROM hosts_tags
                 WHERE hosts_tags.expires_at < ?;
             EOS
-            logger.debug("update_tags_q2()")
-            hosts = @update_tags_q2.execute(Time.new.to_i)
+            logger.debug("update_tags_q2(%s)" % [Time.new.to_i])
+            hosts = @update_tags_q2.execute(Time.new.to_i).map { |row| row.first }
           end
           hosts.each_with_index do |host_id, i|
             @update_tags_q3 ||= @db.prepare("DELETE FROM hosts_tags WHERE host_id = ? AND hosts_tags.expires_at < ?;")
@@ -231,21 +229,23 @@ module Hotdog
       EMPTY_EXPIRES_AT = Time.at(0).to_i
 
       def suspend_host_tags()
-        @suspended = true
-        @suspend_host_tags_q1 ||= @db.prepare("INSERT OR IGNORE INTO hosts (name) VALUES (?);")
-        logger.debug("suspend_host_tags_q1(%s)" % [EMPTY_HOST_NAME.inspect])
-        @suspend_host_tags_q1.execute(EMPTY_HOST_NAME)
-        @suspend_host_tags_q2 ||= @db.prepare("INSERT OR IGNORE INTO tags (name, value) VALUES (?, ?);")
-        logger.debug("suspend_host_tags_q2(%s, %s)" % [EMPTY_TAG_NAME.inspect, EMPTY_TAG_VALUE.inspect])
-        @suspend_host_tags_q2.execute(EMPTY_TAG_NAME, EMPTY_TAG_VALUE)
-        @suspend_host_tags_q3 ||= @db.prepare(<<-EOS)
-          INSERT OR REPLACE INTO hosts_tags (host_id, tag_id, expires_at)
-            SELECT host.id, tag.id, ? FROM
-              ( SELECT id FROM hosts WHERE name = ?) AS host,
-              ( SELECT id FROM tags WHERE name = ? AND value = ? ) AS tag;
-        EOS
-        logger.debug("suspend_host_tags_q3(%s, %s, %s, %s)" % [EMPTY_EXPIRES_AT.inspect, EMPTY_HOST_NAME.inspect, EMPTY_TAG_NAME.inspect, EMPTY_TAG_VALUE.inspect])
-        @suspend_host_tags_q3.execute(EMPTY_EXPIRES_AT, EMPTY_HOST_NAME, EMPTY_TAG_NAME, EMPTY_TAG_VALUE)
+        @db.transaction do
+          @suspended = true
+          @suspend_host_tags_q1 ||= @db.prepare("INSERT OR IGNORE INTO hosts (name) VALUES (?);")
+          logger.debug("suspend_host_tags_q1(%s)" % [EMPTY_HOST_NAME.inspect])
+          @suspend_host_tags_q1.execute(EMPTY_HOST_NAME)
+          @suspend_host_tags_q2 ||= @db.prepare("INSERT OR IGNORE INTO tags (name, value) VALUES (?, ?);")
+          logger.debug("suspend_host_tags_q2(%s, %s)" % [EMPTY_TAG_NAME.inspect, EMPTY_TAG_VALUE.inspect])
+          @suspend_host_tags_q2.execute(EMPTY_TAG_NAME, EMPTY_TAG_VALUE)
+          @suspend_host_tags_q3 ||= @db.prepare(<<-EOS)
+            INSERT OR REPLACE INTO hosts_tags (host_id, tag_id, expires_at)
+              SELECT host.id, tag.id, ? FROM
+                ( SELECT id FROM hosts WHERE name = ?) AS host,
+                ( SELECT id FROM tags WHERE name = ? AND value = ? ) AS tag;
+          EOS
+          logger.debug("suspend_host_tags_q3(%s, %s, %s, %s)" % [EMPTY_EXPIRES_AT.inspect, EMPTY_HOST_NAME.inspect, EMPTY_TAG_NAME.inspect, EMPTY_TAG_VALUE.inspect])
+          @suspend_host_tags_q3.execute(EMPTY_EXPIRES_AT, EMPTY_HOST_NAME, EMPTY_TAG_NAME, EMPTY_TAG_VALUE)
+        end
       end
 
       def resume_host_tags()
@@ -261,76 +261,79 @@ module Hotdog
         if suspended?
           # stop updating if the `update_host_tags` has already been suspended
           return
-        end
-        if Integer === host_name
-          host_id = host_name
-          @update_host_tags_q1 ||= @db.prepare("SELECT name FROM hosts WHERE id = ? LIMIT 1;")
-          logger.debug("update_host_tags_q1(%s)" % [host_id.inspect])
-          host_name = @update_host_tags_q1.execute(host_id).map { |row| row.first }.first
         else
-          @update_host_tags_q2 ||= @db.prepare("SELECT id, name FROM hosts WHERE LOWER(name) = LOWER(?) LIMIT 1;")
-          logger.debug("update_host_tags_q2(%s)" % [host_name.inspect])
-          host_id, host_name = @update_host_tags_q2.execute(host_name).map { |row| row }.first
-        end
+          if Integer === host_name
+            host_id = host_name
+            @update_host_tags_q1 ||= @db.prepare("SELECT name FROM hosts WHERE id = ? LIMIT 1;")
+            logger.debug("update_host_tags_q1(%s)" % [host_id.inspect])
+            host_name = @update_host_tags_q1.execute(host_id).map { |row| row.first }.first
+          else
+            @update_host_tags_q2 ||= @db.prepare("SELECT id, name FROM hosts WHERE LOWER(name) = LOWER(?) LIMIT 1;")
+            logger.debug("update_host_tags_q2(%s)" % [host_name.inspect])
+            host_id, host_name = @update_host_tags_q2.execute(host_name).map { |row| row }.first
+          end
 
-        if not options[:force]
-          # Update host tags less frequently.
-          # Don't need to run updates on every expiration.
-          @update_host_tags_q3 ||= @db.prepare("SELECT AVG(expires_at) FROM hosts_tags WHERE host_id = ?;")
-          logger.debug("update_host_tags_q3(%s)" % [host_id.inspect])
-          if expires_at = @update_host_tags_q3.execute(host_id).map { |row| row.first }.first
-            if Time.new.to_i < expires_at
-              logger.debug("%s: next update will run after %s." % [host_name, Time.at(expires_at)])
-              return
+          if not options[:force]
+            # Update host tags less frequently.
+            # Don't need to run updates on every expiration.
+            @update_host_tags_q3 ||= @db.prepare("SELECT AVG(expires_at) FROM hosts_tags WHERE host_id = ?;")
+            logger.debug("update_host_tags_q3(%s)" % [host_id.inspect])
+            if expires_at = @update_host_tags_q3.execute(host_id).map { |row| row.first }.first
+              if Time.new.to_i < expires_at
+                logger.debug("%s: next update will run after %s." % [host_name, Time.at(expires_at)])
+                return
+              else
+                logger.debug("%s: average expires_at was %s. start updating." % [host_name, Time.at(expires_at)])
+              end
             else
-              logger.debug("%s: average expires_at was %s. start updating." % [host_name, Time.at(expires_at)])
+              logger.debug("%s: expires_at not found. start updateing." % [host_name])
             end
-          else
-            logger.debug("%s: expires_at not found. start updateing." % [host_name])
           end
-        end
 
-        code, result = @dog.host_tags(host_name)
-        logger.debug("dog.host_tags(%s) #==> [%s, %s]" % [host_name.inspect, code.inspect, result.inspect])
-        if code.to_i / 100 != 2
-          case code.to_i
-          when 404 # host not found on datadog
-            @update_host_tags_q7 ||= @db.prepare("DELETE FROM hosts_tags WHERE host_id IN ( SELECT id FROM hosts WHERE LOWER(name) = LOWER(?) );")
-            logger.debug("update_host_tags_q7(%s)" % [host_name.inspect])
-            @update_host_tags_q7.execute(host_name)
+          code, result = @dog.host_tags(host_name)
+          logger.debug("dog.host_tags(%s) #==> [%s, %s]" % [host_name.inspect, code.inspect, result.inspect])
+          if code.to_i / 100 != 2
+            case code.to_i
+            when 404 # host not found on datadog
+              @update_host_tags_q7 ||= @db.prepare("DELETE FROM hosts_tags WHERE host_id IN ( SELECT id FROM hosts WHERE LOWER(name) = LOWER(?) );")
+              logger.debug("update_host_tags_q7(%s)" % [host_name.inspect])
+              @update_host_tags_q7.execute(host_name)
+            end
+            raise("dog.host_tags(%s) returns (%s: %s)" % [host_name.inspect, code.inspect, result.inspect])
           end
-          raise("dog.host_tags(%s) returns (%s: %s)" % [host_name.inspect, code.inspect, result.inspect])
-        end
 
-        expires_at = Time.new.to_i + (options[:minimum_expiry] + rand(options[:random_expiry]))
-        logger.debug("%s: expires_at=%s" % [host_name, Time.at(expires_at)])
+          expires_at = Time.new.to_i + (options[:minimum_expiry] + rand(options[:random_expiry]))
+          logger.debug("%s: expires_at=%s" % [host_name, Time.at(expires_at)])
+
+          @db.transaction do
+            result["tags"].each do |tag|
+              tag_name, tag_value = tag.split(":", 2)
+              tag_value ||= ""
 
-        result["tags"].each do |tag|
-          tag_name, tag_value = tag.split(":", 2)
-          tag_value ||= ""
+              if options.has_key?(:tags) and not options[:tags].empty? and not options[:tags].index(tag_name)
+                next
+              else
+                @update_host_tags_q4 ||= @db.prepare("INSERT OR IGNORE INTO tags (name, value) VALUES (?, ?);")
+                logger.debug("update_host_tags_q4(%s, %s)" % [tag_name.inspect, tag_value.inspect])
+                @update_host_tags_q4.execute(tag_name, tag_value)
+                @update_host_tags_q5 ||= @db.prepare(<<-EOS)
+                  INSERT OR REPLACE INTO hosts_tags (host_id, tag_id, expires_at)
+                    SELECT host.id, tag.id, ? FROM
+                      ( SELECT id FROM hosts WHERE name = ? ) AS host,
+                      ( SELECT id FROM tags WHERE name = ? AND value = ? ) AS tag;
+                EOS
+                logger.debug("update_host_tags_q5(%s, %s)" % [expires_at, host_name, tag_name, tag_value])
+                @update_host_tags_q5.execute(expires_at, host_name, tag_name, tag_value)
+              end
+            end
 
-          if options.has_key?(:tags) and not options[:tags].empty? and not options[:tags].index(tag_name)
-            next
-          else
-            @update_host_tags_q4 ||= @db.prepare("INSERT OR IGNORE INTO tags (name, value) VALUES (?, ?);")
-            logger.debug("update_host_tags_q4(%s, %s)" % [tag_name.inspect, tag_value.inspect])
-            @update_host_tags_q4.execute(tag_name, tag_value)
-            @update_host_tags_q5 ||= @db.prepare(<<-EOS)
-              INSERT OR REPLACE INTO hosts_tags (host_id, tag_id, expires_at)
-                SELECT host.id, tag.id, ? FROM
-                  ( SELECT id FROM hosts WHERE name = ? ) AS host,
-                  ( SELECT id FROM tags WHERE name = ? AND value = ? ) AS tag;
+            @update_host_tags_q6 ||= @db.prepare(<<-EOS)
+              DELETE FROM hosts_tags WHERE host_id = ? and expires_at <= ?;
             EOS
-            logger.debug("update_host_tags_q5(%s, %s)" % [expires_at, host_name, tag_name, tag_value])
-            @update_host_tags_q5.execute(expires_at, host_name, tag_name, tag_value)
+            logger.debug("update_host_tags_q6(%s, %s)" % [host_id.inspect, Time.new.to_i.inspect])
+            @update_host_tags_q6.execute(host_id, Time.new.to_i)
           end
         end
-
-        @update_host_tags_q6 ||= @db.prepare(<<-EOS)
-          DELETE FROM hosts_tags WHERE host_id = ? and expires_at <= ?;
-        EOS
-        logger.debug("update_host_tags_q6(%s, %s)" % [host_id.inspect, Time.new.to_i.inspect])
-        @update_host_tags_q6.execute(host_id, Time.new.to_i)
       end
     end
   end

data/lib/hotdog/version.rb

@@ -1,3 +1,3 @@
 module Hotdog
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotdog
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Yamashita Yuu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler