@@ -17,13 +17,14 @@ begin strip.option(:format, :alias => :f, :default => 'rails') strip.option(:output, :alias => :o) strip.switch(:discard_teaser_lines, :t) - strip.switch(:keep_junk_lines, :j) + strip.switch(:keep_junk_lines, :j) end command_line.option(:format, :alias => :f, :default => 'rails') command_line.option(:file, :alias => :e) command_line.option(:parse_strategy, :default => 'assume-correct') - + command_line.option(:dump) + command_line.option(:aggregator, :alias => :a, :multiple => true) command_line.option(:database, :alias => :d) @@ -61,6 +62,7 @@ rescue CommandLine::Error => e puts " --debug Print debug information while parsing." puts " --file <filename> Output to file." puts " --output <format> Output format. Supports 'HTML' and 'FixedWidth' (default)" + puts " --dump <filename> Dump the YAML formatted results in the given file" puts puts "Examples:" puts " request-log-analyzer development.log" bin/request-log-analyzer @@ -90,6 +90,20 @@ module RequestLogAnalyzer::Aggregator # Call finalize on all trackers. def finalize @trackers.each { |tracker| tracker.finalize } + save_results_dump(options[:dump]) if options[:dump] + end + + def save_results_dump(filename) + File.open(filename, 'w') { |file| file.write(to_yaml) } + end + + # Exports all the tracker results to YAML + def to_yaml + require 'yaml' + trackers_export = @trackers.inject({}) do |export, tracker| + export[tracker.title] = tracker.to_yaml_object; export + end + YAML::dump(trackers_export) end # Call report on all trackers. lib/request_log_analyzer/aggregator/summarizer.rb @@ -34,6 +34,7 @@ module RequestLogAnalyzer options[:database] = arguments[:database] if arguments[:database] options[:debug] = arguments[:debug] + options[:dump] = arguments[:dump] output_class = RequestLogAnalyzer::Output::const_get(arguments[:output]) if arguments[:file] lib/request_log_analyzer/controller.rb @@ -79,6 +79,14 @@ module RequestLogAnalyzer::Tracker output << self.inspect output << "\n" end + + def title + self.class.to_s + end + + def to_yaml_object + nil + end end end \ No newline at end of file lib/request_log_analyzer/tracker.rb @@ -155,7 +155,6 @@ module RequestLogAnalyzer::Tracker "%0.02fs" % info[:min], "%0.02fs" % info[:max]] end end - end # Generate a request duration report to the given output object @@ -180,6 +179,15 @@ module RequestLogAnalyzer::Tracker raise "Unknown duration report specified: #{report}!" end end - end + end + + def title + options[:title] || 'Request duration' + end + + def to_yaml_object + return nil if @categories.empty? + @categories + end end end lib/request_log_analyzer/tracker/duration.rb @@ -57,7 +57,7 @@ module RequestLogAnalyzer::Tracker # Return the methods sorted by frequency def sorted_by_frequency - @frequencies.sort { |a, b| b[1] <=> a[1] } + Hash[*@frequencies.sort { |a, b| b[1] <=> a[1] }.flatten] end # Generate a HTTP method frequency report to the given output object. @@ -81,5 +81,14 @@ module RequestLogAnalyzer::Tracker end end + + def to_yaml_object + return nil if @frequencies.empty? + @frequencies + end + + def title + options[:title] || 'Request frequency' + end end end lib/request_log_analyzer/tracker/frequency.rb @@ -73,7 +73,7 @@ module RequestLogAnalyzer::Tracker # Any options for the report should have been set during initialize. # <tt>output</tt> The output object def report(output) - output.title("Requests graph - average per day per hour") + output.title(title) if total_requests == 0 output << "None found.\n" @@ -89,5 +89,17 @@ module RequestLogAnalyzer::Tracker end end end + + def title + options[:title] || "Request distribution per hour" + end + + def to_yaml_object + yaml_object = {} + @request_time_graph.each_with_index do |freq, hour| + yaml_object["#{hour}:00 - #{hour+1}:00"] = freq + end + yaml_object + end end end lib/request_log_analyzer/tracker/hourly_spread.rb @@ -67,5 +67,14 @@ module RequestLogAnalyzer::Tracker end end + + def title + options[:title] || 'Request timespan' + end + + def to_yaml_object + { :first => first_timestamp, :last =>last_timestamp } + end + end end lib/request_log_analyzer/tracker/timespan.rb 955e124f5eea9f3b84b1d996a6ac724e371f889d Willem van Bergen willem@vanbergen.org http://github.com/wvanbergen/request-log-analyzer/commit/c76652481b649dc394a94985e5a8f48ca2b6313f c76652481b649dc394a94985e5a8f48ca2b6313f 2009-06-22T12:26:39-07:00 2009-06-22T12:26:39-07:00 Implemented basic dumping of results to YAML using the --dump command line options. Needs specs. 0259b1806be18b2f739fab1b177c573478885915 Willem van Bergen willem@vanbergen.org