croque 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b491279b9fcb905effb8312d1b2f47d96fc637a
-  data.tar.gz: 6b2318fa03ebf1fab3c182ac7987d57726345a98
+  metadata.gz: 43b4e00f40d1bf501a490be5b58db0cca92eb260
+  data.tar.gz: 110503e639572246320bfc33dc994e1dab2aecbf
 SHA512:
-  metadata.gz: 9d1d81982ec1612414140c3af96994d384c62494cb87b669d92e6444f3873406b3c72b2a47488958e709292a7c0375e10959289d4e25c6d776c8c052faee8e91
-  data.tar.gz: c298bb81f6c53df48907432569e705e6bde0f761ebfefb8c2c287553f290750387baf1828bab361a7dba748bdb326ce91c1a600700f0808eda727f000e62f113
+  metadata.gz: 0710a4e309cad39c2d1cbe5fccd29dc9dca4cbc42300a8f936da0f320e28ba9a71889fe81303e5a605ebfd27acd0b9d950a16bce1be4d021208abb4c47f52dc3
+  data.tar.gz: 8360e2fff8d5a4e190c8e745235b191ce069c21ccb0a48431c0ca60d3e8bb3c5d386c36068a34ed729fcfbf24a1b2757a0a794eb1df108f8044c972e926b7047

data/.gitignore

@@ -7,6 +7,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/log/croque.*
 
 # rspec failure tracking
 .rspec_status

data/README.md

@@ -33,6 +33,7 @@ Croque.configure do |config|
   config.end_matcher = /\-\- : Completed/
   config.lower_time = 1000 # ms
   config.except_path_matcher = /\/assets\//
+  config.logger = Logger.new(config.log_dir_path.join("croque.#{Rails.env}.log"))
 end
 ```
 

data/lib/croque.rb

@@ -19,7 +19,8 @@ module Croque
     include ActiveSupport::Configurable
     config_accessor :root_path, :log_dir_path, :store_path,
       :log_file_matcher, :hour_matcher, :matcher, :severity_matcher,
-      :start_matcher, :end_matcher, :lower_time, :except_path_matcher
+      :start_matcher, :end_matcher, :lower_time, :except_path_matcher,
+      :logger
   end
 
   configure do |config|
@@ -34,6 +35,7 @@ module Croque
     config.end_matcher = /\-\- : Completed/
     config.lower_time = 1000 # ms
     config.except_path_matcher = /\/assets\//
+    config.logger = Logger.new(config.log_dir_path.join("croque.#{Rails.env}.log"))
   end
 
   class << self

data/lib/croque/aggregator.rb

@@ -12,16 +12,20 @@ module Croque
 
       def aggregate_per_hour(date)
         # scan each file
+        log("aggregate logs per hour on #{date} start")
         log_files.each do |file|
+          log("check skippable of #{file}")
           # check skippable
           next if skippable?(date, file)
+          log("aggregate logs of #{file}")
           # all lines
           linage = 1000
           wc_result = `wc -l #{file}`
-          line_count = wc_result.match(/\d+/)[0]
+          line_count = wc_result.match(/\d+/)[0].to_i
           k = 1
           lines = []
-          while (k-1)*linage < line_count.to_i
+          while (k-1)*linage < line_count
+            log("aggregate logs for #{(k-1)*linage}-#{k*linage} in #{line_count} on #{date}")
             fragment = `head -n #{k*1000} #{file} | tail -n #{linage}`
             fragment_lines = fragment.lines
             lines += fragment_lines.select do |line|
@@ -33,14 +37,18 @@ module Croque
           lines = lines
           hours.each do |hour|
             # craete csv file
+            log("create csv for #{date} #{hour} hour")
             create_csv(date, hour, lines)
           end
         end
+        log("aggregate logs per hour on #{date} end")
       end
 
       def generate_ranking(date)
+        log("generate ranking on #{date} start")
         array = []
         hours.each do |hour|
+          log("generate array for ranking in #{date} #{hour} hour")
           # csv data
           path = csv_path(date, hour)
           # next if no file
@@ -50,18 +58,20 @@ module Croque
           csv.to_a.each do |line|
             uuid = line[0]
             processing_time = line[1].to_f
-            # next if processing_time < config.lower_time
             next if low?(processing_time)
             array << [date, hour, uuid, processing_time]
           end
         end
+        log("sort array for ranking on #{date}")
         # Processing Time Desc
         array = array.sort{ |a, b| b[3] <=> a[3] }
+        log("generate ranking csv on #{date}")
         # Generate CSV
         data = CSV.generate("", csv_option) do |csv|
           array.each{ |line| csv << line }
         end
         store_csv(ranking_path(date), data)
+        log("generate ranking on #{date} end")
       end
 
       def all
@@ -349,6 +359,10 @@ module Croque
       def low?(time)
         time < Croque.config.lower_time
       end
+
+      def log(message)
+        Croque.config.logger.try(:info, message)
+      end
     end
   end
 end

data/lib/croque/version.rb

@@ -1,3 +1,3 @@
 module Croque
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: croque
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Takuya Okuhara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails