request-log-analyzer in request-log-analyzer-1.5.0

- old
+ new

@@ -25,18 +25,20 @@
       strip.option(:output, :alias => :o)
       strip.switch(:discard_teaser_lines, :t)
       strip.switch(:keep_junk_lines, :j)
     end
 
-    command_line.option(:format, :alias => :f, :default => 'rails')
+    command_line.option(:format, :alias => :f)
     command_line.option(:apache_format)
     command_line.option(:rails_format)
 
     command_line.option(:file, :alias => :e)
     command_line.option(:mail, :alias => :m)
+    command_line.option(:mailhost, :default => 'localhost')
     command_line.option(:parse_strategy, :default => 'assume-correct')
-    command_line.option(:dump)
+    command_line.option(:yaml)
+    command_line.option(:dump) # To be deprecated
 
     command_line.option(:aggregator, :alias => :a, :multiple => true)
 
     command_line.option(:database, :alias => :d)
     command_line.switch(:reset_database)
@@ -46,11 +48,11 @@
     command_line.option(:reject, :multiple => true, :parameters => 2)
     command_line.option(:after)
     command_line.option(:before)
 
     command_line.switch(:boring, :b)
-    command_line.option(:output, :alias => :o, :default => 'FixedWidth')
+    command_line.option(:output, :alias => :o, :default => 'fixedwidth')
     command_line.option(:report_width,  :default => terminal_width - 1)
     command_line.option(:report_amount, :default => 20)
     command_line.option(:report_sort,   :default => 'sum,mean')
 
     command_line.switch(:debug)
@@ -66,23 +68,24 @@
   puts "ARGUMENT ERROR: " + e.message if e.message
   puts
   puts "Usage: request-log-analyzer [LOGFILES*] <OPTIONS>"
   puts
   puts "Input options:"
-  puts "  --format <format>, -f:     Uses the specified log file format. Defaults to rails."
+  puts "  --format <format>, -f:     Log file format. amazon_s3, apache, merb, mysql, rack or rails (default)."
   puts "  --after <date>             Only consider requests from <date> or later."
   puts "  --before <date>            Only consider requests before <date>."
   puts "  --select <field> <value>   Only consider requests where <field> matches <value>."
   puts "  --reject <field> <value>   Only consider requests where <field> does not match <value>."
   puts
   puts "Output options:"
   puts "  --boring, -b               Output reports without ASCII colors."
   puts "  --database <filename>, -d: Creates an SQLite3 database of all the parsed request information."
   puts "  --debug                    Print debug information while parsing."
-  puts "  --file <filename>          Output to file."
+  puts "  --file <filename>          Redirect output to file."
   puts "  --mail <emailaddress>      Send report to an email address."
-  puts "  --output <format>          Output format. Supports 'HTML' and 'FixedWidth' (default)"
-  puts "  --dump <filename>          Dump the YAML formatted results in the given file"
+  puts "  --mailhost <server>        Use the given server as the SMTP server for sending email."
+  puts "  --output <format>          Output format. Supports 'html' and 'fixed_width' (default)."
+  puts "  --yaml <filename>          Dump the results in YAML format in the given file."
   puts
   puts "Examples:"
   puts "  request-log-analyzer development.log"
   puts "  request-log-analyzer -b mongrel.0.log mongrel.1.log mongrel.2.log "
   puts "  request-log-analyzer --format merb -d requests.db production.log"