logeater 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 678d8cc0af848644fd37cf1762d97a9d7779bd5a
-  data.tar.gz: 0ac115076cd9daedc7b74d4f01dd04e2d63e56a6
+  metadata.gz: baef36bfc637d3c838e597b0db6681507af6ddb8
+  data.tar.gz: d4e37a1dd74838f75d660b0068574218e7749ccc
 SHA512:
-  metadata.gz: e3d70df2e56453afba0d382252555801e17e8d7c2ec7d83da83dc147e91bc61f6fd8dc4127bfaadf9c2d71bcdce561cd8c09403a5cc83a129443031ed3ff1545
-  data.tar.gz: 0085e7c733283ecb91ec507a5de05bb53bd2a2d1b4a63a23431cfb750505cd489e2425a63772da3f4f9cb92a274743551ac0a7c112cc0570d7f3c5813cc3272c
+  metadata.gz: 5f27a873c0aa0c056299578338aaf681506006be426b7edbfa0d60a73d5a0081d7bb38a7255574ceb4cc502d82e6148c7024c133afa5e9d9a3804a5aa918790b
+  data.tar.gz: 9f869c5523cbf043f562491a8d0da4d85f392516be853fa398dd22c69f2bce841583be673ec213b7136672e5d4fc9b6736400e019aeca13ef4b4803becf4fb60

data/lib/logeater/cli.rb

@@ -39,8 +39,17 @@ module Logeater
     desc "import APP FILES", "imports files"
     def import(app, *files)
       unless options[:force]
+        started_at = Time.now
         imported_files = Logeater::Request.where(app: app).pluck("DISTINCT logfile")
-        files.reject! { |file| imported_files.member? File.basename(files[0]) }
+        finished_at = Time.now
+
+        $stderr.puts " > \e[34mListed imported logfiles for \e[1m#{app}\e[0;34m in \e[1m%.2f\e[0;34m seconds\e[0m\n" % [
+          finished_at - started_at ]
+
+        files_count = files.count
+        files.reject! { |file| imported_files.member? File.basename(file) }
+
+        $stderr.puts "   \e[34;1m#{files_count}\e[0;34m files passed, \e[1m#{files_count - files.length}\e[0;34m removed as already imported.\e[0m\n\n"
       end
 
       if files.empty?
@@ -50,22 +59,27 @@ module Logeater
 
       started_all = Time.now
       files.each_with_index do |file, i|
-        $stderr.puts " > \e[34mImporting \e[1m#{File.basename(file)}\e[0;34m (%d of %d)\e[0m\n\n" % [
+        $stderr.puts " > \e[34mImporting \e[1m#{File.basename(file)}\e[0;34m (%d of %d)\e[0m\n" % [
           i + 1,
           files.length ]
 
         reader = Logeater::Reader.new(app, file, options.slice(:progress, :verbose))
-        reader.remove_existing_entries!
+
+        started_at = Time.now
+        count = reader.remove_existing_entries!
+        finished_at = Time.now
+
+        $stderr.puts "   \e[34mDeleted \e[1m%d\e[0;34m requests for #{file} in \e[1m%.2f\e[0;34m seconds\e[0m\n" % [
+          count,
+          finished_at - started_at ]
 
         started_at = Time.now
         count = reader.import
         finished_at = Time.now
 
-        $stderr.puts " > \e[34mImported \e[1m%d\e[0;34m requests in \e[1m%.2f\e[0;34m seconds (%d of %d)\e[0m\n\n" % [
+        $stderr.puts "   \e[34mImported \e[1m%d\e[0;34m requests in \e[1m%.2f\e[0;34m seconds\e[0m\n\n" % [
           count,
-          finished_at - started_at,
-          i + 1,
-          files.length ]
+          finished_at - started_at ]
       end
 
       finished_all = Time.now

data/lib/logeater/reader.rb

@@ -136,8 +136,8 @@ module Logeater
 
     def save!
       return if completed_requests.empty?
-      result = Logeater::Request.import(completed_requests)
-      @count += result.num_inserts
+      Logeater::Request.import(completed_requests)
+      @count += completed_requests.length
       completed_requests.clear
     end
 

data/lib/logeater/version.rb

@@ -1,3 +1,3 @@
 module Logeater
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logeater
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Bob Lail