log_stats 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11e7ab566f4f3b53ffc1c7d9b2cde45903b5e6ba
-  data.tar.gz: aa983c266dffc4ec2effd53f0b92f508fa72ea0a
+  metadata.gz: f41223ee90ab08944ff0febf8ae290dd59e64ad3
+  data.tar.gz: 42259485678d72fb2f8ae10e5e22346c1a55e479
 SHA512:
-  metadata.gz: 117df83d6d0b402a8bb938eb0da7dd233416ebef1adddc7c149eb579e850ca3f73b7786f558aec2bba82d81fbcc1819f1ea0a760d41a3ab88acf8a27739bb4e3
-  data.tar.gz: d1935d9a1c4e00e9d892affd511f505dfdb5d58bd5c7329769e903cb18cad4928e933aec112f7675c39440f29e5f0c642dce2297b1a497cbba4918621129a632
+  metadata.gz: 8ee67e9716c153913ad30c99236726e093de962eddf58de69c2159a242421d1b11d5b37e7d263b5a71e722738e8d9c24bce4bdde4e02b3fc344eeeec8b32a285
+  data.tar.gz: 0a5416e38a1e5d051bd573036de29ac6c6dfc2877b33942725354c4aba60b8b78dd273b305e39c4ff1b1461b653446b7953a77868d688523eb79cc1d97a86021

data/bin/log_stats

@@ -3,6 +3,6 @@
 require 'log_stats'
 require "log_stats/config"
 
-log_file_data = ARGF.read
+log_file_data = ARGF.readlines
 config = LogStats::Config.default_config.merge(LogStats::Config.env_config)
 LogStats.run(log_file_data, config)

data/example/log_stats

@@ -93,6 +93,29 @@ config = LogStats::Config.default_config.
           merge(custom_config).
           merge(LogStats::Config.env_config)
 
-log_file_data = LogStats::Logger.elapsed(config, "Reading file") { ARGF.readlines }
-data = LogStats.get_data(log_file_data, config)
-puts JSON.pretty_generate(data)
+file_path = ARGV[0]
+dir_path = file_path[/^.+(?=\.[^.]+$)/] # File path minus extension
+events_path = File.join(dir_path, 'events.json')
+stats_path = File.join(dir_path, 'stats.json')
+
+if File.exists?(events_path)
+  # NOTE: it's faster to read cached JSON events data than processing the log file
+  events = LogStats::Logger.elapsed(config, "Reading and parsing #{events_path}") do
+    JSON.parse(IO.read("events.json"))
+  end
+else
+  log_file_data = LogStats::Logger.elapsed(config, "Reading log file #{file_path}") do
+    IO.readlines(file_path)
+  end
+  events = LogStats.get_events(log_file_data, config)
+  LogStats::Logger.elapsed(config, "Writing #{events_path}") do
+    Dir.mkdir(dir_path) if !File.exists?(dir_path)
+    File.write(events_path, JSON.pretty_generate(events))
+  end
+end
+
+stats = LogStats.process_events(events, config)
+
+LogStats::Logger.elapsed(config, "Writing stats output to #{stats_path}") do
+  File.write(stats_path, JSON.pretty_generate(stats))
+end

data/lib/log_stats/version.rb

@@ -1,3 +1,3 @@
 module LogStats
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

data/lib/log_stats.rb

@@ -11,20 +11,28 @@ require "time"
 
 module LogStats
   def self.run(log_data, config)
-    data = get_data(log_data, config)
+    stats = get_stats(log_data, config)
     if config[:output_format] == "text" && request_config = config[:events][:requests]
-      Requests::TextOutput.print(data[:requests], request_config)
+      Requests::TextOutput.print(stats[:requests], request_config)
     end
     if config[:output_format] == "json"
-      puts JSON.pretty_generate(data)
+      puts JSON.pretty_generate(stats)
     end
-    data
+    stats
   end
 
-  def self.get_data(log_data, config)
-    events = Logger.elapsed(config, "\nParsing #{log_data.length} log lines") do
+  def self.get_stats(log_data, config)
+    events = get_events(log_data, config)
+    process_events(events, config)
+  end
+
+  def self.get_events(log_data, config)
+    Logger.elapsed(config, "\nParsing #{log_data.length} log lines") do
       LineParser.parse(log_data, config)
     end
+  end
+
+  def self.process_events(events, config)
     if config[:start_time] || config[:end_time]
       events = Logger.elapsed(config, "\nFiltering by start_time/end_time") do
         events.keys.reduce({}) do |acc, key|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: log_stats
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Peter Marklund